Fulfil assignment

client/controllers/FulfilAssignmentController.tsx

@@ -3,12 +3,31 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import {Provider} from 'react-redux';
 import {ModalsContainer} from '../components';
-import {get} from 'lodash';
 import {registerNotifications} from '../utils';
 import {WORKSPACE, MODALS, ASSIGNMENTS} from '../constants';
 import {getErrorMessage} from '../utils/index';
+import {IArticle} from 'superdesk-api';
 
 export class FulFilAssignmentController {
+    item: IArticle;
+    notify: {error: (message: string) => void};
+    gettext: (
+        value: string,
+        params?: {[placeholder: string]: string | number | React.ComponentType},
+    ) => string;
+    $scope: any;
+    store: any;
+    newsItem: any;
+    rendered: boolean;
+    $timeout: any;
+    lock: any;
+    $element: any;
+    session: any;
+    superdeskFlags: any;
+    userList: any;
+    api: any;
+    desks: any;
+
     constructor(
         $element,
         $scope,
@@ -43,20 +62,18 @@ export class FulFilAssignmentController {
 
         this.store = null;
         this.newsItem = null;
-        this.item = get($scope, 'locals.data.item', {});
+        this.item = $scope.locals?.data.item ?? {};
         this.rendered = false;
 
         $scope.$on('$destroy', this.onDestroy);
         $scope.$on('item:unlock', this.onItemUnlock);
 
-        if (get(this.item, 'archive_item')) { // use archive item for published
+        if (this.item?.archive_item) { // use archive item for published
             this.item = this.item.archive_item;
         }
 
-        if (get(this.item, 'slugline', '') === '') {
-            this.notify.error(
-                this.gettext('[SLUGLINE] is a required field')
-            );
+        if (!this.item?.slugline) {
+            this.notify.error(this.gettext('[SLUGLINE] is a required field'));
             this.$scope.resolve();
             return;
         }
@@ -92,7 +109,7 @@ export class FulFilAssignmentController {
         return Promise.resolve();
     }
 
-    loadWorkspace(store, workspaceChanged) {
+    loadWorkspace(store) {
         this.store = store;
 
         return this.loadArchiveItem()
@@ -120,15 +137,15 @@ export class FulFilAssignmentController {
             }, 1000);
 
             // Only unlock the item if it was locked when launching this modal
-            if (get(this.newsItem, 'lock_session', null) !== null &&
-                get(this.newsItem, 'lock_action', 'edit') === 'fulfil_assignment' &&
-                this.lock.isLockedInCurrentSession(this.newsItem)
+            if (this.newsItem?.lock_session != null
+                && (this.newsItem.lock_action ?? 'edit') === 'fulfil_assignment'
+                && this.lock.isLockedInCurrentSession(this.newsItem)
             ) {
                 this.lock.unlock(this.newsItem);
             }
 
             // update the scope item.
-            if (this.item && get(this.newsItem, 'assignment_id')) {
+            if (this.item && this.newsItem?.assignment_id) {
                 this.item.assignment_id = this.newsItem.assignment_id;
             }
         }
@@ -170,51 +187,42 @@ export class FulFilAssignmentController {
     }
 
     loadArchiveItem() {
-        return this.api.find('archive', this.item._id)
-            .then((newsItem) => {
-                if (get(newsItem, 'assignment_id')) {
-                    this.notify.error(
-                        this.gettext('Item already linked to a Planning item')
-                    );
-                    this.$scope.resolve();
-                    return Promise.reject();
-                }
+        return this.api.find('archive', this.item._id).then((newsItem) => {
+            if (newsItem?.assignment_id) {
+                this.notify.error(this.gettext('Item already linked to a Planning item'));
+                this.$scope.resolve();
+                return Promise.reject();
+            }
 
-                if (this.lock.isLocked(newsItem)) {
-                    this.notify.error(
-                        this.gettext('Item already locked.')
+            if (this.lock.isLocked(newsItem)) {
+                this.notify.error(this.gettext('Item already locked.'));
+                this.$scope.resolve();
+                return Promise.reject();
+            }
+
+            if (!this.lock.isLockedInCurrentSession(newsItem)) {
+                newsItem._editable = true;
+                return this.lock.lock(newsItem, false, 'fulfil_assignment')
+                    .then(
+                        (lockedItem) => Promise.resolve(lockedItem),
+                        (error) => {
+                            this.notify.error(
+                                this.gettext(getErrorMessage(error, 'Failed to lock the item.'))
+                            );
+                            this.$scope.resolve(error);
+                            return Promise.reject(error);
+                        }
                     );
-                    this.$scope.resolve();
-                    return Promise.reject();
-                }
-
-                if (!this.lock.isLockedInCurrentSession(newsItem)) {
-                    newsItem._editable = true;
-                    return this.lock.lock(newsItem, false, 'fulfil_assignment')
-                        .then(
-                            (lockedItem) => Promise.resolve(lockedItem),
-                            (error) => {
-                                this.notify.error(
-                                    this.gettext(
-                                        getErrorMessage(error, 'Failed to lock the item.')
-                                    )
-                                );
-                                this.$scope.resolve(error);
-                                return Promise.reject(error);
-                            }
-                        );
-                }
-
-                return Promise.resolve(newsItem);
-            }, (error) => {
-                this.notify.error(
-                    this.gettext(
-                        getErrorMessage(error, 'Failed to load the item.')
-                    )
-                );
-                this.$scope.resolve(error);
-                return Promise.reject(error);
-            });
+            }
+
+            return Promise.resolve(newsItem);
+        }, (error) => {
+            this.notify.error(
+                this.gettext(getErrorMessage(error, 'Failed to load the item.'))
+            );
+            this.$scope.resolve(error);
+            return Promise.reject(error);
+        });
     }
 }
 

client/extension_bridge.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {IVocabularyItem} from 'superdesk-api';
+import {IArticle, IVocabularyItem} from 'superdesk-api';
 
 import {getAssignmentTypeInfo} from './utils/assignments';
 import {SluglineComponent} from './components/Assignments/AssignmentItem/fields/Slugline';
@@ -10,6 +10,7 @@ import {EditorFieldVocabulary, IEditorFieldVocabularyProps} from './components/f
 
 import {getVocabularyItemFieldTranslated} from './utils/vocabularies';
 import {getUserInterfaceLanguageFromCV} from './utils/users';
+import {isContentLinkToCoverageAllowed} from './utils/archive';
 
 import {registerEditorField} from './components/fields/resources/registerEditorFields';
 import {IAssignmentItem, IEditorFieldProps, IPlanningAppState, IPlanningItem} from 'interfaces';
@@ -20,6 +21,7 @@ import PlanningDetailsWidget, {getItemPlanningInfo} from './components/PlanningD
 interface IExtensionBridge {
     assignments: {
         utils: {
+            isContentLinkToCoverageAllowed(item: IArticle): boolean;
             getAssignmentTypeInfo(
                 assignment: IAssignmentItem,
                 contentTypes: Array<IVocabularyItem>,
@@ -74,6 +76,7 @@ export const extensionBridge: IExtensionBridge = {
     assignments: {
         utils: {
             getAssignmentTypeInfo,
+            isContentLinkToCoverageAllowed,
         },
         components: {
             SluglineComponent,

client/planning-extension/src/extension.ts

@@ -113,7 +113,7 @@ const extension: IExtension = {
         const displayTopbarWidget = superdesk.privileges.hasPrivilege('planning_assignments_view')
             && extensionConfig?.assignmentsTopBarWidget === true;
         const {gettext} = superdesk.localization;
-
+        const planningActionsGroupId = 'planning-actions';
         const {getItemPlanningInfo} = extensionBridge.planning;
 
         const result: IExtensionActivationResult = {
@@ -123,12 +123,12 @@ const extension: IExtension = {
                         getActions: (item) => [
                             {
                                 label: gettext('Unlink as Coverage'),
-                                groupId: 'planning-actions',
+                                groupId: planningActionsGroupId,
                                 icon: 'cut',
                                 onTrigger: () => {
                                     const superdeskArticle = superdesk.entities.article;
 
-                                    // keep in sync with client/planning-extension/src/extension.ts:123
+                                    // keep in sync with index.ts:108
                                     if (
                                         superdesk.privileges.hasPrivilege('archive') &&
                                         item.assignment_id != null &&
@@ -142,6 +142,29 @@ const extension: IExtension = {
                                     ) {
                                         const event = new CustomEvent('planning:unlinkfromcoverage', {detail: {item}});
 
+                                        window.dispatchEvent(event);
+                                    }
+                                },
+                            },
+                            {
+                                label: superdesk.localization.gettext('Fulfil assignment'),
+                                groupId: planningActionsGroupId,
+                                icon: 'calendar-list',
+                                onTrigger: () => {
+                                    const itemStates = ['killed', 'recalled', 'unpublished', 'spiked', 'correction'];
+                                    const {isContentLinkToCoverageAllowed} = extensionBridge.assignments.utils;
+
+                                    // keep in sync with index.ts:79
+                                    if (
+                                        !item.assignment_id &&
+                                        isContentLinkToCoverageAllowed(item) &&
+                                        !superdesk.entities.article.isPersonal(item) &&
+                                        superdesk.privileges.hasPrivilege('archive') &&
+                                        !superdesk.entities.article.isLockedInOtherSession(item) &&
+                                        !itemStates.includes(item.state)
+                                    ) {
+                                        const event = new CustomEvent('planning:fulfilassignment', {detail: item});
+
                                         window.dispatchEvent(event);
                                     }
                                 },

client/planning-extension/src/extension_bridge.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import {IVocabularyItem} from 'superdesk-api';
 import {IAssignmentItem, IEditorFieldProps, IPlanningAppState, IPlanningItem} from '../../interfaces';
+import {IArticle} from 'superdesk-api';
 
 interface IEditorFieldVocabularyProps extends IEditorFieldProps {
     options: Array<any>;
@@ -16,6 +17,7 @@ interface IEditorFieldVocabularyProps extends IEditorFieldProps {
 interface IExtensionBridge {
     assignments: {
         utils: {
+            isContentLinkToCoverageAllowed(item: IArticle): boolean;
             getAssignmentTypeInfo(
                 assignment: IAssignmentItem,
                 contentTypes: Array<IVocabularyItem>,

index.ts

@@ -138,6 +138,35 @@ function configurePlanning(superdesk) {
         });
 }
 
+window.addEventListener('planning:fulfilassignment', (event: CustomEvent) => {
+    const element = window.$(document.createElement('div'));
+    const localScope = ng.get('$rootScope').$new(true);
+    const handleDestroy = () => {
+        localScope.$broadcast('$destroy');
+        element[0].remove();
+    };
+
+    localScope.resolve = handleDestroy;
+    localScope.reject = handleDestroy;
+    localScope.locals = {data: {item: event.detail}};
+
+    new ctrl.FulFilAssignmentController(
+        element,
+        localScope,
+        ng.get('sdPlanningStore'),
+        ng.get('notify'),
+        ng.get('gettext'),
+        ng.get('lock'),
+        ng.get('session'),
+        ng.get('userList'),
+        ng.get('api'),
+        ng.get('$timeout'),
+        ng.get('superdeskFlags'),
+        ng.get('desks')
+    );
+});
+
+
 window.addEventListener('planning:unlinkfromcoverage', (event: CustomEvent) => {
     ctrl.UnlinkAssignmentController(
         event.detail,