Skip to content

Commit

Permalink
feat(common): V2 folder for every common component new
Browse files Browse the repository at this point in the history
 - Park every new component in a v2 folder to keep it clean
  • Loading branch information
xtiannyeto committed Oct 16, 2024
1 parent d3e2538 commit d6fe089
Show file tree
Hide file tree
Showing 65 changed files with 245 additions and 92 deletions.
2 changes: 1 addition & 1 deletion frontend/src/features/auth/hooks/use-auth.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useApolloClient } from '@apollo/client'
import { User } from '@common/utils/user.ts'
import { User } from '@features/v2/common/types/user.ts'
import { jwtDecode } from 'jwt-decode'
import { useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useDelay } from '@common/hooks/use-delay'
import { useDelay } from '@features/v2/common/hooks/use-delay'
import { TextInput } from '@mtes-mct/monitor-ui'
import React, { useState } from 'react'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import MissionTimelineItemWrapper from '@common/components/layout/mission-timeline-item-wrapper'
import MissionTimelineCardWrapper from '@common/components/layout/v2/mission-timeline-item-card-wrapper'
import { MissionTimelineStatusColorTag } from '@common/components/ui/v2/mission-timeline-status-tag-color'
import { Action } from '@common/types/action-types'
import { MissionStatusEnum } from '@common/types/mission-types.ts'
import { ModuleType } from '@common/types/module-type'
import { useUlamActionRegistry } from '@features/ulam/hooks/use-ulam-action-registry'
import MissionTimelineCardWrapper from '@features/v2/common/components/layout/mission-timeline-item-card-wrapper'
import MissionTimelineItemWrapper from '@features/v2/common/components/layout/mission-timeline-item-wrapper'
import { MissionTimelineStatusColorTag } from '@features/v2/common/components/ui/mission-timeline-status-tag-color'
import { ModuleType } from '@features/v2/common/types/module-type'
import { FC } from 'react'
import { useNavigate, useParams } from 'react-router-dom'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import MissionTimelineEmpty from '@common/components/ui/v2/mission-timeline-empty'
import MissionTimelineError from '@common/components/ui/v2/mission-timeline-error'
import MissionTimelineLoader from '@common/components/ui/v2/mission-timeline-loader'
import { useDate } from '@common/hooks/use-date'
import { useGetMissionTimelineQuery } from '@common/services/use-mission-timeline'
import { Action } from '@common/types/action-types'
import MissionTimelineEmpty from '@features/v2/common/components/ui/mission-timeline-empty'
import MissionTimelineError from '@features/v2/common/components/ui/mission-timeline-error'
import MissionTimelineLoader from '@features/v2/common/components/ui/mission-timeline-loader'
import { useDate } from '@features/v2/common/hooks/use-date'
import { useGetMissionTimelineQuery } from '@features/v2/common/services/use-mission-timeline'
import { THEME } from '@mtes-mct/monitor-ui'
import { find } from 'lodash'
import { FC, Fragment } from 'react'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ActionRegistryItem, useActionRegistry } from '@common/hooks/use-action-registry'
import { ActionTypeEnum } from '@common/types/env-mission-types'
import { ActionRegistryItem, useActionRegistry } from '@features/v2/common/hooks/use-action-registry'

type UlamActionRegistry = {
[key in ActionTypeEnum]?: ActionRegistryItem
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { MissionStatusEnum } from '@common/types/mission-types.ts'
import { render, screen } from '../../../../../..//test-utils.tsx'
import MissionStatusTag from '../mission-status-tag'
import { render, screen } from '../../../../../../test-utils.tsx'
import MissionStatusTag from '../mission-status-tag.tsx'

describe('MissionStatusTag component', () => {
test('renders "indisponible" when status is undefined', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useMissionCompletenessForStats } from '@common/hooks/use-mission-completeness-for-stats.tsx'
import { CompletenessForStatsStatusEnum, MissionStatusEnum } from '@common/types/mission-types.ts'
import { useMissionCompletenessForStats } from '@features/v2/common/hooks/use-mission-completeness-for-stats.tsx'
import { createElement } from 'react'
import { Stack } from 'rsuite'
import Text from '../../../../common/components/ui/text.tsx'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useActionRegistry } from '@common/hooks/use-action-registry.tsx'
import { useDate } from '@common/hooks/use-date.tsx'
import { ActionTypeEnum } from '@common/types/env-mission-types.ts'
import { CompletenessForStatsStatusEnum, MissionStatusEnum } from '@common/types/mission-types.ts'
import { ModuleType } from '@common/types/module-type.ts'
import { useActionRegistry } from '@features/v2/common/hooks/use-action-registry.tsx'
import { useDate } from '@features/v2/common/hooks/use-date.tsx'
import { ModuleType } from '@features/v2/common/types/module-type.ts'
import { IconProps, THEME } from '@mtes-mct/monitor-ui'
import { createElement, FC } from 'react'
import { Stack } from 'rsuite'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useMissionCompletenessForStats } from '@common/hooks/use-mission-completeness-for-stats.tsx'
import { CompletenessForStatsStatusEnum, MissionStatusEnum } from '@common/types/mission-types.ts'
import { useMissionCompletenessForStats } from '@features/v2/common/hooks/use-mission-completeness-for-stats.tsx'
import { Tag, THEME } from '@mtes-mct/monitor-ui'
import { FC } from 'react'
import Text from '../../ui/text.tsx'
import Text from '../../../../common/components/ui/text.tsx'

interface MissionStatusTagProps {
missionStatus?: MissionStatusEnum
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useMissionTag } from '@common/hooks/use-mission-tag.tsx'
import { MissionSourceEnum } from '@common/types/env-mission-types.ts'
import { useMissionTag } from '@features/v2/common/hooks/use-mission-tag'
import { Tag } from '@mtes-mct/monitor-ui'
import React from 'react'
import Text from '../../ui/text'
import Text from '../../../../common/components/ui/text'

interface MissionSourceTagProps {
isFake?: boolean
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useMissionStatus } from '@common/hooks/use-mission-status'
import { MissionStatusEnum } from '@common/types/mission-types.ts'
import { useMissionStatus } from '@features/v2/common/hooks/use-mission-status'
import { Tag, THEME } from '@mtes-mct/monitor-ui'
import { FC } from 'react'
import Text from '../../ui/text'
import Text from '../../../../common/components/ui/text'

interface MissionStatusTagProps {
status?: MissionStatusEnum
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ModuleType } from '@common/types/module-type'
import { ModuleType } from '@features/v2/common/types/module-type'
import { useNavigate } from 'react-router-dom'
import { Stack } from 'rsuite'
import MissionTimelineAddAction from './mission-timeline-add-action'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { useMissionTimeline } from '@common/hooks/use-mission-timeline'
import { useAddOrUpdateActionMutation } from '@common/services/use-add-action'
import { ActionTypeEnum } from '@common/types/env-mission-types'
import { VesselTypeEnum } from '@common/types/mission-types'
import { ModuleType } from '@common/types/module-type'
import ControlSelection from '@features/pam/mission/components/elements/controls/control-selection'
import useAddOrUpdateControl from '@features/pam/mission/hooks/use-add-update-action-control'
import { useMissionTimeline } from '@features/v2/common/hooks/use-mission-timeline'
import { useAddOrUpdateActionMutation } from '@features/v2/common/services/use-add-action'
import { ModuleType } from '@features/v2/common/types/module-type'
import { Accent, Button, Dialog } from '@mtes-mct/monitor-ui'
import { useState } from 'react'
import { Stack } from 'rsuite'
import ActionDropdownWrapper from '../../ui/action-dropdown-wrapper'
import Text from '../../ui/text'
import Text from '../../../../common/components/ui/text'
import useAddOrUpdateControlMutation from '../../services/use-add-update-action-control'
import MissionActionDropdownWrapper from '../ui/mission-action-dropdown-wrapper'
import MissionControlSelection from '../ui/mission-control-selection'

type MissionTimelineAddActionProps = {
missionId?: string
Expand All @@ -18,7 +18,7 @@ type MissionTimelineAddActionProps = {
}

function MissionTimelineAddAction({ missionId, onSumbit, moduleType }: MissionTimelineAddActionProps): JSX.Element {
const [addControl] = useAddOrUpdateControl()
const [addControl] = useAddOrUpdateControlMutation()
const [addOrUpdateAction] = useAddOrUpdateActionMutation()
const [showModal, setShowModal] = useState<boolean>(false)
const { getBaseInput, getActionDataInput } = useMissionTimeline(missionId)
Expand Down Expand Up @@ -56,13 +56,13 @@ function MissionTimelineAddAction({ missionId, onSumbit, moduleType }: MissionTi
</Text>
</Stack.Item>
<Stack.Item>
<ActionDropdownWrapper moduleType={moduleType} onSelect={handleSelect} />
<MissionActionDropdownWrapper moduleType={moduleType} onSelect={handleSelect} />
</Stack.Item>
{showModal && (
<Dialog>
<Dialog.Title>Ajouter des contrôles</Dialog.Title>
<Dialog.Body>
<ControlSelection onSelect={handleAddControl} />
<MissionControlSelection onSelect={handleAddControl} />
</Dialog.Body>
<Dialog.Action style={{ justifyContent: 'flex-end', paddingRight: '1.5rem' }}>
<Button accent={Accent.SECONDARY} onClick={() => setShowModal(false)}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useMissionTimeline } from '@common/hooks/use-mission-timeline'
import { ActionStatusType } from '@common/types/action-types.ts'
import { getColorForStatus, mapStatusToText } from '@common/utils/status-utils'
import useAddOrUpdateStatus from '@features/pam/mission/hooks/use-add-update-status'
import { useMissionTimeline } from '@features/v2/common/hooks/use-mission-timeline'
import { Dropdown, Icon } from '@mtes-mct/monitor-ui'
import { FC } from 'react'
import { Stack } from 'rsuite'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ActionStyle } from '@common/hooks/use-action-registry'
import { ActionStyle } from '@features/v2/common/hooks/use-action-registry'
import { THEME } from '@mtes-mct/monitor-ui'
import { DetailedHTMLProps, FC } from 'react'
import { useParams } from 'react-router-dom'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { MissionTimelineStatusColorTag } from '@common/components/ui/v2/mission-timeline-status-tag-color'
import { useActionStatus } from '@common/hooks/use-action-status'
import { ActionStatusType } from '@common/types/action-types'
import { ActionTypeEnum } from '@common/types/env-mission-types'
import { CompletenessForStats, CompletenessForStatsStatusEnum } from '@common/types/mission-types'
import { MissionTimelineStatusColorTag } from '@features/v2/common/components/ui/mission-timeline-status-tag-color'
import { useActionStatus } from '@features/v2/common/hooks/use-action-status'
import { Accent, Icon, IconButton, THEME } from '@mtes-mct/monitor-ui'

type MissionTimelineItemStatusProps = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Accent, Button, Icon, Size, THEME } from '@mtes-mct/monitor-ui'
import { Stack } from 'rsuite'
import styled from 'styled-components'
import Text from '../../ui/text'
import Text from '../../../../common/components/ui/text'

const StyledFooter = styled.div`
height: 60px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useMissionCompletenessForStats } from '@common/hooks/use-mission-completeness-for-stats.tsx'
import { useMissionCompletenessForStats } from '@features/v2/common/hooks/use-mission-completeness-for-stats.tsx'
import { Banner } from '@mtes-mct/monitor-ui'
import React from 'react'
import { CompletenessForStats, CompletenessForStatsStatusEnum } from '../../../types/mission-types.ts'
import { CompletenessForStats, CompletenessForStatsStatusEnum } from '../../../../common/types/mission-types.ts'

interface MissionPageHeaderBannerProps {
completenessForStats?: CompletenessForStats
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import MissionCompletenessForStatsTag from '@common/components/elements/v2/mission-completeness-for-stats-tag.tsx'
import MissionSourceTag from '@common/components/elements/v2/mission-source-tag.tsx'
import MissionStatusTag from '@common/components/elements/v2/mission-status-tag.tsx'
import { useDate } from '@common/hooks/use-date.tsx'
import { CompletenessForStatsStatusEnum, Mission, MissionStatusEnum } from '@common/types/mission-types.ts'
import MissionCompletenessForStatsTag from '@features/v2/common/components/elements/mission-completeness-for-stats-tag.tsx'
import MissionSourceTag from '@features/v2/common/components/elements/mission-source-tag.tsx'
import MissionStatusTag from '@features/v2/common/components/elements/mission-status-tag.tsx'
import { useDate } from '@features/v2/common/hooks/use-date.tsx'
import { Accent, Button, Icon, IconButton, Size, TagGroup, THEME } from '@mtes-mct/monitor-ui'
import GearIcon from '@rsuite/icons/Gear'
import React from 'react'
import { FlexboxGrid, Stack } from 'rsuite'
import styled from 'styled-components'
import Text from '../../ui/text.tsx'
import Text from '../../../../common/components/ui/text.tsx'
import MissionPageHeaderBanner from './mission-page-header-banner.tsx'

const StyledHeader = styled.div`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import MissionPageError from '@common/components/ui/v2/mission-page-error'
import MissionPageLoading from '@common/components/ui/v2/mission-page-loading'
import MissionPageError from '@features/v2/common/components/ui/mission-page-error'
import MissionPageLoading from '@features/v2/common/components/ui/mission-page-loading'
import { THEME } from '@mtes-mct/monitor-ui'
import React from 'react'
import { FlexboxGrid } from 'rsuite'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ActionStyle } from '@common/hooks/use-action-registry.tsx'
import { ActionStyle } from '@features/v2/common/hooks/use-action-registry'
import { IconProps, THEME } from '@mtes-mct/monitor-ui'
import React, { createElement, DetailedHTMLProps, FunctionComponent } from 'react'
import { FlexboxGrid, Stack } from 'rsuite'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import MissionTimelineItemDate from '@common/components/ui/v2/mission-timeline-item-date'
import { Action } from '@common/types/action-types'
import MissionTimelineItemDate from '@features/v2/common/components/ui/mission-timeline-item-date'
import { FC } from 'react'
import { Stack } from 'rsuite'
import MissionTimelineItemStatus from '../elements/v2/mission-timeline-item-status'
import MissionTimelineItemStatus from '../elements/mission-timeline-item-status'

interface MissionTimelineItemWrapperProps {
action: Action
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useActionRegistry } from '@common/hooks/use-action-registry'
import { useModuleRegistry } from '@common/hooks/use-module-registry'
import { ActionTypeEnum } from '@common/types/env-mission-types.ts'
import { ModuleType } from '@common/types/module-type'
import { useActionRegistry } from '@features/v2/common/hooks/use-action-registry'
import { useModuleRegistry } from '@features/v2/common/hooks/use-module-registry'
import { ModuleType } from '@features/v2/common/types/module-type'
import { Dropdown, Icon, THEME } from '@mtes-mct/monitor-ui'
import { FC, useState } from 'react'
import styled from 'styled-components'
Expand Down Expand Up @@ -33,12 +33,12 @@ const DropdownSubItem: FC<{ type: ActionTypeEnum }> = ({ type }) => {
)
}

interface ActionDropdownWrapperProps {
interface MissionActionDropdownWrapperProps {
moduleType: ModuleType
onSelect: (key: ActionTypeEnum) => void
}

const ActionDropdownWrapper: FC<ActionDropdownWrapperProps> = ({ onSelect, moduleType }) => {
const MissionActionDropdownWrapper: FC<MissionActionDropdownWrapperProps> = ({ onSelect, moduleType }) => {
const { timelineDropdownItems } = useModuleRegistry(moduleType)
const [currentKey, setCurrentKey] = useState<ActionTypeEnum>()

Expand Down Expand Up @@ -66,4 +66,4 @@ const ActionDropdownWrapper: FC<ActionDropdownWrapperProps> = ({ onSelect, modul
)
}

export default ActionDropdownWrapper
export default MissionActionDropdownWrapper
Loading

0 comments on commit d6fe089

Please sign in to comment.