Get latest article, fix conditions, fix initialization of action

superdesk · Sep 26, 2024 · 59b038e · 59b038e
1 parent 7e4b490
commit 59b038e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 68 deletions.
diff --git a/client/planning-extension/src/extension.ts b/client/planning-extension/src/extension.ts
@@ -140,9 +140,12 @@ const extension: IExtension = {
                                             superdeskArticle.itemAction(item).deschedule
                                         )
                                     ) {
-                                        const event = new CustomEvent('planning:unlinkfromcoverage', {detail: {item}});
 
-                                        window.dispatchEvent(event);
+                                        superdeskArticle.get(item._id).then((_item) => {
+                                            const event = new CustomEvent('planning:unlinkfromcoverage', {detail: {item: _item}});
+
+                                            window.dispatchEvent(event);
+                                        })
                                     }
                                 },
                             },
@@ -157,15 +160,18 @@ const extension: IExtension = {
                                     // keep in sync with index.ts:79
                                     if (
                                         !item.assignment_id &&
-                                        isContentLinkToCoverageAllowed(item) &&
                                         !superdesk.entities.article.isPersonal(item) &&
-                                        superdesk.privileges.hasPrivilege('archive') &&
+                                        isContentLinkToCoverageAllowed(item) &&
                                         !superdesk.entities.article.isLockedInOtherSession(item) &&
-                                        !itemStates.includes(item.state)
+                                        !itemStates.includes(item.state) &&
+                                        superdesk.privileges.hasPrivilege('archive')
                                     ) {
-                                        const event = new CustomEvent('planning:fulfilassignment', {detail: item});
+                                        superdesk.entities.article.get(item._id).then((_item) => {
+                                            _item.slugline
+                                            const event = new CustomEvent('planning:fulfilassignment', {detail: {item: _item}});
 
-                                        window.dispatchEvent(event);
+                                            window.dispatchEvent(event);
+                                        })
                                     }
                                 },
                             }

diff --git a/index.ts b/index.ts
@@ -75,66 +75,6 @@ function configurePlanning(superdesk) {
                             authoring.itemActions(item).deschedule
                         );
                 }],
-        })
-        .activity('planning.fulfil', {
-            label: gettext('Fulfil Assignment'),
-            icon: 'calendar-list',
-            modal: true,
-            priority: 2000,
-            controller: ctrl.FulFilAssignmentController,
-            filters: [
-                {
-                    action: 'list',
-                    type: 'archive',
-                },
-                {
-                    action: 'external-app',
-                    type: 'fulfill-assignment',
-                },
-            ],
-            group: gettext('Planning'),
-            privileges: {archive: 1},
-            additionalCondition: ['archiveService', 'item',
-                function(archiveService, item: IArticle) {
-                    return !item.assignment_id &&
-                        !archiveService.isPersonal(item) &&
-                        !superdeskApi.entities.article.isLockedInOtherSession(item) &&
-                        isContentLinkToCoverageAllowed(item) &&
-                        !['killed', 'recalled', 'unpublished', 'spiked', 'correction'].includes(item.state);
-                }],
-        })
-
-        // TAG: AUTHORING-ANGULAR
-        .activity('planning.unlink', {
-            label: gettext('Unlink as Coverage'),
-            icon: 'cut',
-            priority: 1000,
-            controller: ctrl.UnlinkAssignmentController,
-            filters: [
-                {
-                    action: 'list',
-                    type: 'archive',
-                },
-                {
-                    action: 'external-app',
-                    type: 'unlink-assignment',
-                },
-            ],
-            group: gettext('Planning'),
-            privileges: {archive: 1},
-
-            // keep in sync with client/planning-extension/src/extension.ts:126
-            additionalCondition: ['archiveService', 'item', 'authoring',
-                function(archiveService, item, authoring) {
-                    return item.assignment_id &&
-                        !archiveService.isPersonal(item) &&
-                        !superdeskApi.entities.article.isLockedInOtherSession(item) &&
-                        (
-                            authoring.itemActions(item).edit ||
-                            authoring.itemActions(item).correct ||
-                            authoring.itemActions(item).deschedule
-                        );
-                }],
         });
 }
 
@@ -148,7 +88,7 @@ window.addEventListener('planning:fulfilassignment', (event: CustomEvent) => {
 
     localScope.resolve = handleDestroy;
     localScope.reject = handleDestroy;
-    localScope.locals = {data: {item: event.detail}};
+    localScope.locals = {data: {item: event.detail.item}};
 
     new ctrl.FulFilAssignmentController(
         element,