Skip to content

Commit 277cc45

Browse files
TASK: refactor asset replace dialog and asset upload screen
1 parent a29faec commit 277cc45

File tree

26 files changed

+255
-977
lines changed

26 files changed

+255
-977
lines changed

Configuration/Settings.Neos.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ Neos:
3232
javascript:
3333
Flowpack.Media.Ui:AssetEditor:
3434
resource: resource://Flowpack.Media.Ui/Public/AssetEditor/Plugin.js
35-
Flowpack.Media.Ui:ImageUpload:
36-
resource: resource://Flowpack.Media.Ui/Public/AssetUpload/Plugin.js
3735
stylesheets:
3836
Flowpack.Media.Ui:AssetEditor:
3937
resource: resource://Flowpack.Media.Ui/Public/AssetEditor/Plugin.css
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './src';

Resources/Private/JavaScript/asset-upload-screen/package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,22 @@
66
"engines": {
77
"node": ">=12"
88
},
9-
"scripts": {
10-
"build": "NODE_ENV=production neos-react-scripts build",
11-
"watch": "neos-react-scripts watch"
12-
},
139
"dependencies": {
10+
"@apollo/client": "^3.3.13",
1411
"@media-ui/core": "*",
12+
"@media-ui/feature-asset-upload": "*",
1513
"@media-ui/media-module": "*",
16-
"@neos-project/neos-ui-extensibility": "^5.3.4"
14+
"apollo-upload-client": "^14.1.3",
15+
"plow-js": "^2.2.0",
16+
"react-redux": "^5.1.2",
17+
"react": "^17.0.1",
18+
"recoil": "^0.2.0"
1719
},
1820
"devDependencies": {
1921
"webpack": "^4.44.2",
2022
"webpack-graphql-loader": "^1.0.2"
2123
},
2224
"browserslist": [
2325
"defaults and > 1% and not ie <= 11"
24-
],
25-
"neos": {
26-
"buildTargetDirectory": "../../../Public/AssetUpload"
27-
}
26+
]
2827
}

Resources/Private/JavaScript/asset-upload-screen/src/AssetUploadScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ interface AssetUploadScreenState {
6969
i18nRegistry: globalRegistry.get('i18n'),
7070
frontendConfiguration: globalRegistry.get('frontendConfiguration').get('Flowpack.Media.Ui'),
7171
}))
72-
export default class AssetUploadScreen extends React.PureComponent<AssetUploadScreenProps, AssetUploadScreenState> {
72+
export class AssetUploadScreen extends React.PureComponent<AssetUploadScreenProps, AssetUploadScreenState> {
7373
constructor(props) {
7474
super(props);
7575
}

Resources/Private/JavaScript/asset-upload-screen/src/index.js

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { AssetUploadScreen } from './AssetUploadScreen';

Resources/Private/JavaScript/asset-upload-screen/src/manifest.js

Lines changed: 0 additions & 15 deletions
This file was deleted.

Resources/Private/JavaScript/asset-upload/src/components/Dialogs/ReplaceAssetDialog.tsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,20 @@ const ReplaceAssetDialog: React.FC = () => {
7474
});
7575

7676
if (hasApprovalToReplaceAsset) {
77-
try {
78-
const result = await replaceAsset({ asset: selectedAsset, file, options: replacementOptions });
79-
80-
Notify.ok(translate('uploadDialog.replacementFinished', 'Replacement finished'));
81-
closeDialog();
82-
void refetchAssets();
83-
if (result?.data.replaceAsset.success) {
84-
setLabel(file.title);
85-
setCaption(file.caption);
86-
setCopyrightNotice(file.copyrightNotice);
87-
}
88-
} catch (error) {
89-
Notify.error(translate('assetReplacement.error', 'Replacement failed'), error);
90-
}
77+
replaceAsset({ asset: selectedAsset, file, options: replacementOptions })
78+
.then((result) => {
79+
if (result?.data.replaceAsset.success) {
80+
setLabel(file.title);
81+
setCaption(file.caption);
82+
setCopyrightNotice(file.copyrightNotice);
83+
}
84+
Notify.ok(translate('uploadDialog.replacementFinished', 'Replacement finished'));
85+
closeDialog();
86+
refetchAssets();
87+
})
88+
.catch((error) => {
89+
Notify.error(translate('assetReplacement.error', 'Replacement failed'), error);
90+
});
9191
}
9292
}, [
9393
replaceAsset,

Resources/Private/JavaScript/media-upload-screen/Readme.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

Resources/Private/JavaScript/media-upload-screen/package.json

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)