After QA

ibexa · Apr 11, 2024 · 3b7dae2 · 3b7dae2
1 parent 0d13629
commit 3b7dae2
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 22 deletions.
diff --git a/src/bundle/ui-dev/src/modules/common/pagination/pagination.button.js b/src/bundle/ui-dev/src/modules/common/pagination/pagination.button.js
@@ -15,14 +15,14 @@ const PaginationButton = ({ label, disabled, additionalClasses, buttonAdditional
     return (
         <li className={className}>
             <button className={`page-link ${buttonAdditionalClasses}`} onClick={handleClick} type="button">
-                {label}
+                {label && label}
             </button>
         </li>
     );
 };
 
 PaginationButton.propTypes = {
-    label: PropTypes.string.isRequired,
+    label: PropTypes.string,
     disabled: PropTypes.bool,
     onPageChange: PropTypes.func,
     pageIndex: PropTypes.number.isRequired,
@@ -31,6 +31,7 @@ PaginationButton.propTypes = {
 };
 
 PaginationButton.defaultProps = {
+    label: '',
     disabled: false,
     additionalClasses: '',
     buttonAdditionalClasses: '',

diff --git a/src/bundle/ui-dev/src/modules/common/tooltip-popup/tooltip.popup.component.js b/src/bundle/ui-dev/src/modules/common/tooltip-popup/tooltip.popup.component.js
@@ -35,7 +35,7 @@ const TooltipPopupComponent = ({
                     </button>
                 )}
                 {closeLabel && (
-                    <button className="btn ibexa-btn ibexa-btn--tertiary" type="button" onClick={onClose} {...closeBtnAttrs}>
+                    <button className="btn ibexa-btn ibexa-btn--ghost" type="button" onClick={onClose} {...closeBtnAttrs}>
                         {closeLabel}
                     </button>
                 )}

diff --git a/src/bundle/ui-dev/src/modules/multi-file-upload/components/drop-area/drop.area.component.js b/src/bundle/ui-dev/src/modules/multi-file-upload/components/drop-area/drop.area.component.js
@@ -155,7 +155,7 @@ export default class DropAreaComponent extends Component {
 }
 
 DropAreaComponent.propTypes = {
-    maxFileSizes: PropTypes.objectOf(PropTypes.number).isRequired,
+    maxFileSizes: PropTypes.arrayOf(PropTypes.object).isRequired,
     processUploadedFiles: PropTypes.func.isRequired,
     preventDefaultAction: PropTypes.func.isRequired,
     addItemsToUpload: PropTypes.func.isRequired,

diff --git a/...ndle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.item.component.js b/...ndle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.item.component.js
@@ -463,30 +463,28 @@ export default class UploadItemComponent extends Component {
 
 UploadItemComponent.propTypes = {
     item: PropTypes.object.isRequired,
-    onAfterUpload: PropTypes.func.isRequired,
-    onAfterAbort: PropTypes.func.isRequired,
-    onAfterDelete: PropTypes.func.isRequired,
-    createFileStruct: PropTypes.func.isRequired,
-    publishFile: PropTypes.func.isRequired,
-    deleteFile: PropTypes.func.isRequired,
-    checkCanUpload: PropTypes.func.isRequired,
     adminUiConfig: PropTypes.shape({
         multiFileUpload: PropTypes.shape({
             defaultMappings: PropTypes.arrayOf(PropTypes.object).isRequired,
             fallbackContentType: PropTypes.object.isRequired,
             locationMappings: PropTypes.arrayOf(PropTypes.object).isRequired,
             maxFileSize: PropTypes.number.isRequired,
         }).isRequired,
-        token: PropTypes.string.isRequired,
-        siteaccess: PropTypes.string.isRequired,
     }).isRequired,
     parentInfo: PropTypes.shape({
         contentTypeIdentifier: PropTypes.string.isRequired,
         locationPath: PropTypes.string.isRequired,
         language: PropTypes.string.isRequired,
     }).isRequired,
-    contentCreatePermissionsConfig: PropTypes.object,
     contentTypesMap: PropTypes.object.isRequired,
+    onAfterUpload: PropTypes.func,
+    onAfterAbort: PropTypes.func,
+    onAfterDelete: PropTypes.func,
+    createFileStruct: PropTypes.func,
+    publishFile: PropTypes.func,
+    deleteFile: PropTypes.func,
+    checkCanUpload: PropTypes.func,
+    contentCreatePermissionsConfig: PropTypes.object,
     currentLanguage: PropTypes.string,
     isUploaded: PropTypes.bool,
     isFailed: PropTypes.bool,
@@ -496,6 +494,13 @@ UploadItemComponent.propTypes = {
 };
 
 UploadItemComponent.defaultProps = {
+    onAfterUpload: () => {},
+    onAfterAbort: () => {},
+    onAfterDelete: () => {},
+    createFileStruct: () => {},
+    publishFile: () => {},
+    deleteFile: () => {},
+    checkCanUpload: () => {},
     isUploaded: false,
     isFailed: false,
     currentLanguage: '',

diff --git a/...ndle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.list.component.js b/...ndle/ui-dev/src/modules/multi-file-upload/components/upload-list/upload.list.component.js
@@ -134,8 +134,6 @@ UploadListComponent.propTypes = {
             locationMappings: PropTypes.arrayOf(PropTypes.object).isRequired,
             maxFileSize: PropTypes.number.isRequired,
         }).isRequired,
-        token: PropTypes.string.isRequired,
-        siteaccess: PropTypes.string.isRequired,
     }).isRequired,
     parentInfo: PropTypes.shape({
         contentTypeIdentifier: PropTypes.string.isRequired,

diff --git a/...le/ui-dev/src/modules/multi-file-upload/components/upload-popup/upload.popup.component.js b/...le/ui-dev/src/modules/multi-file-upload/components/upload-popup/upload.popup.component.js
@@ -135,8 +135,6 @@ UploadPopupModule.propTypes = {
             locationMappings: PropTypes.arrayOf(PropTypes.object).isRequired,
             maxFileSize: PropTypes.number.isRequired,
         }).isRequired,
-        token: PropTypes.string.isRequired,
-        siteaccess: PropTypes.string.isRequired,
     }).isRequired,
     parentInfo: PropTypes.shape({
         contentTypeIdentifier: PropTypes.string.isRequired,

diff --git a/src/bundle/ui-dev/src/modules/multi-file-upload/multi.file.upload.module.js b/src/bundle/ui-dev/src/modules/multi-file-upload/multi.file.upload.module.js
@@ -88,6 +88,11 @@ export default class MultiFileUploadModule extends Component {
     confirmPopup() {
         this.setState((state) => ({ ...state, popupVisible: false, allowDropOnWindow: true }));
         this.props.onPopupConfirm(this._itemsUploaded);
+
+        if (this.props.triggerId === SUBITEMS_TRIGGER_ID && !!this._itemsUploaded.length) {
+            window.location.reload();
+        }
+
         this._itemsUploaded = [];
     }
 
@@ -96,7 +101,7 @@ export default class MultiFileUploadModule extends Component {
     }
 
     handleAfterUpload(itemsUploaded) {
-        this._itemsUploaded = [...this._itemsUploaded, ...itemsUploaded];
+        this._itemsUploaded = itemsUploaded;
     }
 
     handleAfterDelete(deletedItem) {
@@ -242,9 +247,6 @@ MultiFileUploadModule.propTypes = {
             locationMappings: PropTypes.arrayOf(PropTypes.object).isRequired,
             maxFileSize: PropTypes.number.isRequired,
         }).isRequired,
-        token: PropTypes.string,
-        siteaccess: PropTypes.string,
-        accessToken: PropTypes.string,
     }).isRequired,
     parentInfo: PropTypes.shape({
         contentTypeIdentifier: PropTypes.string.isRequired,