diff --git a/package-lock.json b/package-lock.json index 57fa8a92f..f41303983 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,6 @@ "@openedx-plugins/course-app-xpert_unit_summary": "file:plugins/course-apps/xpert_unit_summary", "@openedx/frontend-build": "^14.3.3", "@openedx/frontend-plugin-framework": "^1.7.0", - "@openedx/frontend-slot-footer": "^1.2.0", "@openedx/paragon": "^22.16.0", "@redux-devtools/extension": "^3.3.0", "@reduxjs/toolkit": "1.9.7", @@ -4269,20 +4268,6 @@ "@babel/runtime": "^7.9.2" } }, - "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 65dffb33b..f0fe601b2 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ "@openedx-plugins/course-app-xpert_unit_summary": "file:plugins/course-apps/xpert_unit_summary", "@openedx/frontend-build": "^14.3.3", "@openedx/frontend-plugin-framework": "^1.7.0", - "@openedx/frontend-slot-footer": "^1.2.0", "@openedx/paragon": "^22.16.0", "@redux-devtools/extension": "^3.3.0", "@reduxjs/toolkit": "1.9.7", diff --git a/src/CourseAuthoringPage.jsx b/src/CourseAuthoringPage.jsx index 9a594ff6c..d1c87cd56 100644 --- a/src/CourseAuthoringPage.jsx +++ b/src/CourseAuthoringPage.jsx @@ -5,7 +5,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { useLocation, } from 'react-router-dom'; -import { StudioFooterSlot } from '@openedx/frontend-slot-footer'; +import { StudioFooterSlot } from '@edx/frontend-component-footer'; import Header from './header'; import { fetchCourseDetail, fetchWaffleFlags } from './data/thunks'; import { useModel } from './generic/model-store'; diff --git a/src/accessibility-page/AccessibilityPage.jsx b/src/accessibility-page/AccessibilityPage.jsx index d7cc8959f..c37cdf6ab 100644 --- a/src/accessibility-page/AccessibilityPage.jsx +++ b/src/accessibility-page/AccessibilityPage.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; import { Helmet } from 'react-helmet'; import { Container } from '@openedx/paragon'; -import { StudioFooterSlot } from '@openedx/frontend-slot-footer'; +import { StudioFooterSlot } from '@edx/frontend-component-footer'; import Header from '../header'; import messages from './messages'; diff --git a/src/course-rerun/index.jsx b/src/course-rerun/index.jsx index 425d8163c..88a3f3b06 100644 --- a/src/course-rerun/index.jsx +++ b/src/course-rerun/index.jsx @@ -7,7 +7,7 @@ import { ActionRow, Button, } from '@openedx/paragon'; -import { StudioFooterSlot } from '@openedx/frontend-slot-footer'; +import { StudioFooterSlot } from '@edx/frontend-component-footer'; import { useNavigate, useParams } from 'react-router-dom'; diff --git a/src/library-authoring/LibraryAuthoringPage.tsx b/src/library-authoring/LibraryAuthoringPage.tsx index f7c242a74..e11418a47 100644 --- a/src/library-authoring/LibraryAuthoringPage.tsx +++ b/src/library-authoring/LibraryAuthoringPage.tsx @@ -6,7 +6,7 @@ import { } from 'react'; import { Helmet } from 'react-helmet'; import classNames from 'classnames'; -import { StudioFooterSlot } from '@openedx/frontend-slot-footer'; +import { StudioFooterSlot } from '@edx/frontend-component-footer'; import { useIntl } from '@edx/frontend-platform/i18n'; import { ActionRow, diff --git a/src/library-authoring/collections/LibraryCollectionPage.tsx b/src/library-authoring/collections/LibraryCollectionPage.tsx index f88d50d4f..de3c7ce23 100644 --- a/src/library-authoring/collections/LibraryCollectionPage.tsx +++ b/src/library-authoring/collections/LibraryCollectionPage.tsx @@ -1,5 +1,5 @@ import { useEffect } from 'react'; -import { StudioFooterSlot } from '@openedx/frontend-slot-footer'; +import { StudioFooterSlot } from '@edx/frontend-component-footer'; import { useIntl } from '@edx/frontend-platform/i18n'; import { ActionRow, diff --git a/src/library-authoring/create-library/CreateLibrary.tsx b/src/library-authoring/create-library/CreateLibrary.tsx index 009069430..e88c4ffa0 100644 --- a/src/library-authoring/create-library/CreateLibrary.tsx +++ b/src/library-authoring/create-library/CreateLibrary.tsx @@ -1,4 +1,4 @@ -import { StudioFooterSlot } from '@openedx/frontend-slot-footer'; +import { StudioFooterSlot } from '@edx/frontend-component-footer'; import { useIntl } from '@edx/frontend-platform/i18n'; import { Container, diff --git a/src/plugin-slots/README.md b/src/plugin-slots/README.md index df3c3c6ee..6d6603daf 100644 --- a/src/plugin-slots/README.md +++ b/src/plugin-slots/README.md @@ -16,4 +16,4 @@ * [`org.openedx.frontend.authoring.video_transcript_additional_translations_component.v1`](./AdditionalTranslationsComponentSlot/) ## Footer Slot -* [`studio_footer_slot`](./StudioFooterSlot/) +* [`org.openedx.frontend.layout.studio_footer.v1`](./StudioFooterSlot/) diff --git a/src/plugin-slots/StudioFooterSlot/README.md b/src/plugin-slots/StudioFooterSlot/README.md index f45d46947..bc8a48254 100644 --- a/src/plugin-slots/StudioFooterSlot/README.md +++ b/src/plugin-slots/StudioFooterSlot/README.md @@ -1,12 +1,15 @@ # Studio Footer Slot -### Slot ID: `studio_footer_slot` +### Slot ID: `org.openedx.frontend.layout.studio_footer.v1` + +### Slot ID Aliases +* `studio_footer_slot` ## Description This slot is used to replace/modify/hide the footer. -The implementation of the `StudioFooterSlot` component lives in [the `frontend-slot-footer` repository](https://github.com/openedx/frontend-slot-footer/). +The implementation of the `StudioFooterSlot` 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: { - studio_footer_slot: { + 'org.openedx.frontend.layout.studio_footer.v1': { plugins: [ { // Hide the default footer diff --git a/src/studio-home/StudioHome.tsx b/src/studio-home/StudioHome.tsx index 0e3380bef..fa2896ee3 100644 --- a/src/studio-home/StudioHome.tsx +++ b/src/studio-home/StudioHome.tsx @@ -9,7 +9,7 @@ import { } from '@openedx/paragon'; import { Add as AddIcon, Error } from '@openedx/paragon/icons'; import { useIntl } from '@edx/frontend-platform/i18n'; -import { StudioFooterSlot } from '@openedx/frontend-slot-footer'; +import { StudioFooterSlot } from '@edx/frontend-component-footer'; import { getConfig } from '@edx/frontend-platform'; import { useLocation, useNavigate } from 'react-router-dom'; diff --git a/src/taxonomy/TaxonomyLayout.test.tsx b/src/taxonomy/TaxonomyLayout.test.tsx index 719835d91..64124740c 100644 --- a/src/taxonomy/TaxonomyLayout.test.tsx +++ b/src/taxonomy/TaxonomyLayout.test.tsx @@ -34,7 +34,7 @@ const MockChildComponent = () => { jest.mock('../header', () => jest.fn(() =>
)); jest.mock('@edx/frontend-component-footer', () => ({ - StudioFooter: jest.fn(() =>
), + StudioFooterSlot: jest.fn(() =>
), })); jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom'), diff --git a/src/taxonomy/TaxonomyLayout.tsx b/src/taxonomy/TaxonomyLayout.tsx index 68827aad9..f22822328 100644 --- a/src/taxonomy/TaxonomyLayout.tsx +++ b/src/taxonomy/TaxonomyLayout.tsx @@ -1,5 +1,5 @@ import { useMemo, useState } from 'react'; -import { StudioFooterSlot } from '@openedx/frontend-slot-footer'; +import { StudioFooterSlot } from '@edx/frontend-component-footer'; import { Outlet, ScrollRestoration } from 'react-router-dom'; import { Toast } from '@openedx/paragon';