diff --git a/package-lock.json b/package-lock.json index 2484e2d69..fdb27306e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "AGPL-3.0", "dependencies": { "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", - "@edx/frontend-component-footer": "^14.3.0", + "@edx/frontend-component-footer": "^14.6.0", "@edx/frontend-component-header": "^6.2.0", "@edx/frontend-platform": "^8.3.1", "@edx/openedx-atlas": "^0.6.0", @@ -18,7 +18,6 @@ "@fortawesome/free-brands-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", "@fortawesome/react-fontawesome": "^0.2.0", - "@openedx/frontend-slot-footer": "^1.0.2", "@openedx/paragon": "^22.16.0", "@redux-beacon/segment": "^1.1.0", "@redux-devtools/extension": "3.0.0", @@ -2079,9 +2078,9 @@ } }, "node_modules/@edx/frontend-component-footer": { - "version": "14.4.0", - "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-14.4.0.tgz", - "integrity": "sha512-JGMCTV77+Mb0CBqfE+vv82F2nCHpY3SULRaRcJnralsoMuAWGo8eYzV0yRnwye7isv2siMetBAAZ9yebJzISNw==", + "version": "14.6.0", + "resolved": "https://registry.npmjs.org/@edx/frontend-component-footer/-/frontend-component-footer-14.6.0.tgz", + "integrity": "sha512-cgRhom6W/WErQ9yvLmfgB6ANBs+rBDLOH73NcvJIhfwWgAg67q+MLUscIbcX9N/9Yykk+kb7Ytr3CDefiKS7HA==", "license": "AGPL-3.0", "dependencies": { "@fortawesome/fontawesome-svg-core": "6.7.2", @@ -2089,6 +2088,7 @@ "@fortawesome/free-regular-svg-icons": "6.7.2", "@fortawesome/free-solid-svg-icons": "6.7.2", "@fortawesome/react-fontawesome": "0.2.2", + "@openedx/frontend-plugin-framework": "^1.7.0", "classnames": "^2.5.1", "jest-environment-jsdom": "^29.7.0", "lodash": "^4.17.21", @@ -4067,20 +4067,6 @@ } } }, - "node_modules/@openedx/frontend-slot-footer": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@openedx/frontend-slot-footer/-/frontend-slot-footer-1.2.0.tgz", - "integrity": "sha512-bJuqgdiAlPRj1QuUOJWtNqGTCTcdsk4vHeOM3jRkxtWycq+j1JpGnnZEWAmjoRv9dDKr39vt2buNrmvj0sCTbA==", - "license": "AGPL-3.0", - "dependencies": { - "@openedx/frontend-plugin-framework": "^1.5.0" - }, - "peerDependencies": { - "@edx/frontend-component-footer": "*", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0" - } - }, "node_modules/@openedx/paragon": { "version": "22.17.0", "resolved": "https://registry.npmjs.org/@openedx/paragon/-/paragon-22.17.0.tgz", diff --git a/package.json b/package.json index d1eb26b45..e19fa659c 100755 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", - "@edx/frontend-component-footer": "^14.3.0", + "@edx/frontend-component-footer": "^14.6.0", "@edx/frontend-component-header": "^6.2.0", "@edx/frontend-platform": "^8.3.1", "@edx/openedx-atlas": "^0.6.0", @@ -36,7 +36,6 @@ "@fortawesome/free-brands-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", "@fortawesome/react-fontawesome": "^0.2.0", - "@openedx/frontend-slot-footer": "^1.0.2", "@openedx/paragon": "^22.16.0", "@redux-beacon/segment": "^1.1.0", "@redux-devtools/extension": "3.0.0", diff --git a/src/App.jsx b/src/App.jsx index e8d513c61..53bfc0d0e 100755 --- a/src/App.jsx +++ b/src/App.jsx @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { BrowserRouter as Router } from 'react-router-dom'; -import FooterSlot from '@openedx/frontend-slot-footer'; +import { FooterSlot } from '@edx/frontend-component-footer'; import { LearningHeader as Header } from '@edx/frontend-component-header'; import { selectors } from 'data/redux'; diff --git a/src/App.test.jsx b/src/App.test.jsx index 5b1cd3849..8b011d6ce 100644 --- a/src/App.test.jsx +++ b/src/App.test.jsx @@ -15,7 +15,7 @@ jest.mock('data/redux', () => ({ jest.mock('@edx/frontend-component-header', () => ({ LearningHeader: 'Header', })); -jest.mock('@edx/frontend-component-footer', () => ({ FooterSlot: 'Footer' })); +jest.mock('@edx/frontend-component-footer', () => ({ FooterSlot: 'FooterSlot' })); jest.mock('containers/DemoWarning', () => 'DemoWarning'); jest.mock('containers/ListView', () => 'ListView'); diff --git a/src/plugin-slots/FooterSlot/README.md b/src/plugin-slots/FooterSlot/README.md index d7f718c11..f7bfc3004 100644 --- a/src/plugin-slots/FooterSlot/README.md +++ b/src/plugin-slots/FooterSlot/README.md @@ -1,12 +1,15 @@ # Footer Slot -### Slot ID: `footer_slot` +### Slot ID: `org.openedx.frontend.layout.footer.v1` + +### Slot ID Aliases +* `footer_slot` ## Description This slot is used to replace/modify/hide the footer. -The implementation of the `FooterSlot` component lives in [the `frontend-slot-footer` repository](https://github.com/openedx/frontend-slot-footer/). +The implementation of the `FooterSlot` component lives in [the `frontend-component-footer` repository](https://github.com/openedx/frontend-component-footer/). ## Example @@ -23,7 +26,7 @@ import { DIRECT_PLUGIN, PLUGIN_OPERATIONS } from '@openedx/frontend-plugin-frame const config = { pluginSlots: { - footer_slot: { + 'org.openedx.frontend.layout.footer.v1': { plugins: [ { // Hide the default footer diff --git a/src/plugin-slots/README.md b/src/plugin-slots/README.md index d1193f8b2..ca7af5007 100644 --- a/src/plugin-slots/README.md +++ b/src/plugin-slots/README.md @@ -1,3 +1,3 @@ # `frontend-app-ora-grading` Plugin Slots -* [`footer_slot`](./FooterSlot/) +* [`org.openedx.frontend.layout.footer.v1`](./FooterSlot/)