Merge branch 'develop' into fix-coverages-data-from-embeded-planning

superdesk · Dec 3, 2024 · 2829e6e · 2829e6e
2 parents 2adf017 + f690905
commit 2829e6e
Show file tree

Hide file tree

Showing 16 changed files with 80 additions and 62 deletions.
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/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
@@ -117,7 +117,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
@@ -143,7 +143,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/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;

diff --git a/e2e/cypress/support/planning/planningList.ts b/e2e/cypress/support/planning/planningList.ts
@@ -136,8 +136,7 @@ export class PlanningList {
             .find('[data-test-id=interval-dropdown-toggle]')
             .click();
 
-        cy.get('[data-test-id=planning-list-panel]')
-            .find('[data-test-id=interval-dropdown]')
+        cy.get('[data-test-id=dropdown-overlay]')
             .find('li')
             .contains(interval)
             .click();

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
     "sinon": "^4.5.0",
     "superdesk-code-style": "1.5.0",
     "superdesk-core": "github:superdesk/superdesk-client-core#develop",
-    "superdesk-ui-framework": "^3.1.15",
+    "superdesk-ui-framework": "^4.0.3",
     "ts-node": "~7.0.1",
     "tslint": "5.11.0",
     "typescript-eslint-parser": "^18.0.0"
-Original file line number
+Diff line change
@@ Expand Up @@
                                 );
                             }}
                             tabindex={0}
-                            zIndex={1051}
                         />
                     </Row>
                 );
@@ Expand Down @@