Merge branch 'develop' into feature/multiple-events-in-planning

MarkLark86 · Dec 3, 2024 · b0869f7 · b0869f7
2 parents 5f59352 + f690905
commit b0869f7
Show file tree

Hide file tree

Showing 47 changed files with 1,450 additions and 884 deletions.
diff --git a/.github/workflows/ci-client.yml b/.github/workflows/ci-client.yml
@@ -19,3 +19,22 @@ jobs:
       - run: npm ci
       - run: npm run test
       - run: npm run lint
+
+  extension:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [14.x]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: npm
+      - run: npm ci
+      - name: install
+        working-directory: client/planning-extension
+        run: npm ci
+      - name: compile
+        working-directory: client/planning-extension
+        run: npm run compile
diff --git a/README.md b/README.md
@@ -204,6 +204,9 @@ Below sections include the config options that can be defined in settings.py.
 * PLANNING_JSON_ASSIGNED_INFO_EXTENDED
     * Defaults to `false`
     * If `true`, it will add to planning JSON output additional info for coverages like assigned desk name/email and assigned user name/email.
+* ASSIGNMENT_MANUAL_REASSIGNMENT_ONLY
+    * Default: False (preserves the current behavior where automatic user assignment occurs)
+    * If true, Disables automatic user assignment for coverage, ensuring that assignments are updated only through explicit manual reassignment
 
 ### Authoring Config
 * PLANNING_CHECK_FOR_ASSIGNMENT_ON_PUBLISH

diff --git a/client/apps/Planning/PlanningListSubNav.tsx b/client/apps/Planning/PlanningListSubNav.tsx
@@ -183,7 +183,7 @@ class PlanningListSubNavComponent extends React.Component<IProps, IState> {
 
         return (
             <div ref={this.onContainerMounted}>
-                <SubNav className="subnav-event-planning" zIndex={1}>
+                <SubNav className="subnav-event-planning">
                     <ButtonGroup align="inline">
                         <FilterSubnavDropdown viewSize={this.state.viewSize} />
 

diff --git a/client/apps/Planning/PlanningSubNav.tsx b/client/apps/Planning/PlanningSubNav.tsx
@@ -86,7 +86,7 @@ export class PlanningSubNavComponent extends React.PureComponent<IProps> {
                 {this.props.withArchiveItem !== true ? null : (
                     <ArchiveItem item={this.props.archiveItem} />
                 )}
-                <SubNav zIndex={3}>
+                <SubNav>
                     <MultiSelectActions />
                     <SearchBox
                         label={gettext('Search planning')}
@@ -110,7 +110,7 @@ export class PlanningSubNavComponent extends React.PureComponent<IProps> {
                         privileges={this.props.privileges}
                     />
                 </SubNav>
-                <SubNav zIndex={2}>
+                <SubNav>
                     <ButtonGroup align="inline">
                         <NavButton
                             icon="filter-large"

diff --git a/client/components/Assignments/FiltersBar.tsx b/client/components/Assignments/FiltersBar.tsx
@@ -41,7 +41,7 @@ export const FiltersBar = ({
     const {gettext} = superdeskApi.localization;
 
     return (
-        <SubNav zIndex={2}>
+        <SubNav>
             <StretchBar>
                 {!showDeskSelection ? (
                     <Fragment>

diff --git a/client/components/Assignments/SubNavBar.tsx b/client/components/Assignments/SubNavBar.tsx
@@ -44,7 +44,7 @@ export class SubNavBar extends React.PureComponent<IProps> {
         const {gettext} = superdeskApi.localization;
 
         return (
-            <SubNav zIndex={3}>
+            <SubNav>
                 {assignmentListSingleGroupView && (
                     <ButtonGroup align="start">
                         <Tooltip

diff --git a/client/components/ContentProfiles/FieldTab/FieldEditor.tsx b/client/components/ContentProfiles/FieldTab/FieldEditor.tsx
@@ -88,6 +88,7 @@ export class FieldEditor extends React.Component<IProps, IState> {
             'schema.required': {enabled: !(this.props.disableRequired || this.props.systemRequired)},
             'schema.read_only': {enabled: this.props.item.name === 'related_plannings'},
             'schema.planning_auto_publish': {enabled: this.props.item.name === 'related_plannings'},
+            'schema.cancel_plan_with_event': {enabled: this.props.item.name === 'related_plannings'},
             'schema.field_type': {enabled: fieldType != null},
             'schema.minlength': {enabled: !disableMinMax},
             'schema.maxlength': {enabled: !disableMinMax},
@@ -190,6 +191,7 @@ export class FieldEditor extends React.Component<IProps, IState> {
                                             'schema.languages': {enabled: true, index: 12},
                                             'schema.default_language': {enabled: true, index: 13},
                                             'schema.planning_auto_publish': {enabled: true, index: 14},
+                                            'schema.cancel_plan_with_event': {enabled: true, index: 14},
                                             'schema.default_value': {enabled: true, index: 11},
                                         },
                                         {

diff --git a/client/components/Coverages/CoverageIcons.tsx b/client/components/Coverages/CoverageIcons.tsx
@@ -97,7 +97,6 @@ export class CoverageIcons extends React.PureComponent<IProps> {
         return (
             <WithPopover
                 placement="auto-end"
-                zIndex={1051}
                 component={() => (
                     <div className="coverages-popup">
                         <Spacer v gap="16">

diff --git a/client/components/Events/EventItem.tsx b/client/components/Events/EventItem.tsx
@@ -118,7 +118,7 @@ class EventItemComponent extends React.Component<IProps, IState> {
 
         return (
             <div>
-                <Menu zIndex={1050} items={itemActions}>
+                <Menu items={itemActions}>
                     {
                         (toggle) => (
                             <div

diff --git a/client/components/Planning/PlanningItem.tsx b/client/components/Planning/PlanningItem.tsx
@@ -144,7 +144,7 @@ class PlanningItemComponent extends React.Component<IProps, IState> {
 
         return (
             <div>
-                <Menu zIndex={1050} items={itemActions}>
+                <Menu items={itemActions}>
                     {
                         (toggle) => (
                             <div

diff --git a/client/components/PlanningTemplatesModal/PlanningTemplatesModal.tsx b/client/components/PlanningTemplatesModal/PlanningTemplatesModal.tsx
@@ -83,8 +83,6 @@ export default class PlanningTemplatesModal extends React.Component<IProps, ISta
                     >
                         <Dropdown
                             maxHeight={300}
-                            append
-                            zIndex={2001}
                             items={calendarDropdownItems.sort((cal1, cal2) => cal1.label.localeCompare(cal2.label))}
                         >
                             {dropdownLabel}

diff --git a/client/components/fields/editor/CustomVocabularies.tsx b/client/components/fields/editor/CustomVocabularies.tsx
@@ -86,7 +86,6 @@ class CustomVocabulariesComponent extends React.PureComponent<IProps> {
                             );
                         }}
                         tabindex={0}
-                        zIndex={1051}
                     />
                 </Row>
             );

diff --git a/client/components/fields/editor/EventRelatedArticles/EventsRelatedArticlesModal.tsx b/client/components/fields/editor/EventRelatedArticles/EventsRelatedArticlesModal.tsx
@@ -162,8 +162,6 @@ export class EventsRelatedArticlesModal extends React.Component<IProps, IState>
                             >
                                 <Dropdown
                                     maxHeight={300}
-                                    append
-                                    zIndex={2001}
                                     items={[
                                         {
                                             type: 'group',

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

diff --git a/client/components/fields/editor/base/treeSelect.tsx b/client/components/fields/editor/base/treeSelect.tsx
@@ -88,7 +88,6 @@ export class EditorFieldTreeSelect<T> extends React.PureComponent<IEditorFieldTr
                     label={this.props.label}
                     tabindex={0}
                     info={this.props.info}
-                    zIndex={1051}
                     sortable={this.props.sortable}
                 />
             </Row>

diff --git a/client/components/fields/resources/profiles.ts b/client/components/fields/resources/profiles.ts
@@ -35,6 +35,17 @@ registerEditorField(
     true
 );
 
+registerEditorField(
+    'schema.cancel_plan_with_event',
+    EditorFieldCheckbox,
+    () => ({
+        label: superdeskApi.localization.gettext('Cancel planning items with Event'),
+        field: 'schema.cancel_plan_with_event',
+    }),
+    null,
+    true
+);
+
 registerEditorField(
     'schema.planning_auto_publish',
     EditorFieldCheckbox,

diff --git a/client/interfaces.ts b/client/interfaces.ts
@@ -1069,6 +1069,7 @@ export interface IProfileSchemaTypeList extends IBaseProfileSchemaType<'list'> {
     mandatory_in_list?: {[key: string]: any};
     vocabularies?: Array<IVocabulary['_id']>;
     planning_auto_publish?: boolean;
+    cancel_plan_with_event?: boolean;
 }
 
 export interface IProfileSchemaTypeInteger extends IBaseProfileSchemaType<'integer'> {}
@@ -1171,6 +1172,7 @@ export interface IEventFormProfile {
         reference: IProfileEditorField;
         slugline: IProfileEditorField;
         subject: IProfileEditorField;
+        related_plannings: IProfileEditorField;
     };
     name: 'event';
     schema: {
@@ -1194,6 +1196,7 @@ export interface IEventFormProfile {
         reference: IProfileSchemaTypeString;
         slugline: IProfileSchemaTypeString;
         subject: IProfileSchemaTypeList;
+        related_plannings: IProfileSchemaTypeList;
     };
 }
 

diff --git a/client/planning-extension/src/assignments-overview/hiddenAssignmentsList.tsx b/client/planning-extension/src/assignments-overview/hiddenAssignmentsList.tsx
@@ -49,7 +49,7 @@ export class AssignmentsCountTracker extends React.PureComponent<{}, {loading: t
                             {menuId: 'MENU_ITEM_PLANNING_ASSIGNMENTS', badgeValue: itemsCount.toString()},
                         );
 
-                        return null;
+                        return <></>;
                     }
                 }
             </LiveAssignmentsHOC>

diff --git a/client/styles/index.scss b/client/styles/index.scss
@@ -108,13 +108,6 @@
   justify-content: flex-end;
 }
 
-// Fix second subnav's z-index in Planning page
-#sd-planning-react-container {
-  .subnav + .subnav {
-    z-index: 1002 !important;
-  }
-}
-
 // Fix react-bootstrap OverlayTrigger's Tooltip inside Modals
 .tooltip {
     z-index: 10000 !important;
-Original file line number
+Diff line change
@@ Expand Up @@
                                 );
                             }}
                             tabindex={0}
-                            zIndex={1051}
                         />
                     </Row>
                 );
@@ Expand Down @@