diff --git a/README.rst b/README.rst index 7b0dfcec30..edd2e6fe7c 100644 --- a/README.rst +++ b/README.rst @@ -310,4 +310,4 @@ Please do not report security issues in public, and email security@openedx.org i .. |codecov-badge| image:: https://codecov.io/github/openedx/frontend-app-course-authoring/coverage.svg?branch=master :target: https://codecov.io/github/openedx/frontend-app-course-authoring?branch=master - :alt: Codecov \ No newline at end of file + :alt: Codecov diff --git a/package-lock.json b/package-lock.json index 211d279603..3379d0ce82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,11 @@ "version": "0.1.0", "license": "AGPL-3.0", "dependencies": { - "@edx/brand": "npm:@edx/brand-openedx@1.1.0", + "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", "@edx/frontend-component-footer": "^12.3.0", "@edx/frontend-component-header": "^4.7.0", "@edx/frontend-enterprise-hotjar": "^1.2.1", - "@edx/frontend-lib-content-components": "1.174.0", + "@edx/frontend-lib-content-components": "1.175.0", "@edx/frontend-platform": "4.6.3", "@edx/paragon": "^20.45.4", "@fortawesome/fontawesome-svg-core": "1.2.28", @@ -2224,9 +2224,10 @@ } }, "node_modules/@edx/brand": { - "name": "@edx/brand-openedx", - "version": "1.1.0", - "license": "GPL-3.0-or-later" + "name": "@openedx/brand-openedx", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@openedx/brand-openedx/-/brand-openedx-1.2.2.tgz", + "integrity": "sha512-mBvxR7aB9290j9+h3d/9G8VkG1b8ecLSmlxc0vskfm7DL/fKUzFmHAj3PI7Z4kkwCQOL4QT5mJHJKC0ZFf7qvQ==" }, "node_modules/@edx/browserslist-config": { "version": "1.0.0", @@ -2990,9 +2991,9 @@ } }, "node_modules/@edx/frontend-lib-content-components": { - "version": "1.174.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-lib-content-components/-/frontend-lib-content-components-1.174.0.tgz", - "integrity": "sha512-Vwf9XHEYZ4yA9J40AsIfCgn6rF/SPBual2P3/FoniRy2MazfXALA7ikAAWaoGdn0RGfgY51TaTcum4A4ImE0uw==", + "version": "1.175.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-lib-content-components/-/frontend-lib-content-components-1.175.0.tgz", + "integrity": "sha512-HEceumyPV3yFKIEG0ZnNeSREkPKZBe+9E2md0e7+cnwOP7HDwQJntUQwrISwIQ7r5vQ1sLwxM5RqmR2SOi97XA==", "dependencies": { "@codemirror/lang-html": "^6.0.0", "@codemirror/lang-xml": "^6.0.0", @@ -3041,13 +3042,14 @@ "integrity": "sha512-T1+6P52Yx7SMkmoIr4O0Q3m/DyRdrLTJbv1xVijdRLFEq1hqdafEs+Ln1423U5LSkTePb9AOkEtL1G0RZLFl1w==" }, "node_modules/@edx/frontend-lib-content-components/node_modules/@reduxjs/toolkit": { - "version": "1.8.5", - "license": "MIT", + "version": "1.9.7", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.7.tgz", + "integrity": "sha512-t7v8ZPxhhKgOKtU+uyJT13lu4vL7az5aFi4IdoDs/eS548edn2M8Ik9h8fxgvMjGoAUVFSt6ZC1P5cWmQ014QQ==", "dependencies": { - "immer": "^9.0.7", - "redux": "^4.1.2", - "redux-thunk": "^2.4.1", - "reselect": "^4.1.5" + "immer": "^9.0.21", + "redux": "^4.2.1", + "redux-thunk": "^2.4.2", + "reselect": "^4.1.8" }, "peerDependencies": { "react": "^16.9.0 || ^17.0.0 || ^18", @@ -3062,23 +3064,18 @@ } } }, - "node_modules/@edx/frontend-lib-content-components/node_modules/fast-xml-parser": { - "version": "4.0.12", - "license": "MIT", + "node_modules/@edx/frontend-lib-content-components/node_modules/@reduxjs/toolkit/node_modules/redux": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", + "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", "dependencies": { - "strnum": "^1.0.5" - }, - "bin": { - "fxparser": "src/cli/cli.js" - }, - "funding": { - "type": "paypal", - "url": "https://paypal.me/naturalintelligence" + "@babel/runtime": "^7.9.2" } }, "node_modules/@edx/frontend-lib-content-components/node_modules/immer": { - "version": "9.0.15", - "license": "MIT", + "version": "9.0.21", + "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz", + "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==", "funding": { "type": "opencollective", "url": "https://opencollective.com/immer" @@ -3086,14 +3083,16 @@ }, "node_modules/@edx/frontend-lib-content-components/node_modules/moment": { "version": "2.29.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", "engines": { "node": "*" } }, "node_modules/@edx/frontend-lib-content-components/node_modules/react-responsive": { "version": "8.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-responsive/-/react-responsive-8.2.0.tgz", + "integrity": "sha512-iagCqVrw4QSjhxKp3I/YK6+ODkWY6G+YPElvdYKiUUbywwh9Ds0M7r26Fj2/7dWFFbOpcGnJE6uE7aMck8j5Qg==", "dependencies": { "hyphenate-style-name": "^1.0.0", "matchmediaquery": "^0.3.0", @@ -3109,7 +3108,8 @@ }, "node_modules/@edx/frontend-lib-content-components/node_modules/react-transition-group": { "version": "4.4.2", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz", + "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==", "dependencies": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -3123,7 +3123,8 @@ }, "node_modules/@edx/frontend-lib-content-components/node_modules/redux": { "version": "4.1.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz", + "integrity": "sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==", "dependencies": { "@babel/runtime": "^7.9.2" } @@ -13138,6 +13139,27 @@ "version": "2.0.6", "license": "MIT" }, + "node_modules/fast-xml-parser": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz", + "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + }, + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + } + ], + "dependencies": { + "strnum": "^1.0.5" + }, + "bin": { + "fxparser": "src/cli/cli.js" + } + }, "node_modules/fastest-levenshtein": { "version": "1.0.16", "license": "MIT", diff --git a/package.json b/package.json index 6c5519e0f0..a978749c59 100644 --- a/package.json +++ b/package.json @@ -35,11 +35,11 @@ "url": "https://github.com/openedx/frontend-app-course-authoring/issues" }, "dependencies": { - "@edx/brand": "npm:@edx/brand-openedx@1.1.0", + "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", "@edx/frontend-component-footer": "^12.3.0", "@edx/frontend-component-header": "^4.7.0", "@edx/frontend-enterprise-hotjar": "^1.2.1", - "@edx/frontend-lib-content-components": "1.174.0", + "@edx/frontend-lib-content-components": "1.175.0", "@edx/frontend-platform": "4.6.3", "@edx/paragon": "^20.45.4", "@fortawesome/fontawesome-svg-core": "1.2.28", diff --git a/renovate.json b/renovate.json index de124eb9c4..dae6f07d08 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,7 @@ { "extends": [ "config:base", - "schedule:daily", + "schedule:weekly", ":rebaseStalePrs", ":semanticCommits", ":dependencyDashboard" @@ -13,6 +13,9 @@ "rebaseStalePrs": true, "packageRules": [ { + "extends": [ + "schedule:daily" + ], "matchPackagePatterns": ["@edx", "@openedx"], "matchUpdateTypes": ["minor", "patch"], "automerge": false @@ -20,10 +23,10 @@ { "matchPackagePatterns": ["@edx/frontend-lib-content-components"], "matchUpdateTypes": ["minor", "patch"], - "automerge": true, + "automerge": false, "schedule": [ - "after 9am", - "before 5pm" + "after 1am", + "before 11pm" ] } ] diff --git a/src/index.scss b/src/index.scss index 480e868998..430007166e 100755 --- a/src/index.scss +++ b/src/index.scss @@ -19,4 +19,5 @@ @import "course-updates/CourseUpdates"; @import "export-page/CourseExportPage"; @import "import-page/CourseImportPage"; +@import "files-and-uploads/table-components/GalleryCard"; @import "taxonomy/taxonomy-card/TaxonomyCard.scss"; diff --git a/src/taxonomy/index.js b/src/taxonomy/index.js index 4fc3470bb7..f47e0315fc 100644 --- a/src/taxonomy/index.js +++ b/src/taxonomy/index.js @@ -1,2 +1,2 @@ export { default as TaxonomyListPage } from './TaxonomyListPage'; -export { TaxonomyDetailPage } from './taxonomy-detail'; +export { default as TaxonomyDetailPage } from './taxonomy-detail/TaxonomyDetailPage'; diff --git a/src/taxonomy/taxonomy-card/TaxonomyCard.jsx b/src/taxonomy/taxonomy-card/TaxonomyCard.jsx index 0f1e20f8d4..a5af87f695 100644 --- a/src/taxonomy/taxonomy-card/TaxonomyCard.jsx +++ b/src/taxonomy/taxonomy-card/TaxonomyCard.jsx @@ -29,6 +29,7 @@ const TaxonomyCard = ({ className, original, intl }) => { setIsExportModalOpen(true); break; default: + /* istanbul ignore next */ break; } }; @@ -95,7 +96,6 @@ const TaxonomyCard = ({ className, original, intl }) => { isOpen={isExportModalOpen} onClose={() => setIsExportModalOpen(false)} taxonomyId={id} - taxonomyName={name} /> )} @@ -103,7 +103,7 @@ const TaxonomyCard = ({ className, original, intl }) => { return ( <> - + setMenuIsOpen(true)} ref={setMenuTarget} diff --git a/src/taxonomy/taxonomy-detail/index.js b/src/taxonomy/taxonomy-detail/index.js deleted file mode 100644 index 452695f08f..0000000000 --- a/src/taxonomy/taxonomy-detail/index.js +++ /dev/null @@ -1,2 +0,0 @@ -// eslint-disable-next-line import/prefer-default-export -export { default as TaxonomyDetailPage } from './TaxonomyDetailPage';