Fix native actions params (#5128)

* fixes native actions params
* gets back operations label (cause use in tests)
* adds payload to widget controls apos bus event

Author: ValJed

modules/@apostrophecms/area/ui/apos/components/AposWidgetControls.vue

@@ -215,19 +215,20 @@ export default {
         }
         return;
       }
+      const payload = {
+        widgetId: this.modelValue._id,
+        index: this.index
+      };
       if (nativeAction) {
         this.$emit('operation', {
           name: nativeAction,
-          payload: {
-            widgetId: this.modelValue._id,
-            index: this.index
-          }
+          payload
         });
         return;
       }
 
       if (action) {
-        apos.bus.$emit(action);
+        apos.bus.$emit(action, payload);
       }
     }
   }

modules/@apostrophecms/area/ui/apos/logic/AposAreaEditor.js

@@ -212,7 +212,7 @@ export default {
         return;
       }
 
-      this.copy(this.focusedWidgetIndex);
+      this.copy({ index: this.focusedWidgetIndex });
     },
     handleCut() {
       if (
@@ -223,7 +223,7 @@ export default {
         return;
       }
 
-      this.cut(this.focusedWidgetIndex);
+      this.cut({ index: this.focusedWidgetIndex });
     },
     handleDuplicate() {
       if (
@@ -234,7 +234,7 @@ export default {
         return;
       }
 
-      this.clone(this.focusedWidgetIndex);
+      this.clone({ index: this.focusedWidgetIndex });
     },
     handlePaste() {
       if (
@@ -245,7 +245,7 @@ export default {
         return;
       }
 
-      this.paste(Math.max(this.focusedWidgetIndex, 0));
+      this.paste({ index: Math.max(this.focusedWidgetIndex, 0) });
     },
     handleRemove() {
       if (
@@ -256,7 +256,7 @@ export default {
         return;
       }
 
-      this.remove(this.focusedWidgetIndex);
+      this.remove({ index: this.focusedWidgetIndex });
     },
     areaUpdatedHandler(area) {
       for (const item of this.next) {
@@ -328,7 +328,7 @@ export default {
     },
     async cut({ index }) {
       apos.area.widgetClipboard.set(this.next[index]);
-      await this.remove(index);
+      await this.remove({ index });
       apos.notify('Widget cut to clipboard', {
         type: 'success',
         icon: 'content-cut-icon',
@@ -409,14 +409,14 @@ export default {
         }
       }
     },
-    clone(index) {
+    clone({ index }) {
       const widget = cloneWidget(this.next[index]);
       this.insert({
         widget,
         index: index + 1
       });
     },
-    async paste(index) {
+    async paste({ index }) {
       const clipboard = apos.area.widgetClipboard.get();
       if (clipboard) {
         const widget = clipboard;
@@ -559,7 +559,7 @@ export default {
         ...this.next.slice(index)
       ];
       if (this.widgetIsContextual(widget.type)) {
-        this.edit(index);
+        this.edit({ index });
       }
       this.setFocusedWidget(widget._id, this.areaId, { scrollTo: true });
     },

modules/@apostrophecms/layout-widget/ui/apos/components/AposAreaLayoutEditor.vue

@@ -367,7 +367,7 @@ export default {
     onRemoveItem({ _id, patches }) {
       const index = this.next.findIndex(w => w._id === _id);
       if (index !== -1 && this.next[index].type === this.layoutColumnWidgetName) {
-        this.remove(index);
+        this.remove({ index });
       }
       this.layoutPatchMany(patches);
     },

modules/@apostrophecms/widget-type/index.js

@@ -219,6 +219,7 @@ module.exports = {
     return {
       add: {
         nudgeUp: {
+          label: 'apostrophe:nudgeUp',
           icon: 'arrow-up-icon',
           tooltip: 'apostrophe:nudgeUp',
           nativeAction: 'up',
@@ -227,6 +228,7 @@ module.exports = {
           }
         },
         nudgeDown: {
+          label: 'apostrophe:nudgeDown',
           icon: 'arrow-down-icon',
           tooltip: 'apostrophe:nudgeDown',
           nativeAction: 'down',
@@ -236,12 +238,14 @@ module.exports = {
         },
         ...!options.contextual && {
           edit: {
+            label: 'apostrophe:edit',
             icon: 'pencil-icon',
             tootip: 'apostrophe:editWidget',
             nativeAction: 'edit'
           }
         },
         remove: {
+          label: 'apostrophe:remove',
           icon: 'trash-can-outline-icon',
           tooltip: 'apostrophe:delete',
           nativeAction: 'remove'

modules/@apostrophecms/widget-type/ui/apos/components/AposWidgetEditor.vue

@@ -271,7 +271,10 @@ export default {
         return;
       }
       if (this.preview.create) {
-        this.preview.area.remove(this.getPreviewWidgetIndex(), { autosave: false });
+        this.preview.area.remove(
+          { index: this.getPreviewWidgetIndex() },
+          { autosave: false }
+        );
       } else if (!this.saving) {
         this.preview.area.update(this.previewSnapshot, {
           autosave: false,