[AAE-11830] Changes required to address comment in APPS (#2848)

projects/aca-shared/src/lib/services/app.extension.service.spec.ts

@@ -287,7 +287,8 @@ describe('AppExtensionService', () => {
       service.runActionById('aca:actions/create-folder');
       expect(store.dispatch).toHaveBeenCalledWith({
         type: 'CREATE_FOLDER',
-        payload: 'folder-name'
+        payload: 'folder-name',
+        configuration: undefined
       } as Action);
     });
 

projects/aca-shared/src/lib/services/app.extension.service.ts

@@ -57,6 +57,7 @@ import { ViewerRules } from '../models/viewer.rules';
 import { SettingsGroupRef } from '../models/types';
 import { NodePermissionService } from '../services/node-permission.service';
 import { filter, map } from 'rxjs/operators';
+import { ModalConfiguration } from '@alfresco/aca-shared';
 
 @Injectable({
   providedIn: 'root'
@@ -498,7 +499,7 @@ export class AppExtensionService implements RuleContext {
     return false;
   }
 
-  runActionById(id: string, additionalPayload?: { [key: string]: any }) {
+  runActionById(id: string, additionalPayload?: ModalConfiguration) {
     const action = this.extensions.getActionById(id);
     if (action) {
       const { type, payload } = action;
@@ -509,18 +510,13 @@ export class AppExtensionService implements RuleContext {
 
       this.store.dispatch({
         type,
-        payload:
-          typeof expression === 'object'
-            ? {
-                ...expression,
-                ...additionalPayload
-              }
-            : expression
+        payload: expression,
+        configuration: additionalPayload
       });
     } else {
       this.store.dispatch({
         type: id,
-        payload: additionalPayload
+        configuration: additionalPayload
       });
     }
   }

projects/aca-shared/store/src/actions/library.actions.ts

@@ -60,5 +60,5 @@ export class UpdateLibraryAction implements Action {
 export class LeaveLibraryAction implements Action {
   readonly type = LibraryActionTypes.Leave;
 
-  constructor(public payload?: string | ModalConfiguration) {}
+  constructor(public payload?: string, public configuration?: ModalConfiguration) {}
 }

projects/aca-shared/store/src/actions/node.actions.ts

@@ -85,7 +85,7 @@ export class PurgeDeletedNodesAction implements Action {
 export class DownloadNodesAction implements Action {
   readonly type = NodeActionTypes.Download;
 
-  constructor(public payload: MinimalNodeEntity[] | ModalConfiguration = []) {}
+  constructor(public payload: MinimalNodeEntity[] = [], public configuration?: ModalConfiguration) {}
 }
 
 export class CreateFolderAction implements Action {
@@ -97,13 +97,13 @@ export class CreateFolderAction implements Action {
 export class EditFolderAction implements Action {
   readonly type = NodeActionTypes.EditFolder;
 
-  constructor(public payload: MinimalNodeEntity & ModalConfiguration) {}
+  constructor(public payload: MinimalNodeEntity, public configuration?: ModalConfiguration) {}
 }
 
 export class ShareNodeAction implements Action {
   readonly type = NodeActionTypes.Share;
 
-  constructor(public payload: MinimalNodeEntity & ModalConfiguration) {}
+  constructor(public payload: MinimalNodeEntity, public configuration?: ModalConfiguration) {}
 }
 
 export class UnshareNodesAction implements Action {
@@ -115,13 +115,13 @@ export class UnshareNodesAction implements Action {
 export class CopyNodesAction implements Action {
   readonly type = NodeActionTypes.Copy;
 
-  constructor(public payload: Array<MinimalNodeEntity> | ModalConfiguration) {}
+  constructor(public payload: Array<MinimalNodeEntity>, public configuration?: ModalConfiguration) {}
 }
 
 export class MoveNodesAction implements Action {
   readonly type = NodeActionTypes.Move;
 
-  constructor(public payload: Array<MinimalNodeEntity> | ModalConfiguration) {}
+  constructor(public payload: Array<MinimalNodeEntity>, public configuration?: ModalConfiguration) {}
 }
 
 export class ManagePermissionsAction implements Action {
@@ -144,7 +144,7 @@ export class PrintFileAction implements Action {
 export class ManageVersionsAction implements Action {
   readonly type = NodeActionTypes.ManageVersions;
 
-  constructor(public payload: MinimalNodeEntity & ModalConfiguration) {}
+  constructor(public payload: MinimalNodeEntity, public configuration?: ModalConfiguration) {}
 }
 
 export class EditOfflineAction implements Action {
@@ -173,7 +173,7 @@ export class RemoveFavoriteAction implements Action {
 export class ManageAspectsAction implements Action {
   readonly type = NodeActionTypes.ChangeAspects;
 
-  constructor(public payload: MinimalNodeEntity & ModalConfiguration) {}
+  constructor(public payload: MinimalNodeEntity, public configuration?: ModalConfiguration) {}
 }
 
 export class ManageRulesAction implements Action {

projects/aca-shared/store/src/actions/upload.actions.ts

@@ -47,5 +47,5 @@ export class UploadFolderAction implements Action {
 export class UploadFileVersionAction implements Action {
   readonly type = UploadActionTypes.UploadFileVersion;
 
-  constructor(public payload: CustomEvent | ModalConfiguration) {}
+  constructor(public payload: CustomEvent, public configuration?: ModalConfiguration) {}
 }