Fulfil assignment

client/components/Events/ManageEventTemplatesModal.tsx

@@ -1,10 +1,8 @@
 /* eslint-disable react/no-multi-comp */
 
-import {IFormGroup, IBaseRestApiResponse, IGenericListPageComponent} from 'superdesk-api';
-import {superdeskApi} from '../../superdeskApi';
-
 import React from 'react';
-import PropTypes from 'prop-types';
+import {IFormGroup, IBaseRestApiResponse, IPropsGenericFormItemComponent, IFormField} from 'superdesk-api';
+import {superdeskApi} from '../../superdeskApi';
 import {Modal} from '../index';
 import {planningEventTemplateEvents} from '../../actions/events/notifications';
 
@@ -16,67 +14,68 @@ interface IEventTemplate extends IBaseRestApiResponse {
     template_name: string;
 }
 
+const getItemComponent = (nameField: IFormField) =>
+    class ItemComponent extends React.PureComponent<IPropsGenericFormItemComponent<any>> {
+        render(): React.ReactNode {
+            const {item, page} = this.props;
+
+            const {ListItem, ListItemColumn} = superdeskApi.components;
+            const {getFormFieldPreviewComponent} = superdeskApi.forms;
+
+            return (
+                <ListItem>
+                    <ListItemColumn ellipsisAndGrow noBorder>
+                        {getFormFieldPreviewComponent(item, nameField)}
+                    </ListItemColumn>
+                    <ListItemColumn noBorder>
+                        <div
+                            style={{
+                                display: 'flex',
+                                justifyContent: 'space-between',
+                                alignItems: 'center',
+                            }}
+                        >
+                            <button onClick={() => page.startEditing(item._id)}>
+                                <i className="icon-pencil" />
+                            </button>
+                            <button onClick={() => page.deleteItem(item)}>
+                                <i className="icon-trash" />
+                            </button>
+                        </div>
+                    </ListItemColumn>
+                </ListItem>
+            );
+        }
+    };
+
 export class ManageEventTemplatesModal extends React.PureComponent<IProps> {
     static propTypes: any;
 
     render() {
         const {handleHide} = this.props;
 
-        const {getGenericHttpEntityListPageComponent, ListItemColumn, ListItem} = superdeskApi.components;
-        const {getFormFieldPreviewComponent, FormFieldType} = superdeskApi.forms;
-
         const {gettext} = superdeskApi.localization;
+        const {getGenericHttpEntityListPageComponent} = superdeskApi.components;
+        const {FormFieldType} = superdeskApi.forms;
 
-        const nameField = {
+        const nameField: IFormField = {
             label: gettext('Template name'),
-            type: FormFieldType.textSingleLine,
+            type: FormFieldType.plainText,
             field: 'template_name',
             required: true,
         };
 
         const formConfig: IFormGroup = {
             direction: 'vertical',
             type: 'inline',
-            form: [
-                nameField,
-            ],
+            form: [nameField],
         };
 
-        const EventTemplatesComponent = getGenericHttpEntityListPageComponent<IEventTemplate>(
+        const EventTemplatesComponent = getGenericHttpEntityListPageComponent<IEventTemplate, unknown>(
             'events_template',
             formConfig
         );
 
-        const renderRow = (
-            key: string,
-            item: IEventTemplate,
-            page: IGenericListPageComponent<IEventTemplate>
-        ) => (
-            <ListItem
-                key={key}
-            >
-                <ListItemColumn ellipsisAndGrow noBorder>
-                    {getFormFieldPreviewComponent(item, nameField)}
-                </ListItemColumn>
-                <ListItemColumn noBorder>
-                    <div
-                        style={{
-                            display: 'flex',
-                            justifyContent: 'space-between',
-                            alignItems: 'center',
-                        }}
-                    >
-                        <button onClick={() => page.startEditing(item._id)}>
-                            <i className="icon-pencil" />
-                        </button>
-                        <button onClick={() => page.deleteItem(item)}>
-                            <i className="icon-trash" />
-                        </button>
-                    </div>
-                </ListItemColumn>
-            </ListItem>
-        );
-
         return (
             <Modal xLarge={true} show={true} onHide={handleHide}>
                 <Modal.Header>
@@ -87,8 +86,8 @@ export class ManageEventTemplatesModal extends React.PureComponent<IProps> {
                 </Modal.Header>
                 <Modal.Body noPadding={true}>
                     <EventTemplatesComponent
-                        renderRow={renderRow}
-                        formConfig={formConfig}
+                        ItemComponent={getItemComponent(nameField)}
+                        getFormConfig={() => formConfig}
                         defaultSortOption={{field: nameField.field, direction: 'ascending'}}
                         fieldForSearch={nameField}
                         refreshOnEvents={Object.keys(planningEventTemplateEvents)}
@@ -104,7 +103,3 @@ export class ManageEventTemplatesModal extends React.PureComponent<IProps> {
         );
     }
 }
-
-ManageEventTemplatesModal.propTypes = {
-    handleHide: PropTypes.func,
-};

client/extension_bridge.ts

@@ -1,7 +1,7 @@
 import {IAssignmentItem} from 'interfaces';
 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';
@@ -11,11 +11,13 @@ import {EditorFieldVocabulary, IEditorFieldVocabularyProps} from './components/f
 
 import {getVocabularyItemFieldTranslated} from './utils/vocabularies';
 import {getUserInterfaceLanguageFromCV} from './utils/users';
+import {isContentLinkToCoverageAllowed} from 'utils/archive';
 
 // KEEP IN SYNC WITH client/planning-extension/src/extension_bridge.ts
 interface IExtensionBridge {
     assignments: {
         utils: {
+            isContentLinkToCoverageAllowed(item: IArticle): boolean;
             getAssignmentTypeInfo(
                 assignment: IAssignmentItem,
                 contentTypes: Array<IVocabularyItem>,
@@ -57,6 +59,7 @@ export const extensionBridge: IExtensionBridge = {
     assignments: {
         utils: {
             getAssignmentTypeInfo,
+            isContentLinkToCoverageAllowed,
         },
         components: {
             SluglineComponent,

client/planning-extension/src/extension.ts

@@ -13,6 +13,8 @@ import {AssignmentsList} from './assignments-overview';
 import {IPlanningExtensionConfigurationOptions} from './extension_configuration_options';
 import {AutopostIngestRuleEditor} from './ingest_rule_autopost/AutopostIngestRuleEditor';
 import {AutopostIngestRulePreview} from './ingest_rule_autopost/AutopostIngestRulePreview';
+import {extensionBridge} from './extension_bridge';
+const {isContentLinkToCoverageAllowed} = extensionBridge.assignments.utils;
 
 function onSpike(superdesk: ISuperdesk, item: IArticle) {
     const {gettext} = superdesk.localization;
@@ -105,35 +107,52 @@ const extension: IExtension = {
     activate: (superdesk: ISuperdesk) => {
         const extensionConfig: IPlanningExtensionConfigurationOptions = superdesk.getExtensionConfig();
 
-        return superdesk.privileges.getOwnPrivileges().then((privileges) => {
-            const displayTopbarWidget = privileges['planning_assignments_view'] === 1
-                && extensionConfig?.assignmentsTopBarWidget === true;
-
-            const result: IExtensionActivationResult = {
-                contributions: {
-                    entities: {
-                        article: {
-                            onSpike: (item: IArticle) => onSpike(superdesk, item),
-                            onSpikeMultiple: (items: Array<IArticle>) => onSpikeMultiple(superdesk, items),
-                            onPublish: (item: IArticle) => onPublishArticle(superdesk, item),
-                            onRewriteAfter: (item: IArticle) => onArticleRewriteAfter(superdesk, item),
-                            onSendBefore: (items: Array<IArticle>, desk: IDesk) => onSendBefore(superdesk, items, desk),
-                        },
-                        ingest: {
-                            ruleHandlers: {
-                                planning_publish: {
-                                    editor: AutopostIngestRuleEditor,
-                                    preview: AutopostIngestRulePreview,
-                                },
+        const displayTopbarWidget = superdesk.privileges.hasPrivilege('planning_assignments_view')
+            && extensionConfig?.assignmentsTopBarWidget === true;
+
+        const result: IExtensionActivationResult = {
+            contributions: {
+                entities: {
+                    article: {
+                        getActions: (item) => [{
+                            label: superdesk.localization.gettext('Fulfil assignment'),
+                            groupId: 'planning-actions',
+                            icon: 'calendar-list',
+                            onTrigger: () => {
+                                if (
+                                    !item.assignment_id &&
+                                    isContentLinkToCoverageAllowed(item) &&
+                                    !superdesk.entities.article.isPersonal(item) &&
+                                    superdesk.privileges.hasPrivilege('archive') &&
+                                    !superdesk.entities.article.isLockedInOtherSession(item) &&
+                                    !['killed', 'recalled', 'unpublished', 'spiked', 'correction'].includes(item.state)
+                                ) {
+                                    const event = new CustomEvent('planning:fulfilassignment', {detail: item});
+
+                                    window.dispatchEvent(event);
+                                }
+                            },
+                        }],
+                        onSpike: (item: IArticle) => onSpike(superdesk, item),
+                        onSpikeMultiple: (items: Array<IArticle>) => onSpikeMultiple(superdesk, items),
+                        onPublish: (item: IArticle) => onPublishArticle(superdesk, item),
+                        onRewriteAfter: (item: IArticle) => onArticleRewriteAfter(superdesk, item),
+                        onSendBefore: (items: Array<IArticle>, desk: IDesk) => onSendBefore(superdesk, items, desk),
+                    },
+                    ingest: {
+                        ruleHandlers: {
+                            planning_publish: {
+                                editor: AutopostIngestRuleEditor,
+                                preview: AutopostIngestRulePreview,
                             },
                         },
                     },
-                    globalMenuHorizontal: displayTopbarWidget ? [AssignmentsList] : [],
                 },
-            };
+                globalMenuHorizontal: displayTopbarWidget ? [AssignmentsList] : [],
+            },
+        };
 
-            return result;
-        });
+        return Promise.resolve(result);
     },
 };
 

client/planning-extension/src/extension_bridge.ts

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

client/utils/gettext.ts

@@ -11,7 +11,7 @@ import * as utils from 'core/utils';
  * @param {Object} params
  * @return {String}
  */
-export const gettext = (text, params = null) => utils.gettext(text, params);
+export const gettext = (text, params = {}) => utils.gettext(text, params);
 
 export function gettextCatalog(text, params = null) {
     if (!text) {

client/utils/ui.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import {Provider} from 'react-redux';
 import $ from 'jquery';
-
-import {planningApi, superdeskApi} from '../superdeskApi';
+import {planningApi} from '../superdeskApi';
+import {showModal} from '@superdesk/common';
 
 const scrollListItemIfNeeded = (selectedIndex, listRefElement) => {
     if (listRefElement.children.length > 0) {
@@ -29,7 +29,7 @@ export function showModalConnectedToStore<T = any>(
     Component: React.ComponentType<{closeModal(): void} & any>,
     props?: T,
 ): Promise<void> {
-    return superdeskApi.ui.showModal(
+    return showModal(
         ({closeModal}) => (
             <Provider store={planningApi.redux.store}>
                 <Component

e2e/package.json

@@ -2,7 +2,7 @@
   "name": "superdesk",
   "license": "GPL-3.0",
   "dependencies": {
-    "superdesk-core": "github:superdesk/superdesk-client-core#develop",
+    "superdesk-core": "github:superdesk/superdesk-client-core#authoring-react-post-broadcasting",
     "superdesk-planning": "file:../"
   },
   "devDependencies": {

index.ts

@@ -9,7 +9,7 @@ import planningModule from './client';
 import * as ctrl from './client/controllers';
 import {gettext} from './client/utils/gettext';
 import {isContentLinkToCoverageAllowed} from './client/utils/archive';
-
+import ng from 'superdesk-core/scripts/core/services/ng';
 
 configurePlanning.$inject = ['superdeskProvider'];
 function configurePlanning(superdesk) {
@@ -134,5 +134,34 @@ 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')
+    );
+});
+
+
 export default planningModule
     .config(configurePlanning);