diff --git a/client/apps/Planning/PlanningListSubNav.tsx b/client/apps/Planning/PlanningListSubNav.tsx index 479cf9252..e14ed57bb 100644 --- a/client/apps/Planning/PlanningListSubNav.tsx +++ b/client/apps/Planning/PlanningListSubNav.tsx @@ -183,7 +183,7 @@ class PlanningListSubNavComponent extends React.Component { return (
- + diff --git a/client/apps/Planning/PlanningSubNav.tsx b/client/apps/Planning/PlanningSubNav.tsx index 46a816ecc..ae609efd6 100644 --- a/client/apps/Planning/PlanningSubNav.tsx +++ b/client/apps/Planning/PlanningSubNav.tsx @@ -86,7 +86,7 @@ export class PlanningSubNavComponent extends React.PureComponent { {this.props.withArchiveItem !== true ? null : ( )} - + { privileges={this.props.privileges} /> - + + {!showDeskSelection ? ( diff --git a/client/components/Assignments/SubNavBar.tsx b/client/components/Assignments/SubNavBar.tsx index b97a43acd..e70103e59 100644 --- a/client/components/Assignments/SubNavBar.tsx +++ b/client/components/Assignments/SubNavBar.tsx @@ -44,7 +44,7 @@ export class SubNavBar extends React.PureComponent { const {gettext} = superdeskApi.localization; return ( - + {assignmentListSingleGroupView && ( { return ( (
diff --git a/client/components/Events/EventItem.tsx b/client/components/Events/EventItem.tsx index 113ed4da4..d8823b27d 100644 --- a/client/components/Events/EventItem.tsx +++ b/client/components/Events/EventItem.tsx @@ -117,7 +117,7 @@ class EventItemComponent extends React.Component { return (
- + { (toggle) => (
{ return (
- + { (toggle) => (
cal1.label.localeCompare(cal2.label))} > {dropdownLabel} diff --git a/client/components/fields/editor/CustomVocabularies.tsx b/client/components/fields/editor/CustomVocabularies.tsx index 927dae8b8..27eedb00a 100644 --- a/client/components/fields/editor/CustomVocabularies.tsx +++ b/client/components/fields/editor/CustomVocabularies.tsx @@ -86,7 +86,6 @@ class CustomVocabulariesComponent extends React.PureComponent { ); }} tabindex={0} - zIndex={1051} /> ); diff --git a/client/components/fields/editor/EventRelatedArticles/EventsRelatedArticlesModal.tsx b/client/components/fields/editor/EventRelatedArticles/EventsRelatedArticlesModal.tsx index 2f1fc86c7..08cff86e3 100644 --- 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 > { 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 index 70095b663..92390cbf3 100644 --- a/client/components/fields/editor/base/treeSelect.tsx +++ b/client/components/fields/editor/base/treeSelect.tsx @@ -88,7 +88,6 @@ export class EditorFieldTreeSelect extends React.PureComponent diff --git a/client/styles/index.scss b/client/styles/index.scss index 3d03fffb7..f74f005d8 100644 --- 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 index f8925afbc..c37ce7c27 100644 --- 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 index 5ecf73bbb..151d5e925 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3279,21 +3279,10 @@ } }, "ent": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.1.tgz", - "integrity": "sha512-QHuXVeZx9d+tIQAz/XztU0ZwZf2Agg9CcXcgE1rurqvdBeDBrpSwjl8/6XUqMg7tw2Y7uAdKb2sRv+bSEFqQ5A==", - "dev": true, - "requires": { - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", - "dev": true - } - } + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==", + "dev": true }, "entities": { "version": "2.2.0", @@ -10208,17 +10197,10 @@ } }, "reflect.ownkeys": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-1.1.4.tgz", - "integrity": "sha512-iUNmtLgzudssL+qnTUosCmnq3eczlrVd1wXrgx/GhiI/8FvwrTYWtCJ9PNvWIRX+4ftupj2WUfB5mu5s9t6LnA==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-set-tostringtag": "^2.0.1", - "globalthis": "^1.0.3" - } + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz", + "integrity": "sha512-qOLsBKHCpSOFKK1NUOCGC5VyeufB6lEsFe92AL2bhIJsacZS1qdoOZSbPk3MYKuT2cFlRDnulKXuuElIrMjGUg==", + "dev": true }, "regenerator-runtime": { "version": "0.14.1", @@ -11847,6 +11829,12 @@ "integrity": "sha512-j/Toj7f1z98Hh2cYo2BVr85EpIRWqUi7rtRSGxh/cqUjqrnJe9l9UE7IUGd2vQ2p+kSHLkSzObQPZPLUC6TQwg==", "dev": true }, + "circular-json": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "dev": true + }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -12352,13 +12340,55 @@ "invariant": "^2.2.4", "prop-types": "^15.5.7" } + }, + "superdesk-ui-framework": { + "version": "3.1.29", + "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.1.29.tgz", + "integrity": "sha512-Dowv3C7+0i3uzqTKwZONSdbvhrRkzesNw6laaJQ80IcuJT7/15VPNspcWK9+eYZQTn3nGJwJZpwdj1i37nLUtA==", + "dev": true, + "requires": { + "@popperjs/core": "^2.4.0", + "@superdesk/common": "0.0.28", + "@superdesk/primereact": "^5.0.2-12", + "@superdesk/react-resizable-panels": "0.0.39", + "chart.js": "^2.9.3", + "date-fns": "2.7.0", + "popper-max-size-modifier": "^0.2.0", + "popper.js": "1.14.4", + "primeicons": "2.0.0", + "react-beautiful-dnd": "^13.0.0", + "react-id-generator": "^3.0.0", + "react-scrollspy": "^3.4.3" + }, + "dependencies": { + "@superdesk/common": { + "version": "0.0.28", + "resolved": "https://registry.npmjs.org/@superdesk/common/-/common-0.0.28.tgz", + "integrity": "sha512-EhsYMm340r3FVrakH00lLvQbxVYYTzL61J5GXI3BI2xLN2dPI3N0AJEaMGqjbt0xUpUFxE3T08OtYvIC5koZvg==", + "dev": true, + "requires": { + "date-fns": "2.7.0", + "lodash": "4.17.19", + "primereact": "^6.0.2", + "react": "16.9.0", + "react-dom": "16.9.0", + "react-sortable-hoc": "^1.11.0" + } + }, + "date-fns": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.7.0.tgz", + "integrity": "sha512-wxYp2PGoUDN5ZEACc61aOtYFvSsJUylIvCjpjDOqM1UDaKIIuMJ9fAnMYFHV3TQaDpfTVxhwNK/GiCaHKuemTA==", + "dev": true + } + } } } }, "superdesk-ui-framework": { - "version": "3.1.29", - "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.1.29.tgz", - "integrity": "sha512-Dowv3C7+0i3uzqTKwZONSdbvhrRkzesNw6laaJQ80IcuJT7/15VPNspcWK9+eYZQTn3nGJwJZpwdj1i37nLUtA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-4.0.3.tgz", + "integrity": "sha512-LUNR1u3sK4Ayiq74hXZ5fqp7k9OK/MJogsEXJfeaJQyBWzRdbzwyYjljIXh7gJJExtDEBokLxU33IpjuXuITJA==", "dev": true, "requires": { "@popperjs/core": "^2.4.0", @@ -12387,16 +12417,20 @@ "react": "16.9.0", "react-dom": "16.9.0", "react-sortable-hoc": "^1.11.0" - }, - "dependencies": { - "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", - "dev": true - } } }, + "date-fns": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.7.0.tgz", + "integrity": "sha512-wxYp2PGoUDN5ZEACc61aOtYFvSsJUylIvCjpjDOqM1UDaKIIuMJ9fAnMYFHV3TQaDpfTVxhwNK/GiCaHKuemTA==", + "dev": true + }, + "lodash": { + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", + "dev": true + }, "react-sortable-hoc": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-1.11.0.tgz", diff --git a/package.json b/package.json index 04934e694..4b3712f95 100644 --- 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"