Authoring react post broadcasting (#1904)

superdesk · Feb 6, 2024 · 218767b · 218767b
1 parent 65434dc
commit 218767b
Show file tree

Hide file tree

Showing 22 changed files with 1,744 additions and 821 deletions.
diff --git a/client/actions/assignments/ui.ts b/client/actions/assignments/ui.ts
@@ -1,7 +1,7 @@
 import {get, cloneDeep, forEach} from 'lodash';
 import moment from 'moment';
 
-import {planningApi} from '../../superdeskApi';
+import {planningApi, superdeskApi} from '../../superdeskApi';
 import {IAssignmentItem} from '../../interfaces';
 
 import {showModal} from '../index';
@@ -628,12 +628,10 @@ function startWorking(assignment: IAssignmentItem) {
         promise.then(() =>
             (planningApi.locks.lockItem(assignment, 'start_working')
                 .then((lockedAssignment) => {
-                    const currentDesk = assignmentUtils.getCurrentSelectedDesk(desks, getState());
-                    const defaultTemplateId = get(currentDesk, 'default_content_template') || null;
+                    const defaultTemplateId = assignmentUtils
+                        .getCurrentSelectedDesk(desks, getState())?.default_content_template ?? null;
 
-                    return templates.fetchTemplatesByUserDesk(
-                        session.identity._id,
-                        get(currentDesk, '_id') || null,
+                    return superdeskApi.entities.templates.getUserTemplates(
                         1,
                         200,
                         'create'

diff --git a/client/actions/main.ts b/client/actions/main.ts
@@ -823,22 +823,15 @@ function _filter(filterType: PLANNING_VIEW, params: ICombinedEventOrPlanningSear
         if (currentFilterId != undefined || filterType === PLANNING_VIEW.COMBINED) {
             promise = planningApi.ui.list.changeFilterId(currentFilterId, params);
         } else if (filterType === PLANNING_VIEW.EVENTS) {
-            const calendar = urlParams.getString('calendar') ||
-                lastParams?.calendars?.[0] ||
-                (lastParams?.noCalendarAssigned ?
-                    EVENTS.FILTER.NO_CALENDAR_ASSIGNED :
-                    EVENTS.FILTER.ALL_CALENDARS
-                );
-
-            const calender = $location.search().calendar ||
+            const calendar = $location.search().calendar ||
                 get(lastParams, 'calendars[0]', null) ||
                 (get(lastParams, 'noCalendarAssigned', false) ?
-                    EVENTS.FILTER.NO_CALENDAR_ASSIGNED :
-                    EVENTS.FILTER.ALL_CALENDARS
+                    {qcode: EVENTS.FILTER.NO_CALENDAR_ASSIGNED} :
+                    {qcode: EVENTS.FILTER.ALL_CALENDARS}
                 );
 
             promise = planningApi.ui.list.changeCalendarId(
-                calender,
+                calendar.qcode,
                 params
             );
         } else if (filterType === PLANNING_VIEW.PLANNING) {

diff --git a/client/components/Events/ManageEventTemplatesModal.tsx b/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,
-};
diff --git a/client/components/fields/editor/base/numberSelect.tsx b/client/components/fields/editor/base/numberSelect.tsx
@@ -103,6 +103,7 @@ export class EditorFieldNumberSelect extends React.PureComponent<IProps> {
                 value={values}
                 onChange={this.onChangeMultiple}
                 allowMultiple={true}
+                zIndex={1051}
             />
         );
     }

diff --git a/client/controllers/AddToPlanningController.tsx b/client/controllers/AddToPlanningController.tsx
@@ -9,7 +9,7 @@ import {planning} from '../actions';
 import {get, isEmpty, isNumber} from 'lodash';
 import {registerNotifications, getErrorMessage, isExistingItem} from '../utils';
 import {WORKSPACE, MODALS, MAIN} from '../constants';
-import {GET_LABEL_MAP, DEFAULT_SCHEMA} from 'superdesk-core/scripts/apps/workspace/content/constants';
+import {GET_LABEL_MAP} from 'superdesk-core/scripts/apps/workspace/content/constants';
 import {planningApi} from '../superdeskApi';
 
 const DEFAULT_PLANNING_SCHEMA = {
@@ -207,7 +207,6 @@ export class AddToPlanningController {
                 }
 
                 Object.keys(schema)
-                    .filter((field) => DEFAULT_SCHEMA.hasOwnProperty(field)) // filter out planning only fields
                     .filter((field) => get(schema[field], 'required') &&
                         isEmpty(get(newsItem, field)) &&
                         !isNumber(get(newsItem, field)))