Use a better name for the actual library content and menu --> Library…

…Body
Altinn · Oct 30, 2024 · 0178785 · 0178785
1 parent 8dac1fb
commit 0178785
Show file tree

Hide file tree

Showing 24 changed files with 17 additions and 18 deletions.
diff --git a/frontend/libs/studio-content-library/src/ContentLibrary/ContentLibrary.tsx b/frontend/libs/studio-content-library/src/ContentLibrary/ContentLibrary.tsx
@@ -7,7 +7,7 @@ import classes from './ContentLibrary.module.css';
 import { LibraryHeader } from './LibraryHeader';
 import { StudioHeading } from '@studio/components';
 import type { PageName } from '../types/PageName';
-import { LibraryContent } from './LibraryContent/LibraryContent';
+import { LibraryBody } from './LibraryBody';
 
 type ContentLibraryProps = {
   pages: PagesConfig;
@@ -37,7 +37,7 @@ function ContentLibraryForPage<T extends PageName = 'landingPage'>({
     <div className={classes.libraryBackground}>
       <div className={classes.libraryContainer}>
         <LibraryHeader />
-        <LibraryContent Component={Component} pages={pages} currentPage={currentPage} />
+        <LibraryBody Component={Component} pages={pages} currentPage={currentPage} />
       </div>
     </div>
   );

diff --git a/...LibraryContent/InfoBox/InfoBox.module.css → ...ry/LibraryBody/InfoBox/InfoBox.module.css b/...LibraryContent/InfoBox/InfoBox.module.css → ...ry/LibraryBody/InfoBox/InfoBox.module.css
diff --git a/...y/LibraryContent/InfoBox/InfoBox.test.tsx → ...rary/LibraryBody/InfoBox/InfoBox.test.tsx b/...y/LibraryContent/InfoBox/InfoBox.test.tsx → ...rary/LibraryBody/InfoBox/InfoBox.test.tsx
diff --git a/...ibrary/LibraryContent/InfoBox/InfoBox.tsx → ...ntLibrary/LibraryBody/InfoBox/InfoBox.tsx b/...ibrary/LibraryContent/InfoBox/InfoBox.tsx → ...ntLibrary/LibraryBody/InfoBox/InfoBox.tsx
diff --git a/...ntLibrary/LibraryContent/InfoBox/index.ts → ...ntentLibrary/LibraryBody/InfoBox/index.ts b/...ntLibrary/LibraryContent/InfoBox/index.ts → ...ntentLibrary/LibraryBody/InfoBox/index.ts
diff --git a/.../LibraryContent/InfoBox/infoBoxConfigs.ts → ...ary/LibraryBody/InfoBox/infoBoxConfigs.ts b/.../LibraryContent/InfoBox/infoBoxConfigs.ts → ...ary/LibraryBody/InfoBox/infoBoxConfigs.ts
diff --git a/.../LibraryContent/LibraryContent.module.css → ...ibrary/LibraryBody/LibraryBody.module.css b/.../LibraryContent/LibraryContent.module.css → ...ibrary/LibraryBody/LibraryBody.module.css
diff --git a/...Library/LibraryContent/LibraryContent.tsx → ...ontentLibrary/LibraryBody/LibraryBody.tsx b/...Library/LibraryContent/LibraryContent.tsx → ...ontentLibrary/LibraryBody/LibraryBody.tsx
@@ -6,17 +6,17 @@ import type { PagePropsMap, PagesConfig } from '../../types/PagesProps';
 import type { PageName } from '../../types/PageName';
 import type { PageComponent } from '../../utils/router/RouterRouteMapper';
 
-type LibraryContentProps<T extends PageName = 'landingPage'> = {
+type LibraryBodyProps<T extends PageName = 'landingPage'> = {
   Component: PageComponent<Required<PagePropsMap>[T]>;
   pages: PagesConfig;
   currentPage: PageName;
 };
 
-export function LibraryContent<T extends PageName = 'landingPage'>({
+export function LibraryBody<T extends PageName = 'landingPage'>({
   Component,
   pages,
   currentPage,
-}: LibraryContentProps) {
+}: LibraryBodyProps) {
   const componentProps: Required<PagePropsMap>[T] = pages[currentPage]
     ?.props as Required<PagePropsMap>[T];
 

diff --git a/...yContent/PagesRouter/PagesRouter.test.tsx → ...raryBody/PagesRouter/PagesRouter.test.tsx b/...yContent/PagesRouter/PagesRouter.test.tsx → ...raryBody/PagesRouter/PagesRouter.test.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { PagesRouter } from './PagesRouter';
 import { textMock } from '@studio/testing/mocks/i18nMock';
 import { RouterContext } from '../../../contexts/RouterContext';
 import type { PageName } from '../../../types/PageName';
-import { BrowserRouter } from 'react-router-dom';
+import { renderWithBrowserRouter } from '../../../../test-utils/renderWithBrowserRouter';
 
 const navigateMock = jest.fn();
 
@@ -35,11 +35,9 @@ describe('PagesRouter', () => {
 });
 
 const renderPagesRouter = (pageNames: PageName[] = ['codeList', 'images']) => {
-  render(
-    <BrowserRouter>
-      <RouterContext.Provider value={{ currentPage: 'codeList', navigate: navigateMock }}>
-        <PagesRouter pageNames={pageNames} />
-      </RouterContext.Provider>
-    </BrowserRouter>,
+  renderWithBrowserRouter(
+    <RouterContext.Provider value={{ currentPage: 'codeList', navigate: navigateMock }}>
+      <PagesRouter pageNames={pageNames} />
+    </RouterContext.Provider>,
   );
 };
diff --git a/...ibraryContent/PagesRouter/PagesRouter.tsx → ...y/LibraryBody/PagesRouter/PagesRouter.tsx b/...ibraryContent/PagesRouter/PagesRouter.tsx → ...y/LibraryBody/PagesRouter/PagesRouter.tsx
diff --git a/...brary/LibraryContent/PagesRouter/index.ts → ...tLibrary/LibraryBody/PagesRouter/index.ts b/...brary/LibraryContent/PagesRouter/index.ts → ...tLibrary/LibraryBody/PagesRouter/index.ts
diff --git a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/index.ts b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/index.ts
@@ -0,0 +1 @@
+export { LibraryBody } from './LibraryBody';
diff --git a/...yContent/pages/CodeList/CodeList.test.tsx → ...raryBody/pages/CodeList/CodeList.test.tsx b/...yContent/pages/CodeList/CodeList.test.tsx → ...raryBody/pages/CodeList/CodeList.test.tsx
diff --git a/...ibraryContent/pages/CodeList/CodeList.tsx → ...y/LibraryBody/pages/CodeList/CodeList.tsx b/...ibraryContent/pages/CodeList/CodeList.tsx → ...y/LibraryBody/pages/CodeList/CodeList.tsx
diff --git a/...ry/LibraryContent/pages/CodeList/index.ts → ...brary/LibraryBody/pages/CodeList/index.ts b/...ry/LibraryContent/pages/CodeList/index.ts → ...brary/LibraryBody/pages/CodeList/index.ts
diff --git a/...braryContent/pages/Images/Images.test.tsx → .../LibraryBody/pages/Images/Images.test.tsx b/...braryContent/pages/Images/Images.test.tsx → .../LibraryBody/pages/Images/Images.test.tsx
diff --git a/...ry/LibraryContent/pages/Images/Images.tsx → ...brary/LibraryBody/pages/Images/Images.tsx b/...ry/LibraryContent/pages/Images/Images.tsx → ...brary/LibraryBody/pages/Images/Images.tsx
diff --git a/...rary/LibraryContent/pages/Images/index.ts → ...Library/LibraryBody/pages/Images/index.ts b/...rary/LibraryContent/pages/Images/index.ts → ...Library/LibraryBody/pages/Images/index.ts
diff --git a/.../pages/LandingPage/LandingPage.module.css → .../pages/LandingPage/LandingPage.module.css b/.../pages/LandingPage/LandingPage.module.css → .../pages/LandingPage/LandingPage.module.css
diff --git a/...nt/pages/LandingPage/LandingPage.test.tsx → ...dy/pages/LandingPage/LandingPage.test.tsx b/...nt/pages/LandingPage/LandingPage.test.tsx → ...dy/pages/LandingPage/LandingPage.test.tsx
diff --git a/...Content/pages/LandingPage/LandingPage.tsx → ...aryBody/pages/LandingPage/LandingPage.tsx b/...Content/pages/LandingPage/LandingPage.tsx → ...aryBody/pages/LandingPage/LandingPage.tsx
diff --git a/...LibraryContent/pages/LandingPage/index.ts → ...ry/LibraryBody/pages/LandingPage/index.ts b/...LibraryContent/pages/LandingPage/index.ts → ...ry/LibraryBody/pages/LandingPage/index.ts
diff --git a/frontend/libs/studio-content-library/src/types/PagesProps.ts b/frontend/libs/studio-content-library/src/types/PagesProps.ts
@@ -1,6 +1,6 @@
-import type { CodeListProps } from '../ContentLibrary/LibraryContent/pages/CodeList';
+import type { CodeListProps } from '../ContentLibrary/LibraryBody/pages/CodeList';
 import type { PageName } from './PageName';
-import type { ImagesProps } from '../ContentLibrary/LibraryContent/pages/Images';
+import type { ImagesProps } from '../ContentLibrary/LibraryBody/pages/Images';
 
 export type PagePropsMap = {
   landingPage?: {};

diff --git a/frontend/libs/studio-content-library/src/utils/router/RouterRouteMapper.ts b/frontend/libs/studio-content-library/src/utils/router/RouterRouteMapper.ts
@@ -1,9 +1,9 @@
 import { type ComponentProps, type ReactElement } from 'react';
-import { CodeList } from '../../ContentLibrary/LibraryContent/pages/CodeList';
+import { CodeList } from '../../ContentLibrary/LibraryBody/pages/CodeList';
 import type { PageName } from '../../types/PageName';
-import { LandingPage } from '../../ContentLibrary/LibraryContent/pages/LandingPage';
+import { LandingPage } from '../../ContentLibrary/LibraryBody/pages/LandingPage';
 import type { PagesConfig } from '../../types/PagesProps';
-import { Images } from '../../ContentLibrary/LibraryContent/pages/Images';
+import { Images } from '../../ContentLibrary/LibraryBody/pages/Images';
 
 type PageProps =
   | ComponentProps<typeof LandingPage>