diff --git a/.eslintrc.json b/.eslintrc.json index a0e3d6c4..bd286f53 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -28,6 +28,24 @@ "linebreak-style": ["error", "unix"], "quotes": ["error", "single"], "semi": ["error", "never"], + "import/order": [ + "error", + { + "groups": [ + "builtin", + "external", + "internal", + "parent", + "sibling", + "index" + ], + "alphabetize": { + "order": "asc", + "caseInsensitive": true + }, + "newlines-between": "never" + } + ], "comma-dangle": 0, "react/react-in-jsx-scope": 0, "@typescript-eslint/comma-dangle": 0, diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml index 3ea67a41..83a1bba6 100644 --- a/.github/workflows/dependencies.yaml +++ b/.github/workflows/dependencies.yaml @@ -32,7 +32,7 @@ jobs: steps: - name: Set up JDK 17 - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0 with: distribution: 'temurin' java-version: '17' diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f6ace95..7e016f07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,26 @@ # Changelog -## [3.5.1](https://github.com/eclipse-tractusx/portal-shared-components/compare/v3.5.0...v3.5.1) (2024-09-05) +## [3.5.2](https://github.com/eclipse-tractusx/portal-shared-components/compare/v3.5.1...v3.5.2) (2024-09-13) + +### Bug Fixes +- **carousel:** handle infinite scroll with a single child element ([6a3a2aa](https://github.com/eclipse-tractusx/portal-shared-components/commit/6a3a2aab4a9ad6b3c09d90dc7bbf02cd2d63b73b)) +- Fix 401 Unauthorized Error on App Image Click in App Details ([3d52a38](https://github.com/eclipse-tractusx/portal-shared-components/commit/3d52a385fb2fdff3a99b0412b38233b40b686da6)) +- **new toggle switch:** default text removed and ui issue fixed ([625ce3d](https://github.com/eclipse-tractusx/portal-shared-components/commit/625ce3daae808087d789edee39afed63d08ed6f9)) +- **new toggle switch:** default text removed and ui issue fixed on hard reload ([2f0bd8f](https://github.com/eclipse-tractusx/portal-shared-components/commit/2f0bd8f922d54cd712a6d2fe99b57d26072ead9f)) +- Remove redundant else & changelog entry ([7bc47bd](https://github.com/eclipse-tractusx/portal-shared-components/commit/7bc47bdd3d65cbb155d319b711a4ada9eea401b2)) +- remove version bump and changelog messages ([115dc7a](https://github.com/eclipse-tractusx/portal-shared-components/commit/115dc7a0826c2e41cb83ab819037de8c785d1534)) +- Resolve App details image duplications ([f39c355](https://github.com/eclipse-tractusx/portal-shared-components/commit/f39c35596fcc535d3a7627bb91985a6a46e10969)) +- update useEffect dependency, handleChange ([aac007d](https://github.com/eclipse-tractusx/portal-shared-components/commit/aac007de32aa1ab58f6e3914e4cb92e006239a33)) + +## [3.5.1](https://github.com/eclipse-tractusx/portal-shared-components/compare/v3.5.0...v3.5.1) (2024-09-05) ### Bug Fixes -* **chor:** pretty ([b8c5264](https://github.com/eclipse-tractusx/portal-shared-components/commit/b8c5264ec5d442bd8d06459b7347e5591c1d8c7b)) -* **chor:** update version number ([3f03f0e](https://github.com/eclipse-tractusx/portal-shared-components/commit/3f03f0e8a01dcce597e6916fd8c882f630d5a490)) -* **table:** add new props to support multiple buttons in table component ([e0e7271](https://github.com/eclipse-tractusx/portal-shared-components/commit/e0e72713bc00523dcb11e0810c97ab702c6b87af)) -* **table:** support buttons props ([9ea1295](https://github.com/eclipse-tractusx/portal-shared-components/commit/9ea12951b17a737332b25018e10d78517cba499f)) +- **chor:** pretty ([b8c5264](https://github.com/eclipse-tractusx/portal-shared-components/commit/b8c5264ec5d442bd8d06459b7347e5591c1d8c7b)) +- **chor:** update version number ([3f03f0e](https://github.com/eclipse-tractusx/portal-shared-components/commit/3f03f0e8a01dcce597e6916fd8c882f630d5a490)) +- **table:** add new props to support multiple buttons in table component ([e0e7271](https://github.com/eclipse-tractusx/portal-shared-components/commit/e0e72713bc00523dcb11e0810c97ab702c6b87af)) +- **table:** support buttons props ([9ea1295](https://github.com/eclipse-tractusx/portal-shared-components/commit/9ea12951b17a737332b25018e10d78517cba499f)) ## [3.5.0](https://github.com/eclipse-tractusx/portal-shared-components/compare/v3.4.0...v3.5.0) (2024-09-03) @@ -39,6 +51,8 @@ - **chor:** update deoendency file ([bb45f76](https://github.com/eclipse-tractusx/portal-shared-components/commit/bb45f761102e442fd727b10f5a1d0362a0f124cf)) - **chro:** update the package version ([506dc70](https://github.com/eclipse-tractusx/portal-shared-components/commit/506dc709a28e19cbfc2dd6ea38f3af60ed3ef74c)) +- **ImageGallery:** Fix 401 Unauthorized error when clicking on App Images ([#291](https://github.com/eclipse-tractusx/portal-shared-components/issues/291)) + ## [3.3.0](https://github.com/eclipse-tractusx/portal-shared-components/compare/v3.2.0...v3.3.0) (2024-08-23) ### Features diff --git a/DEPENDENCIES b/DEPENDENCIES index d586f5e6..d7b41ae7 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -527,7 +527,7 @@ npm/npmjs/-/pkg-dir/3.0.0, MIT, approved, clearlydefined npm/npmjs/-/pkg-dir/4.2.0, MIT, approved, clearlydefined npm/npmjs/-/polished/4.3.1, MIT AND (BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT) AND BSD-3-Clause AND OFL-1.1, approved, #14008 npm/npmjs/-/possible-typed-array-names/1.0.0, MIT, approved, clearlydefined -npm/npmjs/-/postcss/8.4.41, MIT, approved, #3545 +npm/npmjs/-/postcss/8.4.45, MIT, approved, #3545 npm/npmjs/-/prelude-ls/1.2.1, MIT, approved, clearlydefined npm/npmjs/-/prettier/3.3.3, MIT AND BSD-2-Clause AND ISC AND MPL-1.0, approved, #15480 npm/npmjs/-/pretty-format/27.5.1, 0BSD AND Apache-2.0 AND BSD-2-Clause AND MIT, approved, #1948 @@ -726,7 +726,7 @@ npm/npmjs/-/validator/13.11.0, MIT, approved, clearlydefined npm/npmjs/-/vary/1.1.2, MIT, approved, clearlydefined npm/npmjs/-/vite-plugin-dts/3.7.3, MIT, approved, #14014 npm/npmjs/-/vite-plugin-lib-inject-css/2.0.1, MIT, approved, #14016 -npm/npmjs/-/vite/5.4.2, MIT AND (ISC AND MIT) AND (Apache-2.0 AND BSD-2-Clause AND BlueOak-1.0.0 AND CC0-1.0 AND ISC AND MIT) AND (BSD-3-Clause AND MIT) AND ISC AND (BSD-2-Clause AND BSD-3-Clause), approved, #15844 +npm/npmjs/-/vite/5.4.3, MIT AND (ISC AND MIT) AND (Apache-2.0 AND BSD-2-Clause AND BlueOak-1.0.0 AND CC0-1.0 AND ISC AND MIT) AND (BSD-3-Clause AND MIT) AND ISC AND (BSD-2-Clause AND BSD-3-Clause), approved, #15844 npm/npmjs/-/void-elements/3.1.0, MIT, approved, clearlydefined npm/npmjs/-/vue-template-compiler/2.7.16, 0BSD AND MIT AND MIT, approved, #3476 npm/npmjs/-/vue-tsc/1.8.27, MIT, approved, clearlydefined diff --git a/package.json b/package.json index ef85b6f3..8b3dff4c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@catena-x/portal-shared-components", - "version": "3.5.1", + "version": "3.5.2", "description": "Catena-X Portal Shared Components", "author": "Catena-X Contributors", "license": "Apache-2.0", diff --git a/src/components/basic/Alert/Alert.stories.tsx b/src/components/basic/Alert/Alert.stories.tsx index b440f3e8..6d6ca646 100644 --- a/src/components/basic/Alert/Alert.stories.tsx +++ b/src/components/basic/Alert/Alert.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Alert as Component } from '.' export default { diff --git a/src/components/basic/BaseImage/BaseImage.stories.tsx b/src/components/basic/BaseImage/BaseImage.stories.tsx index 182669ad..f73b2329 100644 --- a/src/components/basic/BaseImage/BaseImage.stories.tsx +++ b/src/components/basic/BaseImage/BaseImage.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { BaseImage as Component } from '.' export default { diff --git a/src/components/basic/BaseImage/index.tsx b/src/components/basic/BaseImage/index.tsx index 7c24eed7..65f919a0 100644 --- a/src/components/basic/BaseImage/index.tsx +++ b/src/components/basic/BaseImage/index.tsx @@ -18,8 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Box } from '@mui/material' import { Buffer } from 'buffer' +import { Box } from '@mui/material' interface BaseImageProps { image: string diff --git a/src/components/basic/Breadcrumb/Breadcrumb.stories.tsx b/src/components/basic/Breadcrumb/Breadcrumb.stories.tsx index a4d7546e..2bc36d9e 100644 --- a/src/components/basic/Breadcrumb/Breadcrumb.stories.tsx +++ b/src/components/basic/Breadcrumb/Breadcrumb.stories.tsx @@ -20,7 +20,6 @@ import { Link, Typography } from '@mui/material' import { type ComponentStory } from '@storybook/react' - import { Breadcrumb as Component } from '.' export default { diff --git a/src/components/basic/Button/BackButton.stories.tsx b/src/components/basic/Button/BackButton.stories.tsx index 778671c7..389c827b 100644 --- a/src/components/basic/Button/BackButton.stories.tsx +++ b/src/components/basic/Button/BackButton.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import type { ComponentStory } from '@storybook/react' - import { BackButton as Component } from './BackButton' export default { diff --git a/src/components/basic/Button/BackButton.tsx b/src/components/basic/Button/BackButton.tsx index f6eea13b..e70bab57 100644 --- a/src/components/basic/Button/BackButton.tsx +++ b/src/components/basic/Button/BackButton.tsx @@ -18,8 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Button } from '.' import ArrowBackIcon from '@mui/icons-material/ArrowBack' +import { Button } from '.' export interface BackButtonProps { backButtonLabel?: string diff --git a/src/components/basic/Button/Button.stories.tsx b/src/components/basic/Button/Button.stories.tsx index 9ba511ba..159a1dbb 100644 --- a/src/components/basic/Button/Button.stories.tsx +++ b/src/components/basic/Button/Button.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import type { Meta, StoryObj } from '@storybook/react' - import { Button } from '.' const meta: Meta = { diff --git a/src/components/basic/Button/LoadMoreButton.stories.tsx b/src/components/basic/Button/LoadMoreButton.stories.tsx index c071d890..ec47ac59 100644 --- a/src/components/basic/Button/LoadMoreButton.stories.tsx +++ b/src/components/basic/Button/LoadMoreButton.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { LoadMoreButton as Component } from './LoadMoreButton' export default { diff --git a/src/components/basic/Button/LoadMoreButton.tsx b/src/components/basic/Button/LoadMoreButton.tsx index 5bfb6b75..f21ea49d 100644 --- a/src/components/basic/Button/LoadMoreButton.tsx +++ b/src/components/basic/Button/LoadMoreButton.tsx @@ -18,9 +18,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline' import { type ButtonProps as MuiButtonProps } from '@mui/material/Button/Button' import { Button } from '.' -import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline' export interface LoadMoreButtonProps extends Omit { diff --git a/src/components/basic/Button/ScrollToTopButton.stories.tsx b/src/components/basic/Button/ScrollToTopButton.stories.tsx index 4f22f053..cc1d0b3b 100644 --- a/src/components/basic/Button/ScrollToTopButton.stories.tsx +++ b/src/components/basic/Button/ScrollToTopButton.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { ScrollToTopButton as Component } from './ScrollToTopButton' export default { diff --git a/src/components/basic/Button/ScrollToTopButton.tsx b/src/components/basic/Button/ScrollToTopButton.tsx index 62af4eaa..e6d4d0d3 100644 --- a/src/components/basic/Button/ScrollToTopButton.tsx +++ b/src/components/basic/Button/ScrollToTopButton.tsx @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { IconButton } from '../IconButton' import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward' import { useMediaQuery } from '@mui/material' +import { IconButton } from '../IconButton' export interface ScrollToTopButtonProps { onButtonClick: React.MouseEventHandler diff --git a/src/components/basic/Carousel/Carousel.stories.tsx b/src/components/basic/Carousel/Carousel.stories.tsx index d60a3c38..fc545c1f 100644 --- a/src/components/basic/Carousel/Carousel.stories.tsx +++ b/src/components/basic/Carousel/Carousel.stories.tsx @@ -19,9 +19,9 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' -import { Carousel as Component } from '.' -import { theme } from '../../../theme' import uniqueId from 'lodash/uniqueId' +import { theme } from '../../../theme' +import { Carousel as Component } from '.' export default { title: 'Carousel', diff --git a/src/components/basic/Carousel/CarouselBox.stories.tsx b/src/components/basic/Carousel/CarouselBox.stories.tsx index d5ae834f..f048197e 100644 --- a/src/components/basic/Carousel/CarouselBox.stories.tsx +++ b/src/components/basic/Carousel/CarouselBox.stories.tsx @@ -19,9 +19,9 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' -import { CarouselBox as Component } from './CarouselBox' -import { theme } from '../../../theme' import uniqueId from 'lodash/uniqueId' +import { theme } from '../../../theme' +import { CarouselBox as Component } from './CarouselBox' export default { title: 'Carousel', diff --git a/src/components/basic/Carousel/CarouselBox.tsx b/src/components/basic/Carousel/CarouselBox.tsx index a6fad970..a3f269dd 100644 --- a/src/components/basic/Carousel/CarouselBox.tsx +++ b/src/components/basic/Carousel/CarouselBox.tsx @@ -18,15 +18,15 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import React, { useState, Children, useEffect } from 'react' -import Slider from 'react-slick' -import ArrowForwardIcon from '@mui/icons-material/ArrowForward' import ArrowBackIcon from '@mui/icons-material/ArrowBack' -import { IconButton } from '../IconButton' +import ArrowForwardIcon from '@mui/icons-material/ArrowForward' import { Box } from '@mui/material' import uniqueId from 'lodash/uniqueId' -import { Typography } from '../Typography' +import React, { useState, Children, useEffect } from 'react' +import Slider from 'react-slick' import { theme } from '../../../theme' +import { IconButton } from '../IconButton' +import { Typography } from '../Typography' import 'slick-carousel/slick/slick.css' import 'slick-carousel/slick/slick-theme.css' diff --git a/src/components/basic/Carousel/index.tsx b/src/components/basic/Carousel/index.tsx index 7efcc3d0..9ab5e015 100644 --- a/src/components/basic/Carousel/index.tsx +++ b/src/components/basic/Carousel/index.tsx @@ -18,14 +18,14 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useState, Children, useEffect, useCallback } from 'react' -import Slider from 'react-slick' -import ArrowForwardIcon from '@mui/icons-material/ArrowForward' import ArrowBackIcon from '@mui/icons-material/ArrowBack' -import { IconButton } from '../IconButton' +import ArrowForwardIcon from '@mui/icons-material/ArrowForward' import { Box } from '@mui/material' -import { theme } from '../../../theme' import uniqueId from 'lodash/uniqueId' +import { useState, Children, useEffect, useCallback } from 'react' +import Slider from 'react-slick' +import { theme } from '../../../theme' +import { IconButton } from '../IconButton' import 'slick-carousel/slick/slick.css' import 'slick-carousel/slick/slick-theme.css' import { type CarouselNavArrows } from './CarouselBox' @@ -75,7 +75,7 @@ export const Carousel = ({ }: CarouselProps) => { const [showArrows, setShowArrows] = useState(false) const onMouseEnter = () => { - setShowArrows(true) + setShowArrows(arrayChildren.length > 1) } const onMouseLeave = () => { setShowArrows(false) @@ -155,7 +155,9 @@ export const Carousel = ({ const settings = { dots, - infinite, + // @ref https://github.com/akiran/react-slick/issues/2093#issuecomment-1705213915 + // Prevents broken UI by defaulting infinite scroll to false when only a single child element is present. + infinite: infinite && arrayChildren.length > 1, slidesToShow: responsiveSlides, slidesToScroll: responsiveSlides, swipeToSlide: false, diff --git a/src/components/basic/CategoryDivider/CategoryDivider.stories.tsx b/src/components/basic/CategoryDivider/CategoryDivider.stories.tsx index 8992960b..e3bdcb89 100644 --- a/src/components/basic/CategoryDivider/CategoryDivider.stories.tsx +++ b/src/components/basic/CategoryDivider/CategoryDivider.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { CategoryDivider as Component } from '.' export default { diff --git a/src/components/basic/Checkbox/Checkbox.stories.tsx b/src/components/basic/Checkbox/Checkbox.stories.tsx index 77afdeaa..6236a45a 100644 --- a/src/components/basic/Checkbox/Checkbox.stories.tsx +++ b/src/components/basic/Checkbox/Checkbox.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Checkbox as Component } from '.' export default { diff --git a/src/components/basic/Chip/DraggableChip.stories.tsx b/src/components/basic/Chip/DraggableChip.stories.tsx index 8d7e6760..902c799f 100644 --- a/src/components/basic/Chip/DraggableChip.stories.tsx +++ b/src/components/basic/Chip/DraggableChip.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { DraggableChip as Component } from './DraggableChip' export default { diff --git a/src/components/basic/Chip/DraggableChip.tsx b/src/components/basic/Chip/DraggableChip.tsx index 81570800..2189620b 100644 --- a/src/components/basic/Chip/DraggableChip.tsx +++ b/src/components/basic/Chip/DraggableChip.tsx @@ -18,8 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Box, type BoxProps, useTheme } from '@mui/material' import OpenWithIcon from '@mui/icons-material/OpenWith' +import { Box, type BoxProps, useTheme } from '@mui/material' interface DraggableChipProps extends BoxProps { isSelected?: boolean diff --git a/src/components/basic/Chip/TransitionChip.tsx b/src/components/basic/Chip/TransitionChip.tsx index 49b729f9..f5ecf316 100644 --- a/src/components/basic/Chip/TransitionChip.tsx +++ b/src/components/basic/Chip/TransitionChip.tsx @@ -18,9 +18,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import MuiChip, { type ChipProps } from '@mui/material/Chip' import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline' import HighlightOffIcon from '@mui/icons-material/HighlightOff' +import MuiChip, { type ChipProps } from '@mui/material/Chip' import { useState } from 'react' import { theme } from '../../../theme' diff --git a/src/components/basic/Chip/index.tsx b/src/components/basic/Chip/index.tsx index fe7bd5af..c51153df 100644 --- a/src/components/basic/Chip/index.tsx +++ b/src/components/basic/Chip/index.tsx @@ -18,12 +18,12 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import MuiChip, { type ChipProps } from '@mui/material/Chip' +import AutorenewIcon from '@mui/icons-material/Autorenew' import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline' import HighlightOffIcon from '@mui/icons-material/HighlightOff' -import { theme } from '../../../theme' -import AutorenewIcon from '@mui/icons-material/Autorenew' +import MuiChip, { type ChipProps } from '@mui/material/Chip' import React from 'react' +import { theme } from '../../../theme' interface ChipCustomProps extends ChipProps { type?: 'decline' | 'confirm' | 'plain' | 'delete' | 'progress' diff --git a/src/components/basic/CircularProgress/circularProgress.stories.tsx b/src/components/basic/CircularProgress/circularProgress.stories.tsx index 4423ebc1..7f75ed3d 100644 --- a/src/components/basic/CircularProgress/circularProgress.stories.tsx +++ b/src/components/basic/CircularProgress/circularProgress.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { CircularProgress as Component } from '.' export default { diff --git a/src/components/basic/CustomAccordion/CustomAccordion.stories.tsx b/src/components/basic/CustomAccordion/CustomAccordion.stories.tsx index e079a07a..8cd6ef39 100644 --- a/src/components/basic/CustomAccordion/CustomAccordion.stories.tsx +++ b/src/components/basic/CustomAccordion/CustomAccordion.stories.tsx @@ -18,13 +18,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import HomeOutlinedIcon from '@mui/icons-material/HomeOutlined' +import SettingsOutlinedIcon from '@mui/icons-material/SettingsOutlined' import { Box, Divider, Typography } from '@mui/material' import { type ComponentStory } from '@storybook/react' -import { CustomAccordion as Component } from '.' import { Table } from '../StaticTable/StaticTable.stories' import { type CustomAccordionProps } from './Item' -import HomeOutlinedIcon from '@mui/icons-material/HomeOutlined' -import SettingsOutlinedIcon from '@mui/icons-material/SettingsOutlined' +import { CustomAccordion as Component } from '.' export default { title: 'CustomAccordion', diff --git a/src/components/basic/CustomAccordion/Item.tsx b/src/components/basic/CustomAccordion/Item.tsx index 79905c27..dde480c9 100644 --- a/src/components/basic/CustomAccordion/Item.tsx +++ b/src/components/basic/CustomAccordion/Item.tsx @@ -18,12 +18,12 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import React from 'react' +import ExpandMoreIcon from '@mui/icons-material/ExpandMore' +import { AccordionActions, Box, Button, Typography } from '@mui/material' import Accordion, { type AccordionProps } from '@mui/material/Accordion' -import AccordionSummary from '@mui/material/AccordionSummary' import AccordionDetails from '@mui/material/AccordionDetails' -import { AccordionActions, Box, Button, Typography } from '@mui/material' -import ExpandMoreIcon from '@mui/icons-material/ExpandMore' +import AccordionSummary from '@mui/material/AccordionSummary' +import React from 'react' export interface CustomAccordionProps extends AccordionProps { expanded: boolean | undefined diff --git a/src/components/basic/Datepicker/Datepicker.stories.tsx b/src/components/basic/Datepicker/Datepicker.stories.tsx index ad5d4442..09ce1831 100644 --- a/src/components/basic/Datepicker/Datepicker.stories.tsx +++ b/src/components/basic/Datepicker/Datepicker.stories.tsx @@ -18,9 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ComponentStory } from '@storybook/react' import { Box } from '@mui/material' - +import { type ComponentStory } from '@storybook/react' import { Datepicker as Component, type DateType } from '.' export default { diff --git a/src/components/basic/Datepicker/index.tsx b/src/components/basic/Datepicker/index.tsx index cf085cd3..47117595 100644 --- a/src/components/basic/Datepicker/index.tsx +++ b/src/components/basic/Datepicker/index.tsx @@ -18,16 +18,16 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useEffect, useState } from 'react' import { Box, Button } from '@mui/material' import { type TextFieldProps } from '@mui/material/TextField' +import { type PickersDayProps } from '@mui/x-date-pickers' import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3' -import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider' import { DatePicker } from '@mui/x-date-pickers/DatePicker' +import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider' import { de } from 'date-fns/locale/de' import { enUS } from 'date-fns/locale/en-US' import uniqueId from 'lodash/uniqueId' -import { type PickersDayProps } from '@mui/x-date-pickers' +import { useEffect, useState } from 'react' export type DateType = Date | null export interface DatepickerProps extends Omit { diff --git a/src/components/basic/Dialog/Dialog.stories.tsx b/src/components/basic/Dialog/Dialog.stories.tsx index d84090bf..bec003e8 100644 --- a/src/components/basic/Dialog/Dialog.stories.tsx +++ b/src/components/basic/Dialog/Dialog.stories.tsx @@ -19,12 +19,11 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - -import { Dialog as Component } from '.' import { Button } from '../Button' import { DialogActions } from './DialogActions' import { DialogContent } from './DialogContent' import { DialogHeader } from './DialogHeader' +import { Dialog as Component } from '.' export default { title: 'Modal', diff --git a/src/components/basic/Dialog/DialogActions.stories.tsx b/src/components/basic/Dialog/DialogActions.stories.tsx index f9b01b36..fcfeee25 100644 --- a/src/components/basic/Dialog/DialogActions.stories.tsx +++ b/src/components/basic/Dialog/DialogActions.stories.tsx @@ -19,9 +19,8 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - -import { DialogActions as Component } from './DialogActions' import { Button } from '../Button' +import { DialogActions as Component } from './DialogActions' export default { title: 'Modal', diff --git a/src/components/basic/Dialog/DialogHeader.stories.tsx b/src/components/basic/Dialog/DialogHeader.stories.tsx index 3843c20c..2ca7d691 100644 --- a/src/components/basic/Dialog/DialogHeader.stories.tsx +++ b/src/components/basic/Dialog/DialogHeader.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { DialogHeader as Component } from './DialogHeader' export default { diff --git a/src/components/basic/Dialog/DialogHeader.tsx b/src/components/basic/Dialog/DialogHeader.tsx index db7597bd..431a2025 100644 --- a/src/components/basic/Dialog/DialogHeader.tsx +++ b/src/components/basic/Dialog/DialogHeader.tsx @@ -18,13 +18,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import React from 'react' +import CheckCircleOutlineOutlinedIcon from '@mui/icons-material/CheckCircleOutlineOutlined' +import CloseIcon from '@mui/icons-material/Close' import { Box, useTheme } from '@mui/material' import MuiDialogTitle from '@mui/material/DialogTitle' -import { Typography } from '../Typography' +import React from 'react' import { IconButton } from '../IconButton' -import CloseIcon from '@mui/icons-material/Close' -import CheckCircleOutlineOutlinedIcon from '@mui/icons-material/CheckCircleOutlineOutlined' +import { Typography } from '../Typography' import { CONTENT_SPACING_RIGHT_LEFT } from './index' export interface DialogHeaderProps { diff --git a/src/components/basic/DropdownMenu/DropdownMenu.stories.tsx b/src/components/basic/DropdownMenu/DropdownMenu.stories.tsx index cd4c9919..6aa3708a 100644 --- a/src/components/basic/DropdownMenu/DropdownMenu.stories.tsx +++ b/src/components/basic/DropdownMenu/DropdownMenu.stories.tsx @@ -22,7 +22,6 @@ import EditIcon from '@mui/icons-material/Edit' import FileCopyIcon from '@mui/icons-material/FileCopy' import MenuItem from '@mui/material/MenuItem' import { type ComponentStory } from '@storybook/react' - import { DropdownMenu as Component } from '.' export default { diff --git a/src/components/basic/Dropzone/DropArea.stories.tsx b/src/components/basic/Dropzone/DropArea.stories.tsx index 37aba522..82329b56 100644 --- a/src/components/basic/Dropzone/DropArea.stories.tsx +++ b/src/components/basic/Dropzone/DropArea.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { DropArea as Component } from './components/DropArea' export default { diff --git a/src/components/basic/Dropzone/DropPreview.stories.tsx b/src/components/basic/Dropzone/DropPreview.stories.tsx index 05bec356..0f12eda1 100644 --- a/src/components/basic/Dropzone/DropPreview.stories.tsx +++ b/src/components/basic/Dropzone/DropPreview.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { DropPreview as Component } from './components/DropPreview' import { UploadStatus } from './types' diff --git a/src/components/basic/Dropzone/DropPreviewFile.stories.tsx b/src/components/basic/Dropzone/DropPreviewFile.stories.tsx index bf8ecb6e..66fa6b76 100644 --- a/src/components/basic/Dropzone/DropPreviewFile.stories.tsx +++ b/src/components/basic/Dropzone/DropPreviewFile.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { DropPreviewFile as Component } from './components/DropPreviewFile' import { UploadStatus } from './types' diff --git a/src/components/basic/Dropzone/components/DropArea.tsx b/src/components/basic/Dropzone/components/DropArea.tsx index bf8f9338..f6ad22f7 100644 --- a/src/components/basic/Dropzone/components/DropArea.tsx +++ b/src/components/basic/Dropzone/components/DropArea.tsx @@ -18,13 +18,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import UploadFileIcon from '@mui/icons-material/UploadFile' import { Box, Link, useTheme } from '@mui/material' import { Fragment, type FunctionComponent, useState } from 'react' +import { Alert } from '../../Alert' import { FileErrorIcon } from '../../CustomIcons/FileErrorIcon' import { Typography } from '../../Typography' -import UploadFileIcon from '@mui/icons-material/UploadFile' import { type DropZoneDropAreaTranslations } from '../types' -import { Alert } from '../../Alert' export interface DropAreaProps { translations: DropZoneDropAreaTranslations diff --git a/src/components/basic/Dropzone/components/DropPreviewFile.tsx b/src/components/basic/Dropzone/components/DropPreviewFile.tsx index 310892e1..9ac1580f 100644 --- a/src/components/basic/Dropzone/components/DropPreviewFile.tsx +++ b/src/components/basic/Dropzone/components/DropPreviewFile.tsx @@ -18,15 +18,15 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline' import { Box, IconButton, useTheme } from '@mui/material' import { type FunctionComponent, useEffect, useRef, useState } from 'react' +import { FileIcon } from '../../CustomIcons/FileIcon' import { type DropZonePreviewTranslations, type UploadFile, UploadStatus, } from '../types' -import { FileIcon } from '../../CustomIcons/FileIcon' -import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline' const FAKE_UPLOAD_DURATION = 6000 diff --git a/src/components/basic/ErrorBar/ErrorBar.stories.tsx b/src/components/basic/ErrorBar/ErrorBar.stories.tsx index 0b797912..ff3a21eb 100644 --- a/src/components/basic/ErrorBar/ErrorBar.stories.tsx +++ b/src/components/basic/ErrorBar/ErrorBar.stories.tsx @@ -18,7 +18,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { ErrorBar as Component } from './ErrorBar' export default { diff --git a/src/components/basic/ErrorBar/ErrorBar.tsx b/src/components/basic/ErrorBar/ErrorBar.tsx index 0497ab68..65d3ec6d 100644 --- a/src/components/basic/ErrorBar/ErrorBar.tsx +++ b/src/components/basic/ErrorBar/ErrorBar.tsx @@ -17,11 +17,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import Typography from '@mui/material/Typography' -import Box from '@mui/material/Box' -import { Button } from '../Button' import ArrowForwardIcon from '@mui/icons-material/ArrowForward' import ReportProblemIcon from '@mui/icons-material/ReportProblem' +import Box from '@mui/material/Box' +import Typography from '@mui/material/Typography' +import { Button } from '../Button' import './ErrorBar.scss' export const ErrorBar = ({ diff --git a/src/components/basic/ErrorPage/ErrorPage.stories.tsx b/src/components/basic/ErrorPage/ErrorPage.stories.tsx index bf77a6da..dcf00921 100644 --- a/src/components/basic/ErrorPage/ErrorPage.stories.tsx +++ b/src/components/basic/ErrorPage/ErrorPage.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { ErrorPage as Component } from '.' export default { diff --git a/src/components/basic/ErrorPage/index.tsx b/src/components/basic/ErrorPage/index.tsx index 68477fab..6b266f1c 100644 --- a/src/components/basic/ErrorPage/index.tsx +++ b/src/components/basic/ErrorPage/index.tsx @@ -19,8 +19,8 @@ ********************************************************************************/ import { Box } from '@mui/material' -import { ErrorDescription } from './components/ErrorDescription' import { ErrorActions } from './components/ErrorActions' +import { ErrorDescription } from './components/ErrorDescription' import { ErrorImage } from './components/ErrorImage' export interface ErrorPageProps { diff --git a/src/components/basic/Expand/Expand.stories.tsx b/src/components/basic/Expand/Expand.stories.tsx index e5c2a8a0..d800c394 100644 --- a/src/components/basic/Expand/Expand.stories.tsx +++ b/src/components/basic/Expand/Expand.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Expand as Component } from '.' export default { diff --git a/src/components/basic/Expand/index.tsx b/src/components/basic/Expand/index.tsx index f97465e1..610cec3d 100644 --- a/src/components/basic/Expand/index.tsx +++ b/src/components/basic/Expand/index.tsx @@ -18,10 +18,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useState } from 'react' -import { Collapse } from '@mui/material' import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown' import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp' +import { Collapse } from '@mui/material' +import { useState } from 'react' import { Typography } from '../Typography' export const Expand = ({ diff --git a/src/components/basic/Headers/MainHeader/Components/MainHeaderTitle.tsx b/src/components/basic/Headers/MainHeader/Components/MainHeaderTitle.tsx index a9188b43..a0bdd0ec 100644 --- a/src/components/basic/Headers/MainHeader/Components/MainHeaderTitle.tsx +++ b/src/components/basic/Headers/MainHeader/Components/MainHeaderTitle.tsx @@ -18,8 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type MainHeaderProps } from '../MainHeader' import { Typography } from '../../../Typography' +import { type MainHeaderProps } from '../MainHeader' export const MainHeaderTitle = ({ title, diff --git a/src/components/basic/Headers/MainHeader/MainHeader.stories.tsx b/src/components/basic/Headers/MainHeader/MainHeader.stories.tsx index c57d0477..594ffffe 100644 --- a/src/components/basic/Headers/MainHeader/MainHeader.stories.tsx +++ b/src/components/basic/Headers/MainHeader/MainHeader.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { MainHeader as Component } from './MainHeader' export default { diff --git a/src/components/basic/Headers/PageHeader/PageHeader.stories.tsx b/src/components/basic/Headers/PageHeader/PageHeader.stories.tsx index 8dffbae9..08abcb12 100644 --- a/src/components/basic/Headers/PageHeader/PageHeader.stories.tsx +++ b/src/components/basic/Headers/PageHeader/PageHeader.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { PageHeader as Component } from './PageHeader' export default { diff --git a/src/components/basic/Headers/PageHeader/PageHeader.tsx b/src/components/basic/Headers/PageHeader/PageHeader.tsx index c2de6a1a..47fa0c9f 100644 --- a/src/components/basic/Headers/PageHeader/PageHeader.tsx +++ b/src/components/basic/Headers/PageHeader/PageHeader.tsx @@ -19,11 +19,11 @@ ********************************************************************************/ import { Box, useTheme } from '@mui/material' -import { HeaderTitle } from './Components/HeaderTitle' +import { mainNavigationHeight } from '../../MainNavigation' import { HeaderSubtractOption1 } from './Components/HeaderSubtractOption1' import { HeaderSubtractOption2 } from './Components/HeaderSubtractOption2' import { HeaderSubtractOption3 } from './Components/HeaderSubtractOption3' -import { mainNavigationHeight } from '../../MainNavigation' +import { HeaderTitle } from './Components/HeaderTitle' export interface PageHeaderProps { children?: React.ReactNode diff --git a/src/components/basic/Hyperlink/Hyperlink.stories.tsx b/src/components/basic/Hyperlink/Hyperlink.stories.tsx index 3031488a..6a0fbb60 100644 --- a/src/components/basic/Hyperlink/Hyperlink.stories.tsx +++ b/src/components/basic/Hyperlink/Hyperlink.stories.tsx @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import { Info } from '@mui/icons-material' import type { Meta, StoryObj } from '@storybook/react' import { Hyperlink } from '.' -import { Info } from '@mui/icons-material' const meta: Meta = { title: 'Hyperlink', diff --git a/src/components/basic/Icon/Icon.stories.tsx b/src/components/basic/Icon/Icon.stories.tsx index 3db736ad..8d02da57 100644 --- a/src/components/basic/Icon/Icon.stories.tsx +++ b/src/components/basic/Icon/Icon.stories.tsx @@ -17,14 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type Meta, type StoryFn } from '@storybook/react' - -import { Icon as Component, type IconProps } from '.' import { Box } from '@mui/material' -import { IconButton } from '../IconButton' -import { Typography } from '../Typography' +import { type Meta, type StoryFn } from '@storybook/react' import { type ReactNode } from 'react' import { Button } from '../Button' +import { IconButton } from '../IconButton' +import { Typography } from '../Typography' +import { Icon as Component, type IconProps } from '.' const meta: Meta = { title: 'Icon', component: Component, diff --git a/src/components/basic/Icon/index.tsx b/src/components/basic/Icon/index.tsx index 1eea6fe8..1f177867 100644 --- a/src/components/basic/Icon/index.tsx +++ b/src/components/basic/Icon/index.tsx @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import React from 'react' import * as MUIIcons from '@mui/icons-material' import { type SvgIconProps } from '@mui/material/SvgIcon' +import React from 'react' // Extend the Mui SvgIcon size props declare module '@mui/material/SvgIcon' { diff --git a/src/components/basic/IconButton/IconButton.stories.tsx b/src/components/basic/IconButton/IconButton.stories.tsx index f691d7f8..ac5acb48 100644 --- a/src/components/basic/IconButton/IconButton.stories.tsx +++ b/src/components/basic/IconButton/IconButton.stories.tsx @@ -18,11 +18,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ComponentStory } from '@storybook/react' - -import { IconButton as Component } from '.' import AddIcon from '@mui/icons-material/Add' import ArrowForwardIcon from '@mui/icons-material/ArrowForward' +import { type ComponentStory } from '@storybook/react' +import { IconButton as Component } from '.' export default { title: 'Buttons', diff --git a/src/components/basic/Image/Image.stories.tsx b/src/components/basic/Image/Image.stories.tsx index d8c4f20f..9cc53a29 100644 --- a/src/components/basic/Image/Image.stories.tsx +++ b/src/components/basic/Image/Image.stories.tsx @@ -18,8 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Image as Component } from '.' import type { Meta, StoryObj } from '@storybook/react' +import { Image as Component } from '.' const meta: Meta = { component: Component, diff --git a/src/components/basic/ImageGallery/ImageGallery.stories.tsx b/src/components/basic/ImageGallery/ImageGallery.stories.tsx index 5fb8e6e5..7bb0ecee 100644 --- a/src/components/basic/ImageGallery/ImageGallery.stories.tsx +++ b/src/components/basic/ImageGallery/ImageGallery.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { ImageGallery as Component } from '.' export default { diff --git a/src/components/basic/ImageGallery/ImageItemOverlay.tsx b/src/components/basic/ImageGallery/ImageItemOverlay.tsx index a31bd794..40ad0ebc 100644 --- a/src/components/basic/ImageGallery/ImageItemOverlay.tsx +++ b/src/components/basic/ImageGallery/ImageItemOverlay.tsx @@ -18,14 +18,14 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import MuiDialog from '@mui/material/Dialog' -import { type ImageType } from './types' -import { IconButton } from '../IconButton' import CloseIcon from '@mui/icons-material/Close' import { useTheme } from '@mui/material' +import MuiDialog from '@mui/material/Dialog' import MuiDialogContent from '@mui/material/DialogContent' -import { Typography } from '../Typography' +import { IconButton } from '../IconButton' import { Image } from '../Image' +import { Typography } from '../Typography' +import { type ImageType } from './types' interface ImageItemOverlayProps { onClose: () => void @@ -36,6 +36,7 @@ export default function ImageItemOverlay({ text, modalWidth = '600', onClose, + loader, }: ImageType & ImageItemOverlayProps) { const { palette } = useTheme() return ( @@ -75,6 +76,7 @@ export default function ImageItemOverlay({ {text} { + if (mobile) return gallery?.length > 1 + if (tab) return gallery?.length > 2 + return gallery?.length > 3 + } + return (
{hovered && hoveredImage?.url && ( @@ -61,6 +67,7 @@ export const ImageGallery = ({ }} url={hoveredImage.url} text={hoveredImage.text} + loader={hoveredImage.loader} modalWidth={modalWidth} /> )} @@ -68,7 +75,7 @@ export const ImageGallery = ({ gapBetweenSlides={32} gapCarouselTop={0} dots={false} - infinite + infinite={getIsInfinite()} itemHeight={maxHeight ?? 0} itemWidth={maxWidth ?? 266} slidesToShow={getSlidesToShow()} diff --git a/src/components/basic/Input/Input.stories.tsx b/src/components/basic/Input/Input.stories.tsx index 40957719..acb57ace 100644 --- a/src/components/basic/Input/Input.stories.tsx +++ b/src/components/basic/Input/Input.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Input as Component } from '.' export default { diff --git a/src/components/basic/Input/index.tsx b/src/components/basic/Input/index.tsx index 3348a0c2..c1ea527f 100644 --- a/src/components/basic/Input/index.tsx +++ b/src/components/basic/Input/index.tsx @@ -18,6 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import ErrorOutline from '@mui/icons-material/ErrorOutline' +import HelpOutlineIcon from '@mui/icons-material/HelpOutline' import { TextField, type TextFieldProps, @@ -27,8 +29,6 @@ import { Box, FormControl, } from '@mui/material' -import ErrorOutline from '@mui/icons-material/ErrorOutline' -import HelpOutlineIcon from '@mui/icons-material/HelpOutline' import { Tooltips } from '../ToolTips' interface InputProps extends Omit { diff --git a/src/components/basic/LanguageSwitch/LanguageSwitch.stories.tsx b/src/components/basic/LanguageSwitch/LanguageSwitch.stories.tsx index 0d05d02a..66a5df6a 100644 --- a/src/components/basic/LanguageSwitch/LanguageSwitch.stories.tsx +++ b/src/components/basic/LanguageSwitch/LanguageSwitch.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { LanguageSwitch as Component } from '.' export default { diff --git a/src/components/basic/LoadingButton/LoadingButton.stories.tsx b/src/components/basic/LoadingButton/LoadingButton.stories.tsx index 003f0273..4123e581 100644 --- a/src/components/basic/LoadingButton/LoadingButton.stories.tsx +++ b/src/components/basic/LoadingButton/LoadingButton.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { LoadingButton as Component } from '.' export default { diff --git a/src/components/basic/Logo/Logo.stories.tsx b/src/components/basic/Logo/Logo.stories.tsx index 35bacb35..98a65d81 100644 --- a/src/components/basic/Logo/Logo.stories.tsx +++ b/src/components/basic/Logo/Logo.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Logo as Component } from '.' export default { diff --git a/src/components/basic/Logo/index.tsx b/src/components/basic/Logo/index.tsx index a9204eb8..439993c8 100644 --- a/src/components/basic/Logo/index.tsx +++ b/src/components/basic/Logo/index.tsx @@ -18,9 +18,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import CXLogo from '../../../assets/logo/cx-logo.svg' import CXLogoShort from '../../../assets/logo/cx-logo-short.svg' import CXLogoText from '../../../assets/logo/cx-logo-text.svg' +import CXLogo from '../../../assets/logo/cx-logo.svg' import { Image, LogoGrayData } from '../Image' interface LogoProps { diff --git a/src/components/basic/MainNavigation/MainNavigation.stories.tsx b/src/components/basic/MainNavigation/MainNavigation.stories.tsx index ffa7a9a2..f5774a48 100644 --- a/src/components/basic/MainNavigation/MainNavigation.stories.tsx +++ b/src/components/basic/MainNavigation/MainNavigation.stories.tsx @@ -18,14 +18,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ComponentStory } from '@storybook/react' +import PersonOutlineIcon from '@mui/icons-material/PersonOutline' import { Box } from '@mui/material' +import { type ComponentStory } from '@storybook/react' import CXLogoText from '../../../assets/logo/cx-logo-text.svg' - -import { MainNavigation as Component } from '.' import { Button } from '../Button' import { IconButton } from '../IconButton' -import PersonOutlineIcon from '@mui/icons-material/PersonOutline' +import { MainNavigation as Component } from '.' export default { title: 'Navigation', diff --git a/src/components/basic/MainNavigation/index.tsx b/src/components/basic/MainNavigation/index.tsx index aecf1d56..20b62a2e 100644 --- a/src/components/basic/MainNavigation/index.tsx +++ b/src/components/basic/MainNavigation/index.tsx @@ -18,10 +18,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Children } from 'react' import { Box } from '@mui/material' -import { type MenuProps } from '../Menu' +import { Children } from 'react' import { Navigation } from '../../content/Navigation' +import { type MenuProps } from '../Menu' export interface MainNavigationProps extends MenuProps { children?: React.ReactNode diff --git a/src/components/basic/Menu/Menu.stories.tsx b/src/components/basic/Menu/Menu.stories.tsx index e67b39f2..0b3852d7 100644 --- a/src/components/basic/Menu/Menu.stories.tsx +++ b/src/components/basic/Menu/Menu.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Menu as Component } from '.' export default { diff --git a/src/components/basic/Menu/MenuItem.tsx b/src/components/basic/Menu/MenuItem.tsx index 277da83d..95091857 100644 --- a/src/components/basic/Menu/MenuItem.tsx +++ b/src/components/basic/Menu/MenuItem.tsx @@ -28,8 +28,8 @@ import { useTheme, } from '@mui/material' import { useState } from 'react' -import { type MenuType, type NotificationBadgeType } from '.' import { Typography } from '../Typography' +import { type MenuType, type NotificationBadgeType } from '.' type LinkItem = Partial> diff --git a/src/components/basic/MultiSelectList/Components/SelectAddMore.tsx b/src/components/basic/MultiSelectList/Components/SelectAddMore.tsx index 15943bec..d55a1fcf 100644 --- a/src/components/basic/MultiSelectList/Components/SelectAddMore.tsx +++ b/src/components/basic/MultiSelectList/Components/SelectAddMore.tsx @@ -20,10 +20,10 @@ import { Box } from '@mui/material' import uniqueId from 'lodash/uniqueId' +import { type TagSizeType } from '..' import { Button } from '../../Button' import { Typography } from '../../Typography' import { SelectedTag } from './SelectedTag' -import { type TagSizeType } from '..' interface SelectAddMoreProps { selected: Array> diff --git a/src/components/basic/MultiSelectList/Components/SelectedTag.tsx b/src/components/basic/MultiSelectList/Components/SelectedTag.tsx index 7246e113..b0e454a9 100644 --- a/src/components/basic/MultiSelectList/Components/SelectedTag.tsx +++ b/src/components/basic/MultiSelectList/Components/SelectedTag.tsx @@ -19,9 +19,9 @@ ********************************************************************************/ import { Box, useTheme } from '@mui/material' -import { Typography } from '../../Typography' -import { type TagSizeType } from '..' import { useEffect, useState } from 'react' +import { type TagSizeType } from '..' +import { Typography } from '../../Typography' interface SelectedTagProps { title: string diff --git a/src/components/basic/MultiSelectList/MultiSelectList.stories.tsx b/src/components/basic/MultiSelectList/MultiSelectList.stories.tsx index 5e89cf3b..6c5ce545 100644 --- a/src/components/basic/MultiSelectList/MultiSelectList.stories.tsx +++ b/src/components/basic/MultiSelectList/MultiSelectList.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { MultiSelectList as Component } from '.' export default { diff --git a/src/components/basic/MultiSelectList/index.tsx b/src/components/basic/MultiSelectList/index.tsx index 418326dd..3f38a4c2 100644 --- a/src/components/basic/MultiSelectList/index.tsx +++ b/src/components/basic/MultiSelectList/index.tsx @@ -23,13 +23,13 @@ import Autocomplete, { type AutocompleteRenderInputParams, createFilterOptions, } from '@mui/material/Autocomplete' -import parse from 'autosuggest-highlight/parse' import match from 'autosuggest-highlight/match' -import { SelectInput } from './Components/SelectInput' -import { SelectOptions } from './Components/SelectOptions' -import { SelectAddMore } from './Components/SelectAddMore' +import parse from 'autosuggest-highlight/parse' import uniqueId from 'lodash/uniqueId' import { useEffect, useState } from 'react' +import { SelectAddMore } from './Components/SelectAddMore' +import { SelectInput } from './Components/SelectInput' +import { SelectOptions } from './Components/SelectOptions' export type TagSizeType = 'small' | 'medium' | 'large' export interface PartsType { diff --git a/src/components/basic/NewSubNavigation/index.tsx b/src/components/basic/NewSubNavigation/index.tsx index 3e772529..531e246b 100644 --- a/src/components/basic/NewSubNavigation/index.tsx +++ b/src/components/basic/NewSubNavigation/index.tsx @@ -17,11 +17,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Button } from '../Button' import EastIcon from '@mui/icons-material/East' import MoreVertIcon from '@mui/icons-material/MoreVert' import { Box, Divider } from '@mui/material' import { useState } from 'react' +import { Button } from '../Button' import { Typography } from '../Typography' import './styles.scss' diff --git a/src/components/basic/Notifications/PageNotification/PageNotification.stories.tsx b/src/components/basic/Notifications/PageNotification/PageNotification.stories.tsx index a8eb7878..835450d7 100644 --- a/src/components/basic/Notifications/PageNotification/PageNotification.stories.tsx +++ b/src/components/basic/Notifications/PageNotification/PageNotification.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { PageNotifications as Component } from '.' export default { diff --git a/src/components/basic/Notifications/PageNotification/index.tsx b/src/components/basic/Notifications/PageNotification/index.tsx index d48b6512..b2e5ffee 100644 --- a/src/components/basic/Notifications/PageNotification/index.tsx +++ b/src/components/basic/Notifications/PageNotification/index.tsx @@ -18,15 +18,15 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Alert, IconButton, Collapse } from '@mui/material' import { CheckCircleOutline, WarningAmber, InfoOutlined, Close, } from '@mui/icons-material' -import { NotificationContent } from './NotificationContent' +import { Alert, IconButton, Collapse } from '@mui/material' import { theme } from '../../../../theme' +import { NotificationContent } from './NotificationContent' export interface PageNotificationsProps { severity?: 'error' | 'warning' | 'info' | 'success' diff --git a/src/components/basic/Notifications/Snackbar/PageSnackbar.stories.tsx b/src/components/basic/Notifications/Snackbar/PageSnackbar.stories.tsx index 31a53075..0e4b983a 100644 --- a/src/components/basic/Notifications/Snackbar/PageSnackbar.stories.tsx +++ b/src/components/basic/Notifications/Snackbar/PageSnackbar.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { PageSnackbar as Component } from '.' export default { diff --git a/src/components/basic/Notifications/Snackbar/PageSnackbarStack.stories.tsx b/src/components/basic/Notifications/Snackbar/PageSnackbarStack.stories.tsx index d0c1b9f5..80609ea3 100644 --- a/src/components/basic/Notifications/Snackbar/PageSnackbarStack.stories.tsx +++ b/src/components/basic/Notifications/Snackbar/PageSnackbarStack.stories.tsx @@ -19,9 +19,8 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' -import { PageSnackbar } from './index' - import { PageSnackbarStack as Component } from './PageSnackbarStack' +import { PageSnackbar } from './index' export default { title: 'Notifications', diff --git a/src/components/basic/Notifications/Snackbar/index.tsx b/src/components/basic/Notifications/Snackbar/index.tsx index 4c6f17c2..9ff7c630 100644 --- a/src/components/basic/Notifications/Snackbar/index.tsx +++ b/src/components/basic/Notifications/Snackbar/index.tsx @@ -18,13 +18,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Box, IconButton, Slide } from '@mui/material' import { Close } from '@mui/icons-material' -import { type SlideProps } from '@mui/material/Slide/Slide' -import { useCallback, useEffect, useRef, useState } from 'react' -import Snackbar from '@mui/material/Snackbar' import CheckIcon from '@mui/icons-material/Check' import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline' +import { Box, IconButton, Slide } from '@mui/material' +import { type SlideProps } from '@mui/material/Slide/Slide' +import Snackbar from '@mui/material/Snackbar' +import { useCallback, useEffect, useRef, useState } from 'react' const AUTO_CLOSE_DELAY_MS = 3000 diff --git a/src/components/basic/OrderStatusButton/OrderStatusButton.stories.tsx b/src/components/basic/OrderStatusButton/OrderStatusButton.stories.tsx index 8ec81976..12d0f022 100644 --- a/src/components/basic/OrderStatusButton/OrderStatusButton.stories.tsx +++ b/src/components/basic/OrderStatusButton/OrderStatusButton.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { OrderStatusButton as Component } from '.' export default { diff --git a/src/components/basic/OrderStatusButton/index.tsx b/src/components/basic/OrderStatusButton/index.tsx index b9e96b55..2dcfd297 100644 --- a/src/components/basic/OrderStatusButton/index.tsx +++ b/src/components/basic/OrderStatusButton/index.tsx @@ -18,11 +18,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Box, useTheme } from '@mui/material' import CheckCircleOutlinedIcon from '@mui/icons-material/CheckCircleOutlined' +import { Box, useTheme } from '@mui/material' +import React from 'react' import { Button, type ButtonProps } from '../Button' import { Typography } from '../Typography' -import React from 'react' interface ButtonInputData { isIcon: boolean diff --git a/src/components/basic/ProcessList/ListItem.tsx b/src/components/basic/ProcessList/ListItem.tsx index bac2d21e..0cb7fc9e 100644 --- a/src/components/basic/ProcessList/ListItem.tsx +++ b/src/components/basic/ProcessList/ListItem.tsx @@ -19,8 +19,8 @@ ********************************************************************************/ import { Box } from '@mui/material' -import { Typography } from '../Typography' import { theme } from '../../../theme' +import { Typography } from '../Typography' interface ListItemProps { step: number diff --git a/src/components/basic/ProcessList/ProcessList.stories.tsx b/src/components/basic/ProcessList/ProcessList.stories.tsx index 1c8555b3..1e875de1 100644 --- a/src/components/basic/ProcessList/ProcessList.stories.tsx +++ b/src/components/basic/ProcessList/ProcessList.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { ProcessList as Component } from '.' export default { diff --git a/src/components/basic/ProcessList/index.tsx b/src/components/basic/ProcessList/index.tsx index 638e47fd..c9c64d8c 100644 --- a/src/components/basic/ProcessList/index.tsx +++ b/src/components/basic/ProcessList/index.tsx @@ -19,8 +19,8 @@ ********************************************************************************/ import { Box } from '@mui/material' -import { ListItem } from './ListItem' import { type StepList } from '../Stepper' +import { ListItem } from './ListItem' export interface ProcessListProps { list: StepList[] diff --git a/src/components/basic/Progress/CircleProgress/CircleProgress.stories.tsx b/src/components/basic/Progress/CircleProgress/CircleProgress.stories.tsx index 2a9eebe3..0cb34718 100644 --- a/src/components/basic/Progress/CircleProgress/CircleProgress.stories.tsx +++ b/src/components/basic/Progress/CircleProgress/CircleProgress.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { CircleProgress as Component } from '.' export default { diff --git a/src/components/basic/Progress/LinearProgress/LinearProgressWithValueLabel.stories.tsx b/src/components/basic/Progress/LinearProgress/LinearProgressWithValueLabel.stories.tsx index 515c196f..4502cac6 100644 --- a/src/components/basic/Progress/LinearProgress/LinearProgressWithValueLabel.stories.tsx +++ b/src/components/basic/Progress/LinearProgress/LinearProgressWithValueLabel.stories.tsx @@ -18,7 +18,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { LinearProgressWithValueLabel as Component } from './LinearProgressWithValueLabel' export default { diff --git a/src/components/basic/Progress/LinearProgress/LinearProgressWithValueLabel.tsx b/src/components/basic/Progress/LinearProgress/LinearProgressWithValueLabel.tsx index e799c02b..e98d0c4c 100644 --- a/src/components/basic/Progress/LinearProgress/LinearProgressWithValueLabel.tsx +++ b/src/components/basic/Progress/LinearProgress/LinearProgressWithValueLabel.tsx @@ -17,13 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useState, useEffect } from 'react' +import { CircularProgress } from '@mui/material' +import Box from '@mui/material/Box' import LinearProgress, { type LinearProgressProps, } from '@mui/material/LinearProgress' import Typography from '@mui/material/Typography' -import Box from '@mui/material/Box' -import { CircularProgress } from '@mui/material' +import { useState, useEffect } from 'react' function LinearProgressWithLabel( props: LinearProgressProps & { value: number; progressText: string } diff --git a/src/components/basic/QuickLinks/QuickLinks.stories.tsx b/src/components/basic/QuickLinks/QuickLinks.stories.tsx index d0467c05..65274f44 100644 --- a/src/components/basic/QuickLinks/QuickLinks.stories.tsx +++ b/src/components/basic/QuickLinks/QuickLinks.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import React from 'react' import { type ComponentStory } from '@storybook/react' +import React from 'react' import { QuickLinks as Component } from './index' export default { diff --git a/src/components/basic/Radio/Radio.stories.tsx b/src/components/basic/Radio/Radio.stories.tsx index 284f23bd..ec96f469 100644 --- a/src/components/basic/Radio/Radio.stories.tsx +++ b/src/components/basic/Radio/Radio.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Radio as Component } from '.' export default { diff --git a/src/components/basic/Radio/index.tsx b/src/components/basic/Radio/index.tsx index c0e88aa3..de0108c9 100644 --- a/src/components/basic/Radio/index.tsx +++ b/src/components/basic/Radio/index.tsx @@ -18,8 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import MuiRadio, { type RadioProps as MuiRadioProps } from '@mui/material/Radio' import FormControlLabel from '@mui/material/FormControlLabel' +import MuiRadio, { type RadioProps as MuiRadioProps } from '@mui/material/Radio' const ariaLabel = { inputProps: { 'aria-label': 'Radio demo' } } diff --git a/src/components/basic/Rating/Rating.stories.tsx b/src/components/basic/Rating/Rating.stories.tsx index 766b013f..eb7cbf4b 100644 --- a/src/components/basic/Rating/Rating.stories.tsx +++ b/src/components/basic/Rating/Rating.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Rating as Component } from '.' export default { diff --git a/src/components/basic/Rating/index.tsx b/src/components/basic/Rating/index.tsx index a551f629..73e5ff64 100644 --- a/src/components/basic/Rating/index.tsx +++ b/src/components/basic/Rating/index.tsx @@ -18,9 +18,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import * as React from 'react' import Box from '@mui/material/Box' import RatingUI from '@mui/material/Rating' +import * as React from 'react' interface RatingContentProps { defaultRating: number diff --git a/src/components/basic/SearchInput/SearchInput.stories.tsx b/src/components/basic/SearchInput/SearchInput.stories.tsx index 8e66d835..0046b11a 100644 --- a/src/components/basic/SearchInput/SearchInput.stories.tsx +++ b/src/components/basic/SearchInput/SearchInput.stories.tsx @@ -18,9 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useState } from 'react' import { type ComponentStory } from '@storybook/react' - +import { useState } from 'react' import { SearchInput as Component } from '.' export default { diff --git a/src/components/basic/SearchInput/index.tsx b/src/components/basic/SearchInput/index.tsx index 31b03c2c..8a6ad248 100644 --- a/src/components/basic/SearchInput/index.tsx +++ b/src/components/basic/SearchInput/index.tsx @@ -18,7 +18,6 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useCallback, useEffect, useState } from 'react' import SearchIcon from '@mui/icons-material/Search' import { Box, @@ -27,6 +26,7 @@ import { type TextFieldProps, useTheme, } from '@mui/material' +import { useCallback, useEffect, useState } from 'react' interface SearchProps extends Omit { variant?: 'outlined' diff --git a/src/components/basic/SelectList/SelectList.stories.tsx b/src/components/basic/SelectList/SelectList.stories.tsx index 0c02984b..93a42386 100644 --- a/src/components/basic/SelectList/SelectList.stories.tsx +++ b/src/components/basic/SelectList/SelectList.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { SelectList as Component } from '.' export default { diff --git a/src/components/basic/SelectList/index.tsx b/src/components/basic/SelectList/index.tsx index 036e0ca5..1dec3b87 100644 --- a/src/components/basic/SelectList/index.tsx +++ b/src/components/basic/SelectList/index.tsx @@ -20,13 +20,13 @@ import { type TextFieldProps } from '@mui/material' import Autocomplete from '@mui/material/Autocomplete' -import parse from 'autosuggest-highlight/parse' import match from 'autosuggest-highlight/match' -import { SelectInput } from '../MultiSelectList/Components/SelectInput' -import { SelectOptions } from '../MultiSelectList/Components/SelectOptions' -import uniqueId from 'lodash/uniqueId' +import parse from 'autosuggest-highlight/parse' import isEqual from 'lodash/isEqual' +import uniqueId from 'lodash/uniqueId' import { useEffect, useState } from 'react' +import { SelectInput } from '../MultiSelectList/Components/SelectInput' +import { SelectOptions } from '../MultiSelectList/Components/SelectOptions' interface SelectListProps extends Omit { // eslint-disable-next-line @@ -69,7 +69,7 @@ export const SelectList = ({ useEffect(() => { setSelected(defaultValue) - }, [defaultValue]) + }, [JSON.stringify(defaultValue)]) // eslint-disable-next-line const handleChange = (newValue: any) => { @@ -95,7 +95,7 @@ export const SelectList = ({ // eslint-disable-next-line getOptionLabel={(option) => option[keyTitle] || ''} onChange={(_event, nextValue) => { - handleChange(nextValue) + handleChange(nextValue ?? {}) }} isOptionEqualToValue={(option, value) => isEqual(option, value)} renderOption={(props, option, { inputValue }) => ( diff --git a/src/components/basic/SharedThemeProvider/index.tsx b/src/components/basic/SharedThemeProvider/index.tsx index a9b1c265..e95c5c85 100644 --- a/src/components/basic/SharedThemeProvider/index.tsx +++ b/src/components/basic/SharedThemeProvider/index.tsx @@ -19,11 +19,11 @@ ********************************************************************************/ // Note: The global.scss import must be the first in this file for the library to be build correctly! -import '../../../scss/global.scss' import { ThemeProvider } from '@mui/material/styles' -import '../../../scss/fonts.scss' -import { theme } from '../../../theme' import type { DefaultTheme } from '@mui/system' +import { theme } from '../../../theme' +import '../../../scss/fonts.scss' +import '../../../scss/global.scss' interface SharedThemeProviderProps { children: React.ReactNode diff --git a/src/components/basic/SideMenu/SideMenu.stories.tsx b/src/components/basic/SideMenu/SideMenu.stories.tsx index 24218ed6..132c3ac3 100644 --- a/src/components/basic/SideMenu/SideMenu.stories.tsx +++ b/src/components/basic/SideMenu/SideMenu.stories.tsx @@ -20,9 +20,8 @@ import { Box } from '@mui/material' import { type ComponentStory } from '@storybook/react' - -import { SideMenu as Component } from '.' import { DraggableChip } from '../Chip/DraggableChip' +import { SideMenu as Component } from '.' export default { title: 'Menus', diff --git a/src/components/basic/SideMenu/index.tsx b/src/components/basic/SideMenu/index.tsx index ca2f084c..31acd528 100644 --- a/src/components/basic/SideMenu/index.tsx +++ b/src/components/basic/SideMenu/index.tsx @@ -18,11 +18,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import ArrowDownwardIcon from '@mui/icons-material/ArrowDownward' +import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward' import { Box, type BoxProps, Collapse, Fade } from '@mui/material' import { useCallback, useEffect, useState } from 'react' import { Button } from '../Button' -import ArrowDownwardIcon from '@mui/icons-material/ArrowDownward' -import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward' export interface SideMenuProps extends Omit { header?: string | JSX.Element diff --git a/src/components/basic/SortOption/index.tsx b/src/components/basic/SortOption/index.tsx index 3dd923bd..738f2b51 100644 --- a/src/components/basic/SortOption/index.tsx +++ b/src/components/basic/SortOption/index.tsx @@ -18,9 +18,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import { Box } from '@mui/material' import { useState } from 'react' import { Typography } from '../Typography' -import { Box } from '@mui/material' export interface SortOptionsType { label: string diff --git a/src/components/basic/StaticTable/EditField.tsx b/src/components/basic/StaticTable/EditField.tsx index 952917f4..e318e473 100644 --- a/src/components/basic/StaticTable/EditField.tsx +++ b/src/components/basic/StaticTable/EditField.tsx @@ -17,11 +17,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Typography } from '@mui/material' -import { useState } from 'react' +import CloseIcon from '@mui/icons-material/Close' import EditIcon from '@mui/icons-material/Edit' import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline' -import CloseIcon from '@mui/icons-material/Close' +import { Typography } from '@mui/material' +import { useState } from 'react' import { Input } from '../../../main' import { Tooltips } from '../ToolTips' diff --git a/src/components/basic/StaticTable/HorizontalTable.tsx b/src/components/basic/StaticTable/HorizontalTable.tsx index 36b30051..58ba3432 100644 --- a/src/components/basic/StaticTable/HorizontalTable.tsx +++ b/src/components/basic/StaticTable/HorizontalTable.tsx @@ -18,10 +18,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import ContentCopyIcon from '@mui/icons-material/ContentCopy' import { Box, Typography } from '@mui/material' -import { type TableType } from './types' import { useState } from 'react' -import ContentCopyIcon from '@mui/icons-material/ContentCopy' +import { type TableType } from './types' export const HorizontalTable = ({ data }: { data: TableType }) => { const [copied, setCopied] = useState('') diff --git a/src/components/basic/StaticTable/StaticTable.stories.tsx b/src/components/basic/StaticTable/StaticTable.stories.tsx index b073e4d3..38d60b68 100644 --- a/src/components/basic/StaticTable/StaticTable.stories.tsx +++ b/src/components/basic/StaticTable/StaticTable.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { StaticTable as Component } from '.' export default { diff --git a/src/components/basic/StaticTable/VerticalTable.tsx b/src/components/basic/StaticTable/VerticalTable.tsx index b86e928d..fc06740a 100644 --- a/src/components/basic/StaticTable/VerticalTable.tsx +++ b/src/components/basic/StaticTable/VerticalTable.tsx @@ -18,16 +18,16 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useState } from 'react' -import { Typography, Link, Box } from '@mui/material' +import CloseIcon from '@mui/icons-material/Close' +import ContentCopyIcon from '@mui/icons-material/ContentCopy' import EditIcon from '@mui/icons-material/Edit' -import HelpOutlineIcon from '@mui/icons-material/HelpOutline' import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline' -import ContentCopyIcon from '@mui/icons-material/ContentCopy' -import CloseIcon from '@mui/icons-material/Close' -import type { TableType } from './types' +import HelpOutlineIcon from '@mui/icons-material/HelpOutline' +import { Typography, Link, Box } from '@mui/material' +import { useState } from 'react' import { Input } from '../Input' import { Tooltips } from '../ToolTips' +import type { TableType } from './types' export const VerticalTable = ({ data, diff --git a/src/components/basic/StaticTable/index.tsx b/src/components/basic/StaticTable/index.tsx index 073353c4..50679efa 100644 --- a/src/components/basic/StaticTable/index.tsx +++ b/src/components/basic/StaticTable/index.tsx @@ -19,8 +19,8 @@ ********************************************************************************/ import { HorizontalTable } from './HorizontalTable' -import { VerticalTable } from './VerticalTable' import type { TableType } from './types' +import { VerticalTable } from './VerticalTable' export const StaticTable = ({ data, diff --git a/src/components/basic/Stepper/RoundedStepper.stories.tsx b/src/components/basic/Stepper/RoundedStepper.stories.tsx index 2ce4bfee..efefbf5e 100644 --- a/src/components/basic/Stepper/RoundedStepper.stories.tsx +++ b/src/components/basic/Stepper/RoundedStepper.stories.tsx @@ -18,7 +18,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { RoundedStepper as Component } from './RoundedStepper' export default { diff --git a/src/components/basic/Stepper/RoundedStepper.tsx b/src/components/basic/Stepper/RoundedStepper.tsx index d365a5aa..fcc5176a 100644 --- a/src/components/basic/Stepper/RoundedStepper.tsx +++ b/src/components/basic/Stepper/RoundedStepper.tsx @@ -18,8 +18,8 @@ ********************************************************************************/ import { Box } from '@mui/material' -import './RoundedStepper.scss' import { RoundedStepperItem } from './RoundedStepperItem' +import './RoundedStepper.scss' export interface StepList { step: number diff --git a/src/components/basic/Stepper/RoundedStepperItem.tsx b/src/components/basic/Stepper/RoundedStepperItem.tsx index 625adcc8..d0cdff03 100644 --- a/src/components/basic/Stepper/RoundedStepperItem.tsx +++ b/src/components/basic/Stepper/RoundedStepperItem.tsx @@ -18,8 +18,8 @@ ********************************************************************************/ import { Box } from '@mui/material' -import { Typography } from '../Typography' import { theme } from '../../../theme' +import { Typography } from '../Typography' interface StepperItemProps { color: string diff --git a/src/components/basic/Stepper/Stepper.stories.tsx b/src/components/basic/Stepper/Stepper.stories.tsx index b9c06947..a6fc8de1 100644 --- a/src/components/basic/Stepper/Stepper.stories.tsx +++ b/src/components/basic/Stepper/Stepper.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Stepper as Component } from '.' export default { diff --git a/src/components/basic/Stepper/StepperItem.tsx b/src/components/basic/Stepper/StepperItem.tsx index e0e5df4e..2adc1f46 100644 --- a/src/components/basic/Stepper/StepperItem.tsx +++ b/src/components/basic/Stepper/StepperItem.tsx @@ -18,10 +18,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useEffect, useState } from 'react' import { Box, Link } from '@mui/material' -import { Typography } from '../Typography' +import { useEffect, useState } from 'react' import { theme } from '../../../theme' +import { Typography } from '../Typography' interface StepperItemProps { step: number diff --git a/src/components/basic/Stepper/index.tsx b/src/components/basic/Stepper/index.tsx index d5147aae..e3488374 100644 --- a/src/components/basic/Stepper/index.tsx +++ b/src/components/basic/Stepper/index.tsx @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp' import { Box, Link } from '@mui/material' import uniqueId from 'lodash/uniqueId' -import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp' import { Typography } from '../Typography' import { StepperItem } from './StepperItem' import './Stepper.scss' diff --git a/src/components/basic/SubNavigation/ParentSubNavigation.tsx b/src/components/basic/SubNavigation/ParentSubNavigation.tsx index d5ce3331..2277c298 100644 --- a/src/components/basic/SubNavigation/ParentSubNavigation.tsx +++ b/src/components/basic/SubNavigation/ParentSubNavigation.tsx @@ -18,8 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Button } from '../Button' import EastIcon from '@mui/icons-material/East' +import { Button } from '../Button' export interface NavigationItem { index: number diff --git a/src/components/basic/SubNavigation/SubNavigationButton.tsx b/src/components/basic/SubNavigation/SubNavigationButton.tsx index 51676752..68a7d2b6 100644 --- a/src/components/basic/SubNavigation/SubNavigationButton.tsx +++ b/src/components/basic/SubNavigation/SubNavigationButton.tsx @@ -19,8 +19,8 @@ ********************************************************************************/ import { Box } from '@mui/material' -import { type SubNavigationProps } from '.' import { Button } from '../Button' +import { type SubNavigationProps } from '.' export const SubNavigationButton = ({ buttonLabel, diff --git a/src/components/basic/SubNavigation/SubNavigationLink.tsx b/src/components/basic/SubNavigation/SubNavigationLink.tsx index 424b8d3b..a423320b 100644 --- a/src/components/basic/SubNavigation/SubNavigationLink.tsx +++ b/src/components/basic/SubNavigation/SubNavigationLink.tsx @@ -18,10 +18,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import EastIcon from '@mui/icons-material/East' import { Box } from '@mui/material' -import { type SubNavigationProps } from '.' import { Button } from '../Button' -import EastIcon from '@mui/icons-material/East' +import { type SubNavigationProps } from '.' export const SubNavigationLink = ({ link1Label, diff --git a/src/components/basic/SubNavigation/index.tsx b/src/components/basic/SubNavigation/index.tsx index 98a3c55c..a190dea1 100644 --- a/src/components/basic/SubNavigation/index.tsx +++ b/src/components/basic/SubNavigation/index.tsx @@ -20,8 +20,8 @@ import { Box } from '@mui/material' import { theme } from '../../../theme' -import { SubNavigationLink } from './SubNavigationLink' import { SubNavigationButton } from './SubNavigationButton' +import { SubNavigationLink } from './SubNavigationLink' export interface SubNavigationProps { buttonLabel?: string diff --git a/src/components/basic/Table/PageLoadingTable.tsx b/src/components/basic/Table/PageLoadingTable.tsx index 94b125b4..6aa4614f 100644 --- a/src/components/basic/Table/PageLoadingTable.tsx +++ b/src/components/basic/Table/PageLoadingTable.tsx @@ -19,9 +19,9 @@ ********************************************************************************/ import { Box, CircularProgress } from '@mui/material' import { useState, useEffect, useCallback } from 'react' -import { Table, type TableProps } from '.' -import { hasMorePages, getMaxRows } from './components/Helper/helper' import { Typography } from '../Typography' +import { hasMorePages, getMaxRows } from './components/Helper/helper' +import { Table, type TableProps } from '.' export interface PaginFetchArgs { page: number diff --git a/src/components/basic/Table/components/Error/Error500Overlay.tsx b/src/components/basic/Table/components/Error/Error500Overlay.tsx index 3b111e1f..31f42e48 100644 --- a/src/components/basic/Table/components/Error/Error500Overlay.tsx +++ b/src/components/basic/Table/components/Error/Error500Overlay.tsx @@ -18,9 +18,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import RefreshIcon from '@mui/icons-material/Refresh' import { Box } from '@mui/material' import { Typography } from '../../../Typography' -import RefreshIcon from '@mui/icons-material/Refresh' const flexColumn = { display: 'flex', diff --git a/src/components/basic/Table/components/Toolbar/SearchAndFilterButtonToolbar.tsx b/src/components/basic/Table/components/Toolbar/SearchAndFilterButtonToolbar.tsx index e71b7b66..69b27eed 100644 --- a/src/components/basic/Table/components/Toolbar/SearchAndFilterButtonToolbar.tsx +++ b/src/components/basic/Table/components/Toolbar/SearchAndFilterButtonToolbar.tsx @@ -18,17 +18,17 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ import ClearIcon from '@mui/icons-material/Clear' -import React, { useState, useMemo, useCallback } from 'react' import { Box, useTheme, debounce } from '@mui/material' -import { SearchInput } from '../../../SearchInput' +import React, { useState, useMemo, useCallback } from 'react' import { IconButton } from '../../../IconButton' -import { type ToolbarProps } from '.' +import { SearchInput } from '../../../SearchInput' +import { SortOption, type SortOptionsType } from '../../../SortOption' +import { Typography } from '../../../Typography' import { ViewSelector } from '../../../ViewSelector' import type { View } from '../../../ViewSelector' -import { Typography } from '../../../Typography' -import type { SelectedFilter } from './UltimateToolbar' -import { SortOption, type SortOptionsType } from '../../../SortOption' import SortImage from './SortImage' +import type { SelectedFilter } from './UltimateToolbar' +import { type ToolbarProps } from '.' export interface SearchAndFilterButtonToolbarProps extends ToolbarProps { placeholder?: string diff --git a/src/components/basic/Table/components/Toolbar/UltimateToolbar.tsx b/src/components/basic/Table/components/Toolbar/UltimateToolbar.tsx index 08ef65c6..03682fd5 100644 --- a/src/components/basic/Table/components/Toolbar/UltimateToolbar.tsx +++ b/src/components/basic/Table/components/Toolbar/UltimateToolbar.tsx @@ -18,11 +18,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ import ClearIcon from '@mui/icons-material/Clear' -import React, { useState, useMemo, useCallback } from 'react' import { Box, useTheme, debounce } from '@mui/material' +import React, { useState, useMemo, useCallback } from 'react' import { Button } from '../../../Button' -import { SearchInput } from '../../../SearchInput' import { IconButton } from '../../../IconButton' +import { SearchInput } from '../../../SearchInput' import { type ToolbarProps } from '.' export type SelectedFilter = Record diff --git a/src/components/basic/Table/components/Toolbar/index.tsx b/src/components/basic/Table/components/Toolbar/index.tsx index 03fef603..db7aa104 100644 --- a/src/components/basic/Table/components/Toolbar/index.tsx +++ b/src/components/basic/Table/components/Toolbar/index.tsx @@ -18,19 +18,19 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import React, { useCallback, useEffect, useMemo, useState } from 'react' +import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline' +import ClearIcon from '@mui/icons-material/Clear' +import FilterIcon from '@mui/icons-material/FilterAltOutlined' +import SearchIcon from '@mui/icons-material/Search' import { Box, debounce, useTheme } from '@mui/material' +import React, { useCallback, useEffect, useMemo, useState } from 'react' import { Button } from '../../../Button' +import { Checkbox } from '../../../Checkbox' import { IconButton } from '../../../IconButton' import { SearchInput } from '../../../SearchInput' +import { Tooltips } from '../../../ToolTips' import { Typography } from '../../../Typography' -import SearchIcon from '@mui/icons-material/Search' -import FilterIcon from '@mui/icons-material/FilterAltOutlined' -import ClearIcon from '@mui/icons-material/Clear' -import { Checkbox } from '../../../Checkbox' import { getSelectedFilterUpdate } from './helper' -import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline' -import { Tooltips } from '../../../ToolTips' interface FilterValue { value: string diff --git a/src/components/basic/Table/index.tsx b/src/components/basic/Table/index.tsx index e8921a52..3b3946a0 100644 --- a/src/components/basic/Table/index.tsx +++ b/src/components/basic/Table/index.tsx @@ -18,29 +18,29 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useCallback } from 'react' +import { Box, Stack } from '@mui/material' import { DataGrid, type GridRowSelectionModel, type DataGridProps, type GridRowId, } from '@mui/x-data-grid' -import { Box, Stack } from '@mui/material' +import { useCallback } from 'react' +import { theme } from '../../../theme' +import { LoadMoreButton } from '../Button/LoadMoreButton' +import { type SortOptionsType } from '../SortOption' +import { Typography } from '../Typography' +import type { View } from '../ViewSelector' +import { Error400Overlay } from './components/Error/Error400Overlay' +import { Error500Overlay } from './components/Error/Error500Overlay' import { StatusTag } from './components/StatusTag' import { type AdditionalButtonsType, Toolbar, type ToolbarProps, } from './components/Toolbar' -import { UltimateToolbar } from './components/Toolbar/UltimateToolbar' -import { theme } from '../../../theme' import { SearchAndFilterButtonToolbar } from './components/Toolbar/SearchAndFilterButtonToolbar' -import { Typography } from '../Typography' -import { Error500Overlay } from './components/Error/Error500Overlay' -import { Error400Overlay } from './components/Error/Error400Overlay' -import type { View } from '../ViewSelector' -import { type SortOptionsType } from '../SortOption' -import { LoadMoreButton } from '../Button/LoadMoreButton' +import { UltimateToolbar } from './components/Toolbar/UltimateToolbar' export { StatusTag } export type toolbarType = 'basic' | 'premium' | 'ultimate' | 'searchAndFilter' diff --git a/src/components/basic/Table/table.stories.tsx b/src/components/basic/Table/table.stories.tsx index ba16ce5b..65203afa 100644 --- a/src/components/basic/Table/table.stories.tsx +++ b/src/components/basic/Table/table.stories.tsx @@ -18,16 +18,15 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ComponentStory } from '@storybook/react' - -import { Table as Component } from '.' +import Link from '@mui/material/Link' import type { GridColDef, GridRowsProp, GridRenderCellParams, } from '@mui/x-data-grid' -import Link from '@mui/material/Link' +import { type ComponentStory } from '@storybook/react' import TestRows from '../../../../src/assets/data/TableRows.json' +import { Table as Component } from '.' const rows: GridRowsProp = TestRows diff --git a/src/components/basic/Tabs/TabPanel.tsx b/src/components/basic/Tabs/TabPanel.tsx index d867afbd..f11257fe 100644 --- a/src/components/basic/Tabs/TabPanel.tsx +++ b/src/components/basic/Tabs/TabPanel.tsx @@ -18,8 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import React from 'react' import { Box } from '@mui/material' +import React from 'react' interface TabPanelProps { children?: React.ReactNode diff --git a/src/components/basic/Tabs/Tabs.stories.tsx b/src/components/basic/Tabs/Tabs.stories.tsx index 4d5afe93..943cec04 100644 --- a/src/components/basic/Tabs/Tabs.stories.tsx +++ b/src/components/basic/Tabs/Tabs.stories.tsx @@ -18,16 +18,15 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ComponentStory } from '@storybook/react' - import GroupOutlinedIcon from '@mui/icons-material/GroupOutlined' import PersonOutlinedIcon from '@mui/icons-material/PersonOutlined' -import React from 'react' import { Box } from '@mui/material' -import { type ReactComponent } from '*.svg' +import { type ComponentStory } from '@storybook/react' +import React from 'react' import { Tab } from './Tab' import { TabPanel } from './TabPanel' import { Tabs } from './Tabs' +import { type ReactComponent } from '*.svg' export default { title: 'Tabs', diff --git a/src/components/basic/Textarea/Textarea.stories.tsx b/src/components/basic/Textarea/Textarea.stories.tsx index bdd9a382..fc7192f8 100644 --- a/src/components/basic/Textarea/Textarea.stories.tsx +++ b/src/components/basic/Textarea/Textarea.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Textarea as Component } from '.' export default { diff --git a/src/components/basic/ToggleSwitch/ToggleSwitch.scss b/src/components/basic/ToggleSwitch/ToggleSwitch.scss index c73f0618..ab2239f0 100644 --- a/src/components/basic/ToggleSwitch/ToggleSwitch.scss +++ b/src/components/basic/ToggleSwitch/ToggleSwitch.scss @@ -18,17 +18,7 @@ ********************************************************************************/ .toggle-switch { - width: 60px; - height: 30px; - align-items: center; - justify-content: center; - padding: 0px; - - & .MuiSwitch-switchBase { - top: 6px; - left: 7px; - color: #fff; - + .MuiSwitch-switchBase { &.Mui-checked { transform: translateX(28px); } @@ -38,38 +28,6 @@ } } - & .MuiSwitch-thumb { - width: 26px; - height: 26px; - background-color: #fff; - position: absolute; - } - - & .MuiSwitch-track { - border-radius: 15px; - background-color: #ff0000; - height: 30px; - opacity: 1; - - &::before { - position: absolute; - content: 'ON'; - font-size: 12px; - left: 5px; - top: 6px; - color: #000; - } - - &::after { - position: absolute; - content: 'OFF'; - font-size: 12px; - right: 5px; - top: 6px; - color: #000; - } - } - .MuiSwitch-switchBase.Mui-checked + .MuiSwitch-track { background-color: #5bb52e; } diff --git a/src/components/basic/ToggleSwitch/ToggleSwitch.stories.tsx b/src/components/basic/ToggleSwitch/ToggleSwitch.stories.tsx index cf92084a..255fb392 100644 --- a/src/components/basic/ToggleSwitch/ToggleSwitch.stories.tsx +++ b/src/components/basic/ToggleSwitch/ToggleSwitch.stories.tsx @@ -18,8 +18,8 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' -import { ToggleSwitch as Component } from '.' import { useState } from 'react' +import { ToggleSwitch as Component } from '.' export default { title: 'ToggleSwitch', @@ -39,8 +39,8 @@ const Template: ComponentStory = ( return } -export const Default = Template.bind({}) -Default.args = { +export const ToggleSwitch = Template.bind({}) +ToggleSwitch.args = { disabled: false, - isHoverEnabled: false, + hoverEnabled: false, } diff --git a/src/components/basic/ToggleSwitch/index.tsx b/src/components/basic/ToggleSwitch/index.tsx index 7d97c249..9757857a 100644 --- a/src/components/basic/ToggleSwitch/index.tsx +++ b/src/components/basic/ToggleSwitch/index.tsx @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import { Switch, Tooltip } from '@mui/material' import React from 'react' import './ToggleSwitch.scss' -import { Switch, Tooltip } from '@mui/material' export interface ToggleSwitchProps { checked: boolean @@ -34,7 +34,7 @@ export const ToggleSwitch = ({ onChange, disabled = false, hoverEnabled = false, - tooltipText = 'hdhdhddh', + tooltipText = '', }: ToggleSwitchProps) => { const handleKeyDown = (e: React.KeyboardEvent) => { if (e.key === 'Enter' || e.key === ' ') { @@ -64,9 +64,47 @@ export const ToggleSwitch = ({ inputProps={{ 'aria-label': 'controlled' }} disabled={disabled} onKeyDown={handleKeyDown} + sx={{ + width: '60px', + height: '30px', + alignItems: 'center', + justifyContent: 'center', + padding: 0, + '& .MuiSwitch-switchBase': { + top: '6px', + left: '7px', + color: '#fff', + }, + '& .MuiSwitch-thumb': { + width: '26px', + height: '26px', + backgroundColor: '#fff', + position: 'absolute', + }, + '& .MuiSwitch-track': { + borderRadius: '15px', + backgroundColor: checked ? '#5bb52e' : '#ff0000', + height: '30px', + opacity: 1, + '&::before': { + content: '"ON"', + position: 'absolute', + left: '5px', + top: '6px', + fontSize: '12px', + color: '#000', + }, + '&::after': { + content: '"OFF"', + position: 'absolute', + right: '5px', + top: '6px', + fontSize: '12px', + color: '#000', + }, + }, + }} /> ) } - -export default ToggleSwitch diff --git a/src/components/basic/ToolTips/ToolTips.stories.tsx b/src/components/basic/ToolTips/ToolTips.stories.tsx index 07db92d3..cfdeeba4 100644 --- a/src/components/basic/ToolTips/ToolTips.stories.tsx +++ b/src/components/basic/ToolTips/ToolTips.stories.tsx @@ -20,8 +20,8 @@ import { Box } from '@mui/material' import { type ComponentStory } from '@storybook/react' -import { Tooltips as Component } from '.' import { Button } from '../Button' +import { Tooltips as Component } from '.' export default { title: 'Tooltips', diff --git a/src/components/basic/UserAvatar/UserAvatar.stories.tsx b/src/components/basic/UserAvatar/UserAvatar.stories.tsx index fed9f96c..20a15a5f 100644 --- a/src/components/basic/UserAvatar/UserAvatar.stories.tsx +++ b/src/components/basic/UserAvatar/UserAvatar.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { UserAvatar as Component } from '.' export default { diff --git a/src/components/basic/UserAvatar/index.tsx b/src/components/basic/UserAvatar/index.tsx index 3e9ec8ef..ec5be519 100644 --- a/src/components/basic/UserAvatar/index.tsx +++ b/src/components/basic/UserAvatar/index.tsx @@ -18,8 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Badge, Avatar, type AvatarProps, useTheme } from '@mui/material' import PersonOutlineIcon from '@mui/icons-material/PersonOutline' +import { Badge, Avatar, type AvatarProps, useTheme } from '@mui/material' interface AllAvatarProps extends Omit { altText?: string diff --git a/src/components/basic/VerticalTabs/VerticalTabs.stories.tsx b/src/components/basic/VerticalTabs/VerticalTabs.stories.tsx index 119604a0..5c688fd3 100644 --- a/src/components/basic/VerticalTabs/VerticalTabs.stories.tsx +++ b/src/components/basic/VerticalTabs/VerticalTabs.stories.tsx @@ -18,9 +18,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ComponentStory } from '@storybook/react' import { Box, Typography } from '@mui/material' - +import { type ComponentStory } from '@storybook/react' import { type TabPanelType, VerticalTabs as Component } from '.' export default { diff --git a/src/components/basic/VerticalTabs/index.tsx b/src/components/basic/VerticalTabs/index.tsx index 41dd6419..8fc48a97 100644 --- a/src/components/basic/VerticalTabs/index.tsx +++ b/src/components/basic/VerticalTabs/index.tsx @@ -18,12 +18,12 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import ArrowForwardIos from '@mui/icons-material/ArrowForwardIos' import { Box, useTheme } from '@mui/material' -import Tabs from '@mui/material/Tabs' import Tab from '@mui/material/Tab' -import { useState } from 'react' +import Tabs from '@mui/material/Tabs' import uniqueId from 'lodash/uniqueId' -import ArrowForwardIos from '@mui/icons-material/ArrowForwardIos' +import { useState } from 'react' export interface TabPanelType { id: number diff --git a/src/components/basic/ViewSelector/index.tsx b/src/components/basic/ViewSelector/index.tsx index ecab5fcf..3313e9ca 100644 --- a/src/components/basic/ViewSelector/index.tsx +++ b/src/components/basic/ViewSelector/index.tsx @@ -19,8 +19,8 @@ ********************************************************************************/ import { Box } from '@mui/material' -import { Button } from '../Button' import React from 'react' +import { Button } from '../Button' export interface View { buttonText: string diff --git a/src/components/content/Cards/AboutCard.stories.tsx b/src/components/content/Cards/AboutCard.stories.tsx index 57745774..79cdca60 100644 --- a/src/components/content/Cards/AboutCard.stories.tsx +++ b/src/components/content/Cards/AboutCard.stories.tsx @@ -18,7 +18,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { AboutCard as Component } from './AboutCard' export default { diff --git a/src/components/content/Cards/Card.tsx b/src/components/content/Cards/Card.tsx index d389a36e..2544ed43 100644 --- a/src/components/content/Cards/Card.tsx +++ b/src/components/content/Cards/Card.tsx @@ -18,18 +18,18 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Box, Link, Typography, useTheme } from '@mui/material' +import FavoriteIcon from '@mui/icons-material/Favorite' import MoreVertIcon from '@mui/icons-material/MoreVert' +import { Box, Link, Typography, useTheme } from '@mui/material' import { useEffect, useRef, useState } from 'react' +import { Chip } from '../../basic/Chip' +import { SortOption } from '../../basic/SortOption' +import { Tooltips } from '../../basic/ToolTips' import { CardButtons, type CardButtonsProps } from './CardButtons' import { CardChip, type CardChipProps } from './CardChip' import { CardContent, type CardContentProps } from './CardContent' import { CardImage, type CardImageProps } from './CardImage' -import { SortOption } from '../../basic/SortOption' import { type SubItems } from '.' -import { Tooltips } from '../../basic/ToolTips' -import FavoriteIcon from '@mui/icons-material/Favorite' -import { Chip } from '../../basic/Chip' type Variants = | 'minimal' diff --git a/src/components/content/Cards/CardAddService.tsx b/src/components/content/Cards/CardAddService.tsx index ca7a5e96..8f0ba59b 100644 --- a/src/components/content/Cards/CardAddService.tsx +++ b/src/components/content/Cards/CardAddService.tsx @@ -19,8 +19,8 @@ ********************************************************************************/ import { Box, useTheme } from '@mui/material' -import { Typography } from '../../basic/Typography' import { useState, useEffect, useRef } from 'react' +import { Typography } from '../../basic/Typography' export interface CardAddServiceProps { title?: string diff --git a/src/components/content/Cards/CardButtons.tsx b/src/components/content/Cards/CardButtons.tsx index 04029ce4..33244952 100644 --- a/src/components/content/Cards/CardButtons.tsx +++ b/src/components/content/Cards/CardButtons.tsx @@ -18,11 +18,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import AddIcon from '@mui/icons-material/Add' +import CheckIcon from '@mui/icons-material/Check' import { Box } from '@mui/material' import { Button } from '../../basic/Button' import { IconButton } from '../../basic/IconButton' -import AddIcon from '@mui/icons-material/Add' -import CheckIcon from '@mui/icons-material/Check' export interface CardButtonsProps { buttonText: string diff --git a/src/components/content/Cards/CardDecision.stories.tsx b/src/components/content/Cards/CardDecision.stories.tsx index 27957d4d..15629a3e 100644 --- a/src/components/content/Cards/CardDecision.stories.tsx +++ b/src/components/content/Cards/CardDecision.stories.tsx @@ -20,7 +20,6 @@ import { type ComponentStory } from '@storybook/react' import { StatusVariants } from './CardChip' - import { CardDecision as Component } from './CardDecision' export default { diff --git a/src/components/content/Cards/CardDecision.tsx b/src/components/content/Cards/CardDecision.tsx index 91050c90..02c77dff 100644 --- a/src/components/content/Cards/CardDecision.tsx +++ b/src/components/content/Cards/CardDecision.tsx @@ -18,10 +18,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import ApprovalIcon from '@mui/icons-material/Approval' +import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline' import { Box, Typography, IconButton, useTheme } from '@mui/material' import { CardChip, StatusVariants, type Variants } from './CardChip' -import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline' -import ApprovalIcon from '@mui/icons-material/Approval' export interface AppContent { appId?: string diff --git a/src/components/content/Cards/CardHorizontal.stories.tsx b/src/components/content/Cards/CardHorizontal.stories.tsx index 520505b3..f623f1a8 100644 --- a/src/components/content/Cards/CardHorizontal.stories.tsx +++ b/src/components/content/Cards/CardHorizontal.stories.tsx @@ -20,7 +20,6 @@ import { type ComponentStory } from '@storybook/react' import { StatusVariants } from './CardChip' - import { CardHorizontal as Component } from './CardHorizontal' export default { diff --git a/src/components/content/Cards/CardHorizontal.tsx b/src/components/content/Cards/CardHorizontal.tsx index 721d761b..e0a72fa8 100644 --- a/src/components/content/Cards/CardHorizontal.tsx +++ b/src/components/content/Cards/CardHorizontal.tsx @@ -18,9 +18,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { useRef } from 'react' -import { Box, useTheme } from '@mui/material' import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown' +import { Box, useTheme } from '@mui/material' +import { useRef } from 'react' import { LogoGrayData } from '../../basic/Image' import { Typography } from '../../basic/Typography' import { type CardChipProps } from './CardChip' diff --git a/src/components/content/Cards/CardRating.tsx b/src/components/content/Cards/CardRating.tsx index 45141fc8..61ed2e37 100644 --- a/src/components/content/Cards/CardRating.tsx +++ b/src/components/content/Cards/CardRating.tsx @@ -18,9 +18,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import StarRateIcon from '@mui/icons-material/StarRate' import { Box, useTheme } from '@mui/material' import { Typography } from '../../basic/Typography' -import StarRateIcon from '@mui/icons-material/StarRate' export interface CardRatingProps { rating: number diff --git a/src/components/content/Cards/ContentCard.stories.tsx b/src/components/content/Cards/ContentCard.stories.tsx index 206f7087..2cf8fc12 100644 --- a/src/components/content/Cards/ContentCard.stories.tsx +++ b/src/components/content/Cards/ContentCard.stories.tsx @@ -18,7 +18,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { ContentCard as Component } from './ContentCard' export default { diff --git a/src/components/content/Cards/MarketplaceCard.stories.tsx b/src/components/content/Cards/MarketplaceCard.stories.tsx index a63508f1..01d187b3 100644 --- a/src/components/content/Cards/MarketplaceCard.stories.tsx +++ b/src/components/content/Cards/MarketplaceCard.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Cards as Component } from '.' export default { diff --git a/src/components/content/Cards/index.tsx b/src/components/content/Cards/index.tsx index d0536e86..c404b523 100644 --- a/src/components/content/Cards/index.tsx +++ b/src/components/content/Cards/index.tsx @@ -19,8 +19,8 @@ ********************************************************************************/ import { Box } from '@mui/material' -import { Card, type CardProps } from './Card' import uniqueId from 'lodash/uniqueId' +import { Card, type CardProps } from './Card' import { CardAddService } from './CardAddService' export type CardItems = Omit< diff --git a/src/components/content/DemoComponents/CardGrid.stories.tsx b/src/components/content/DemoComponents/CardGrid.stories.tsx index 4e60daec..ace2af5e 100644 --- a/src/components/content/DemoComponents/CardGrid.stories.tsx +++ b/src/components/content/DemoComponents/CardGrid.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { CardGrid as Component } from './CardGrid' import type { Meta, StoryObj } from '@storybook/react' +import { CardGrid as Component } from './CardGrid' const meta: Meta = { component: Component, diff --git a/src/components/content/DemoComponents/CardGrid.tsx b/src/components/content/DemoComponents/CardGrid.tsx index 6a8d4401..f57ff308 100644 --- a/src/components/content/DemoComponents/CardGrid.tsx +++ b/src/components/content/DemoComponents/CardGrid.tsx @@ -17,13 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import { Box } from '@mui/material' import { CardWithImage } from './components/CardWithImage' import { CardWithoutImage } from './components/CardWithoutImage' import { type ProviderProps, type CardDetailsProps, } from './ContentComponentsTypes' -import { Box } from '@mui/material' import './ContentComponents.scss' export const CardGrid = ({ diff --git a/src/components/content/DemoComponents/FlexImages.stories.tsx b/src/components/content/DemoComponents/FlexImages.stories.tsx index eb22416c..1029dd92 100644 --- a/src/components/content/DemoComponents/FlexImages.stories.tsx +++ b/src/components/content/DemoComponents/FlexImages.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { FlexImages as Component } from './FlexImages' import type { Meta, StoryObj } from '@storybook/react' +import { FlexImages as Component } from './FlexImages' const meta: Meta = { component: Component, diff --git a/src/components/content/DemoComponents/FlexImages.tsx b/src/components/content/DemoComponents/FlexImages.tsx index 7a61d089..98e5cbf8 100644 --- a/src/components/content/DemoComponents/FlexImages.tsx +++ b/src/components/content/DemoComponents/FlexImages.tsx @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import { RenderImage } from './components/RenderImage' import { type ProviderProps } from './ContentComponentsTypes' import './ContentComponents.scss' -import { RenderImage } from './components/RenderImage' export const FlexImages = ({ provider, diff --git a/src/components/content/DemoComponents/GridImages.stories.tsx b/src/components/content/DemoComponents/GridImages.stories.tsx index 4db2f90b..1aa1e487 100644 --- a/src/components/content/DemoComponents/GridImages.stories.tsx +++ b/src/components/content/DemoComponents/GridImages.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { GridImages as Component } from './GridImages' import type { Meta, StoryObj } from '@storybook/react' +import { GridImages as Component } from './GridImages' const meta: Meta = { component: Component, diff --git a/src/components/content/DemoComponents/GridImages.tsx b/src/components/content/DemoComponents/GridImages.tsx index a5d29fd6..b6a1ed7c 100644 --- a/src/components/content/DemoComponents/GridImages.tsx +++ b/src/components/content/DemoComponents/GridImages.tsx @@ -17,10 +17,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import { Box } from '@mui/material' +import { RenderImage } from './components/RenderImage' import { type ProviderProps } from './ContentComponentsTypes' import './ContentComponents.scss' -import { RenderImage } from './components/RenderImage' -import { Box } from '@mui/material' export const GridImages = ({ provider, diff --git a/src/components/content/DemoComponents/LinkButtonGrid.stories.tsx b/src/components/content/DemoComponents/LinkButtonGrid.stories.tsx index 3d88e722..028daaaf 100644 --- a/src/components/content/DemoComponents/LinkButtonGrid.stories.tsx +++ b/src/components/content/DemoComponents/LinkButtonGrid.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { LinkButtonGrid as Component } from './LinkButtonGrid' import type { Meta, StoryObj } from '@storybook/react' +import { LinkButtonGrid as Component } from './LinkButtonGrid' const meta: Meta = { component: Component, diff --git a/src/components/content/DemoComponents/LinkButtonGrid.tsx b/src/components/content/DemoComponents/LinkButtonGrid.tsx index b96591f9..5719da4b 100644 --- a/src/components/content/DemoComponents/LinkButtonGrid.tsx +++ b/src/components/content/DemoComponents/LinkButtonGrid.tsx @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ProviderProps, type LinkProps } from './ContentComponentsTypes' import { Box } from '@mui/material' import { Typography } from '../../basic/Typography' +import { type ProviderProps, type LinkProps } from './ContentComponentsTypes' import './ContentComponents.scss' export const LinkButtonGrid = ({ diff --git a/src/components/content/DemoComponents/TextCenterAligned.stories.tsx b/src/components/content/DemoComponents/TextCenterAligned.stories.tsx index 700e416e..d6730a21 100644 --- a/src/components/content/DemoComponents/TextCenterAligned.stories.tsx +++ b/src/components/content/DemoComponents/TextCenterAligned.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { TextCenterAligned as Component } from './TextCenterAligned' import type { Meta, StoryObj } from '@storybook/react' +import { TextCenterAligned as Component } from './TextCenterAligned' const meta: Meta = { component: Component, diff --git a/src/components/content/DemoComponents/TextCenterAligned.tsx b/src/components/content/DemoComponents/TextCenterAligned.tsx index 43616af5..77a8222f 100644 --- a/src/components/content/DemoComponents/TextCenterAligned.tsx +++ b/src/components/content/DemoComponents/TextCenterAligned.tsx @@ -17,12 +17,12 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Typography } from '../../basic/Typography' +import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward' +import { Trans } from 'react-i18next' import { IconButton } from '../../basic/IconButton' +import { Typography } from '../../basic/Typography' import { type ProviderProps } from './ContentComponentsTypes' import './ContentComponents.scss' -import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward' -import { Trans } from 'react-i18next' export const TextCenterAligned = ({ provider, diff --git a/src/components/content/DemoComponents/TextCenterAlignedBody2.stories.tsx b/src/components/content/DemoComponents/TextCenterAlignedBody2.stories.tsx index 1c714f16..d30855db 100644 --- a/src/components/content/DemoComponents/TextCenterAlignedBody2.stories.tsx +++ b/src/components/content/DemoComponents/TextCenterAlignedBody2.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { TextCenterAlignedBody2 as Component } from './TextCenterAlignedBody2' import type { Meta, StoryObj } from '@storybook/react' +import { TextCenterAlignedBody2 as Component } from './TextCenterAlignedBody2' const meta: Meta = { component: Component, diff --git a/src/components/content/DemoComponents/TextCenterAlignedBody2.tsx b/src/components/content/DemoComponents/TextCenterAlignedBody2.tsx index 9c327181..f5d166c6 100644 --- a/src/components/content/DemoComponents/TextCenterAlignedBody2.tsx +++ b/src/components/content/DemoComponents/TextCenterAlignedBody2.tsx @@ -17,13 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { Box } from '@mui/material' -import { type ProviderProps } from './ContentComponentsTypes' -import './ContentComponents.scss' import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward' +import { Box } from '@mui/material' import { Trans } from 'react-i18next' -import { Typography } from '../../basic/Typography' import { IconButton } from '../../basic/IconButton' +import { Typography } from '../../basic/Typography' +import { type ProviderProps } from './ContentComponentsTypes' +import './ContentComponents.scss' export const TextCenterAlignedBody2 = ({ provider, diff --git a/src/components/content/DemoComponents/TextImageCenterAligned.stories.tsx b/src/components/content/DemoComponents/TextImageCenterAligned.stories.tsx index 4fa57a2e..1747da50 100644 --- a/src/components/content/DemoComponents/TextImageCenterAligned.stories.tsx +++ b/src/components/content/DemoComponents/TextImageCenterAligned.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { TextImageCenterAligned as Component } from './TextImageCenterAligned' import type { Meta, StoryObj } from '@storybook/react' +import { TextImageCenterAligned as Component } from './TextImageCenterAligned' const meta: Meta = { component: Component, diff --git a/src/components/content/DemoComponents/TextImageCenterAligned.tsx b/src/components/content/DemoComponents/TextImageCenterAligned.tsx index f24e9eea..c1dc09fd 100644 --- a/src/components/content/DemoComponents/TextImageCenterAligned.tsx +++ b/src/components/content/DemoComponents/TextImageCenterAligned.tsx @@ -17,10 +17,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ProviderProps } from './ContentComponentsTypes' -import './ContentComponents.scss' import { RenderImage } from './components/RenderImage' +import { type ProviderProps } from './ContentComponentsTypes' import { TextCenterAligned } from './TextCenterAligned' +import './ContentComponents.scss' export const TextImageCenterAligned = ({ provider, diff --git a/src/components/content/DemoComponents/TextImageSideBySide.stories.tsx b/src/components/content/DemoComponents/TextImageSideBySide.stories.tsx index 31d3c764..54b5d749 100644 --- a/src/components/content/DemoComponents/TextImageSideBySide.stories.tsx +++ b/src/components/content/DemoComponents/TextImageSideBySide.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { TextImageSideBySide as Component } from './TextImageSideBySide' import type { Meta, StoryObj } from '@storybook/react' +import { TextImageSideBySide as Component } from './TextImageSideBySide' const meta: Meta = { component: Component, diff --git a/src/components/content/DemoComponents/TextImageSideBySide.tsx b/src/components/content/DemoComponents/TextImageSideBySide.tsx index 19608da5..6bb9c3e0 100644 --- a/src/components/content/DemoComponents/TextImageSideBySide.tsx +++ b/src/components/content/DemoComponents/TextImageSideBySide.tsx @@ -17,10 +17,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ProviderProps } from './ContentComponentsTypes' -import './ContentComponents.scss' import { ImageVideoWrapper } from './components/ImageVideoWrapper' import { RenderImage } from './components/RenderImage' +import { type ProviderProps } from './ContentComponentsTypes' +import './ContentComponents.scss' export const TextImageSideBySide = ({ provider, diff --git a/src/components/content/DemoComponents/TextImageSideBySideWithSections.stories.tsx b/src/components/content/DemoComponents/TextImageSideBySideWithSections.stories.tsx index 7f81d96d..fcbb4d49 100644 --- a/src/components/content/DemoComponents/TextImageSideBySideWithSections.stories.tsx +++ b/src/components/content/DemoComponents/TextImageSideBySideWithSections.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { TextImageSideBySideWithSections as Component } from './TextImageSideBySideWithSections' import type { Meta, StoryObj } from '@storybook/react' +import { TextImageSideBySideWithSections as Component } from './TextImageSideBySideWithSections' const meta: Meta = { component: Component, diff --git a/src/components/content/DemoComponents/TextImageSideBySideWithSections.tsx b/src/components/content/DemoComponents/TextImageSideBySideWithSections.tsx index b4c84199..d9e5e6e7 100644 --- a/src/components/content/DemoComponents/TextImageSideBySideWithSections.tsx +++ b/src/components/content/DemoComponents/TextImageSideBySideWithSections.tsx @@ -17,18 +17,18 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { - type CardDetailsProps, - type ProviderProps, -} from './ContentComponentsTypes' -import './ContentComponents.scss' -import { Trans } from 'react-i18next' import { Box, useMediaQuery, useTheme } from '@mui/material' +import { Trans } from 'react-i18next' import { Typography } from '../../basic/Typography' import { AlignedText } from './components/AlignedText' import { CardWithoutImage } from './components/CardWithoutImage' import { RenderImage } from './components/RenderImage' import { TitleDescriptionAndSectionlink } from './components/TitleDescriptionAndSectionlink' +import { + type CardDetailsProps, + type ProviderProps, +} from './ContentComponentsTypes' +import './ContentComponents.scss' export const TextImageSideBySideWithSections = ({ provider, diff --git a/src/components/content/DemoComponents/TextVideoSideBySide.stories.tsx b/src/components/content/DemoComponents/TextVideoSideBySide.stories.tsx index 87354151..02fd24b1 100644 --- a/src/components/content/DemoComponents/TextVideoSideBySide.stories.tsx +++ b/src/components/content/DemoComponents/TextVideoSideBySide.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { TextVideoSideBySide as Component } from './TextVideoSideBySide' import type { Meta, StoryObj } from '@storybook/react' +import { TextVideoSideBySide as Component } from './TextVideoSideBySide' const meta: Meta = { component: Component, diff --git a/src/components/content/DemoComponents/TextVideoSideBySide.tsx b/src/components/content/DemoComponents/TextVideoSideBySide.tsx index 2acf98d7..577dac3a 100644 --- a/src/components/content/DemoComponents/TextVideoSideBySide.tsx +++ b/src/components/content/DemoComponents/TextVideoSideBySide.tsx @@ -17,10 +17,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ProviderProps } from './ContentComponentsTypes' -import './ContentComponents.scss' import ReactPlayer from 'react-player' import { ImageVideoWrapper } from './components/ImageVideoWrapper' +import { type ProviderProps } from './ContentComponentsTypes' +import './ContentComponents.scss' export const TextVideoSideBySide = ({ provider, diff --git a/src/components/content/DemoComponents/VideoTextSideBySide.stories.tsx b/src/components/content/DemoComponents/VideoTextSideBySide.stories.tsx index 92d58e3b..64e458ae 100644 --- a/src/components/content/DemoComponents/VideoTextSideBySide.stories.tsx +++ b/src/components/content/DemoComponents/VideoTextSideBySide.stories.tsx @@ -17,8 +17,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { VideoTextSideBySide as Component } from './VideoTextSideBySide' import type { Meta, StoryObj } from '@storybook/react' +import { VideoTextSideBySide as Component } from './VideoTextSideBySide' const meta: Meta = { component: Component, diff --git a/src/components/content/DemoComponents/VideoTextSideBySide.tsx b/src/components/content/DemoComponents/VideoTextSideBySide.tsx index 5c10a15c..9618564d 100644 --- a/src/components/content/DemoComponents/VideoTextSideBySide.tsx +++ b/src/components/content/DemoComponents/VideoTextSideBySide.tsx @@ -17,13 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ProviderProps } from './ContentComponentsTypes' -import './ContentComponents.scss' -import ReactPlayer from 'react-player' import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward' import { Trans } from 'react-i18next' -import { Typography } from '../../basic/Typography' +import ReactPlayer from 'react-player' import { IconButton } from '../../basic/IconButton' +import { Typography } from '../../basic/Typography' +import { type ProviderProps } from './ContentComponentsTypes' +import './ContentComponents.scss' export const VideoTextSideBySide = ({ provider, diff --git a/src/components/content/DemoComponents/components/AlignedText.tsx b/src/components/content/DemoComponents/components/AlignedText.tsx index 4a8f56d4..2b4a8fe0 100644 --- a/src/components/content/DemoComponents/components/AlignedText.tsx +++ b/src/components/content/DemoComponents/components/AlignedText.tsx @@ -18,8 +18,8 @@ ********************************************************************************/ import { type SubSectionsType } from '../ContentComponentsTypes' -import '../ContentComponents.scss' import { TitleDescriptionAndSectionlink } from './TitleDescriptionAndSectionlink' +import '../ContentComponents.scss' export const AlignedText = ({ provider, diff --git a/src/components/content/DemoComponents/components/CardWithImage.tsx b/src/components/content/DemoComponents/components/CardWithImage.tsx index 1c90b0b4..bac41af4 100644 --- a/src/components/content/DemoComponents/components/CardWithImage.tsx +++ b/src/components/content/DemoComponents/components/CardWithImage.tsx @@ -17,11 +17,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { CardWithText } from './CardWithText' import { Box } from '@mui/material' -import '../ContentComponents.scss' import { Image } from '../../../basic/Image' import { type CardDetailsProps } from '../ContentComponentsTypes' +import { CardWithText } from './CardWithText' +import '../ContentComponents.scss' export const CardWithImage = ({ detail, diff --git a/src/components/content/DemoComponents/components/CardWithText.tsx b/src/components/content/DemoComponents/components/CardWithText.tsx index 1428da28..7d2af74c 100644 --- a/src/components/content/DemoComponents/components/CardWithText.tsx +++ b/src/components/content/DemoComponents/components/CardWithText.tsx @@ -17,10 +17,10 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type CardDetailsProps } from '../ContentComponentsTypes' -import '../ContentComponents.scss' import { Trans } from 'react-i18next' import { Typography } from '../../../basic/Typography' +import { type CardDetailsProps } from '../ContentComponentsTypes' +import '../ContentComponents.scss' export const CardWithText = ({ card, diff --git a/src/components/content/DemoComponents/components/CardWithoutImage.tsx b/src/components/content/DemoComponents/components/CardWithoutImage.tsx index b5027282..cc256084 100644 --- a/src/components/content/DemoComponents/components/CardWithoutImage.tsx +++ b/src/components/content/DemoComponents/components/CardWithoutImage.tsx @@ -17,9 +17,9 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ +import { Box } from '@mui/material' import { type CardDetailsProps } from '../ContentComponentsTypes' import { CardWithText } from './CardWithText' -import { Box } from '@mui/material' import '../ContentComponents.scss' export const CardWithoutImage = ({ diff --git a/src/components/content/DemoComponents/components/ImageTextSideBySide.tsx b/src/components/content/DemoComponents/components/ImageTextSideBySide.tsx index a73cba7c..f0b8e43e 100644 --- a/src/components/content/DemoComponents/components/ImageTextSideBySide.tsx +++ b/src/components/content/DemoComponents/components/ImageTextSideBySide.tsx @@ -17,13 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { IconButton } from '../../../basic/IconButton' -import { type ProviderProps } from '../ContentComponentsTypes' -import '../ContentComponents.scss' -import { RenderImage } from './RenderImage' import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward' import { Trans } from 'react-i18next' +import { IconButton } from '../../../basic/IconButton' import { Typography } from '../../../basic/Typography' +import { type ProviderProps } from '../ContentComponentsTypes' +import { RenderImage } from './RenderImage' +import '../ContentComponents.scss' export const ImageTextSideBySide = ({ provider, diff --git a/src/components/content/DemoComponents/components/RenderImage.tsx b/src/components/content/DemoComponents/components/RenderImage.tsx index 9baf26d4..100d1966 100644 --- a/src/components/content/DemoComponents/components/RenderImage.tsx +++ b/src/components/content/DemoComponents/components/RenderImage.tsx @@ -18,8 +18,8 @@ ********************************************************************************/ import { useMediaQuery } from '@mui/material' -import '../ContentComponents.scss' import { ImageItem } from '../../../basic/ImageGallery/ImageItem' +import '../ContentComponents.scss' export const RenderImage = ({ url, diff --git a/src/components/content/DemoComponents/components/TitleDescriptionAndSectionlink.tsx b/src/components/content/DemoComponents/components/TitleDescriptionAndSectionlink.tsx index 40d0efd4..09ad30e3 100644 --- a/src/components/content/DemoComponents/components/TitleDescriptionAndSectionlink.tsx +++ b/src/components/content/DemoComponents/components/TitleDescriptionAndSectionlink.tsx @@ -17,15 +17,15 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import '../ContentComponents.scss' import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward' import { Trans } from 'react-i18next' +import { IconButton } from '../../../basic/IconButton' +import { Typography } from '../../../basic/Typography' import { type ProviderProps, type SubSectionsType, } from '../ContentComponentsTypes' -import { Typography } from '../../../basic/Typography' -import { IconButton } from '../../../basic/IconButton' +import '../ContentComponents.scss' export const TitleDescriptionAndSectionlink = ({ scrollTop, diff --git a/src/components/content/DemoComponents/index.tsx b/src/components/content/DemoComponents/index.tsx index 1de0c9b8..ab25d4f0 100644 --- a/src/components/content/DemoComponents/index.tsx +++ b/src/components/content/DemoComponents/index.tsx @@ -17,11 +17,11 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import { type ProviderProps, TemplateNames } from './ContentComponentsTypes' -import './ContentComponents.scss' -import { useState } from 'react' import { useMediaQuery, useTheme } from '@mui/material' +import { useState } from 'react' import { CardGrid } from './CardGrid' +import { ImageTextCenterAligned } from './components/ImageTextCenterAligned' +import { type ProviderProps, TemplateNames } from './ContentComponentsTypes' import { FlexImages } from './FlexImages' import { GridImages } from './GridImages' import { LinkButtonGrid } from './LinkButtonGrid' @@ -32,7 +32,7 @@ import { TextImageSideBySide } from './TextImageSideBySide' import { TextImageSideBySideWithSections } from './TextImageSideBySideWithSections' import { TextVideoSideBySide } from './TextVideoSideBySide' import { VideoTextSideBySide } from './VideoTextSideBySide' -import { ImageTextCenterAligned } from './components/ImageTextCenterAligned' +import './ContentComponents.scss' const TemplateConfig = ({ provider, diff --git a/src/components/content/Navigation/NavItem.tsx b/src/components/content/Navigation/NavItem.tsx index 985690e6..abb82225 100644 --- a/src/components/content/Navigation/NavItem.tsx +++ b/src/components/content/Navigation/NavItem.tsx @@ -19,8 +19,8 @@ ********************************************************************************/ import { Box, Link, useTheme } from '@mui/material' -import { useState } from 'react' import classNames from 'classnames' +import { useState } from 'react' import { Menu } from '../../basic/Menu' import { type MenuItemProps } from '../../basic/Menu/MenuItem' diff --git a/src/components/content/Navigation/Navigation.stories.tsx b/src/components/content/Navigation/Navigation.stories.tsx index 845df85d..2e599cc0 100644 --- a/src/components/content/Navigation/Navigation.stories.tsx +++ b/src/components/content/Navigation/Navigation.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { Navigation as Component } from '.' export default { diff --git a/src/components/content/UserMenu/UserMenu.stories.tsx b/src/components/content/UserMenu/UserMenu.stories.tsx index 35cd7900..0538b791 100644 --- a/src/components/content/UserMenu/UserMenu.stories.tsx +++ b/src/components/content/UserMenu/UserMenu.stories.tsx @@ -19,10 +19,9 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - -import { UserMenu as Component } from '.' import { LanguageSwitch } from '../../basic/LanguageSwitch' import { UserNav } from '../UserNav' +import { UserMenu as Component } from '.' export default { title: 'UserMenu', diff --git a/src/components/content/UserMenu/index.tsx b/src/components/content/UserMenu/index.tsx index b1df9f24..8a26968f 100644 --- a/src/components/content/UserMenu/index.tsx +++ b/src/components/content/UserMenu/index.tsx @@ -19,9 +19,9 @@ ********************************************************************************/ import { Box, ClickAwayListener, useTheme } from '@mui/material' -import { Typography } from '../../basic/Typography' import { type Theme } from '@mui/material/styles' import { type SxProps } from '@mui/system' +import { Typography } from '../../basic/Typography' interface UserMenuProps { open: boolean diff --git a/src/components/content/UserNav/UserNav.stories.tsx b/src/components/content/UserNav/UserNav.stories.tsx index 2776fa5e..b89e4458 100644 --- a/src/components/content/UserNav/UserNav.stories.tsx +++ b/src/components/content/UserNav/UserNav.stories.tsx @@ -19,7 +19,6 @@ ********************************************************************************/ import { type ComponentStory } from '@storybook/react' - import { UserNav as Component } from '.' export default { diff --git a/src/test/testUtils.tsx b/src/test/testUtils.tsx index cfcd4f78..e8dd67a9 100644 --- a/src/test/testUtils.tsx +++ b/src/test/testUtils.tsx @@ -17,13 +17,13 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -import React, { type ReactElement } from 'react' -import { SharedThemeProvider } from '../components' import { render as rtlRender, type RenderOptions, type RenderResult, } from '@testing-library/react' +import React, { type ReactElement } from 'react' +import { SharedThemeProvider } from '../components' const AllTheProviders = ({ children }: { children: React.ReactNode }) => { return {children} diff --git a/src/theme.ts b/src/theme.ts index 75e7d34f..1cbf234c 100644 --- a/src/theme.ts +++ b/src/theme.ts @@ -20,7 +20,6 @@ import { createTheme } from '@mui/material/styles' // Needs to use like this to overwrite data grid styles // https://mui.com/components/data-grid/getting-started/#typescript - import type {} from '@mui/x-data-grid/themeAugmentation' import createPalette from '@mui/material/styles/createPalette' import createTypography from '@mui/material/styles/createTypography' diff --git a/yarn.lock b/yarn.lock index eb357974..1a9b6958 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7366,10 +7366,10 @@ possible-typed-array-names@^1.0.0: resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== -postcss@^8.4.41: - version "8.4.41" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681" - integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ== +postcss@^8.4.43: + version "8.4.45" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.45.tgz#538d13d89a16ef71edbf75d895284ae06b79e603" + integrity sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q== dependencies: nanoid "^3.3.7" picocolors "^1.0.1" @@ -8826,12 +8826,12 @@ vite-plugin-lib-inject-css@^2.0.0: picocolors "^1.0.0" vite@^5.2.0: - version "5.4.2" - resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.2.tgz#8acb6ec4bfab823cdfc1cb2d6c53ed311bc4e47e" - integrity sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA== + version "5.4.3" + resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.3.tgz#771c470e808cb6732f204e1ee96c2ed65b97a0eb" + integrity sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q== dependencies: esbuild "^0.21.3" - postcss "^8.4.41" + postcss "^8.4.43" rollup "^4.20.0" optionalDependencies: fsevents "~2.3.3"