From da06cfd374b27e8e5de6ffa73dbf77e9617484e7 Mon Sep 17 00:00:00 2001 From: Thomas Heartman Date: Thu, 23 Nov 2023 14:50:50 +0100 Subject: [PATCH] feat: impl 1 --- .../SegmentDeleteUsedSegment.tsx | 227 ++++++------------ .../sort-strategies.test.ts | 5 +- .../useStrategiesBySegment.ts | 6 +- 3 files changed, 85 insertions(+), 153 deletions(-) diff --git a/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/SegmentDeleteUsedSegment.tsx b/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/SegmentDeleteUsedSegment.tsx index 2dda636189..1f407d2222 100644 --- a/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/SegmentDeleteUsedSegment.tsx +++ b/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/SegmentDeleteUsedSegment.tsx @@ -7,8 +7,11 @@ import { formatStrategyName } from 'utils/strategyNames'; import { styled } from '@mui/material'; import { ChangeRequestInfo, + ChangeRequestNewStrategy, ChangeRequestStrategy, + ChangeRequestUpdatedStrategy, } from 'hooks/api/getters/useStrategiesBySegment/useStrategiesBySegment'; +import { sortStrategiesByFeature } from './sort-strategies'; const StyledUl = styled('ul')({ marginBottom: 0, @@ -42,109 +45,11 @@ export const SegmentDeleteUsedSegment = ({ strategies, changeRequestStrategies, }: ISegmentDeleteUsedSegmentProps) => { - // three kinds: - // 1. strategies without crs - // 2. crs without strategies - // 3. strategies with crs - - // create a layered dictionary: - // { featureName: { existingStrategies: { ...strategy, changeRequests: [crs] }, newStrategies: [crs] } - const flagDict: { - [key: string]: { - existingStrategies: { - [key: string]: - | { - strategy?: IFeatureStrategy; - changeRequests: ChangeRequestInfo[]; - } - | { - strategy: IFeatureStrategy; - changeRequests?: ChangeRequestInfo[]; - }; - }; - newStrategies: ChangeRequestStrategy[]; - }; - } = Object.fromEntries( - (strategies ?? []).map((strategy) => [ - strategy.featureName!, - { - existingStrategies: { - [strategy.id]: { - strategy: strategy, - }, - }, - newStrategies: [], - }, - ]), + const sortedStrategies = sortStrategiesByFeature( + strategies ?? [], + changeRequestStrategies ?? [], ); - for (const crStrategy of changeRequestStrategies ?? []) { - const { featureName } = crStrategy; - - const isExistingStrategy = 'id' in crStrategy; - - if (isExistingStrategy) { - const { id } = crStrategy; - const existingEntry = flagDict[featureName]?.existingStrategies[id]; - - if (existingEntry) { - existingEntry.changeRequests = crStrategy.changeRequests; - } else { - if (!flagDict[featureName]) { - flagDict[featureName] = { - existingStrategies: { - [id]: { - changeRequests: crStrategy.changeRequests, - }, - }, - newStrategies: [], - }; - } else { - flagDict[featureName].existingStrategies[ - id - ].changeRequests = { - crStrategy.changeRequests, - }; - } - } - } - } - - console.log(JSON.stringify(flagDict, null, 2)); - - // group by flag name - const features = (strategies ?? []).reduce((acc, strategy) => { - if (!acc[strategy.featureName!]) { - acc[strategy.featureName!] = [strategy]; - } else { - acc[strategy.featureName!].push(strategy); - } - return acc; - }, {} as { [key: string]: IFeatureStrategy[] }); - - // can we turn strategies into strategies with optional CRs? Also, CR title? - const existingStrategies: { - [key: string]: IFeatureStrategy & { - changeRequests?: ChangeRequestInfo[]; - }; - } = Object.fromEntries((strategies ?? []).map((s) => [s.id, s])); - - const { existing, notListed } = (changeRequestStrategies ?? []).reduce( - (acc, strategy) => { - if ('id' in strategy && strategy.id in existingStrategies) { - existingStrategies[strategy.id].changeRequests = - strategy.changeRequests; - } else { - acc.notListed.push(strategy); - } - - return acc; - }, - { existing: [], notListed: [] }, - ); - - console.log(existing, notListed); - return ( {segment.name} segment for their strategies:

- {strategies?.map((strategy) => ( -
  • - - {strategy.featureName!}{' '} - {formatStrategyNameParens(strategy)} - -
    • - ))} - {changeRequestStrategies?.map((strategy, index) => ( -
  • - {strategy.featureName}{' '} - {formatStrategyNameParens(strategy)} - used in change - request(s): {formatChangeRequestLinks(strategy)} -
    • - ))} + {sortedStrategies.map((strategy, index) => + strategyListItem(strategy, index), + )}     ); @@ -196,31 +80,80 @@ const formatStrategyNameParens = (strategy: { return `(${formatStrategyName(strategy.strategyName)})`; }; -const formatChangeRequestLinks = ({ - projectId, - changeRequests, -}: ChangeRequestStrategy) => { - const makeLink = ({ id, title }: ChangeRequestInfo) => { +// const formatChangeRequestLinks = ({ projectId }: ChangeRequestStrategy) => { +// const makeLink = ({ id, title }: ChangeRequestInfo) => { +// const text = title ? `#${id} (${title})` : `#${id}`; +// return ( +// +// {text} +// +// ); +// }; +// if (changeRequests.length < 2) { +// return changeRequests.map(makeLink); +// } else { +// const sorted = [...changeRequests].sort((a, b) => a.id - b.id); + +// const last = sorted.at(-1)!; +// const first = sorted.slice(0, -1); + +// return `${first.map(makeLink).join(', ')} and ${makeLink(last)}`; +// } +// }; + +const strategyListItem = ( + strategy: + | IFeatureStrategy + | ChangeRequestUpdatedStrategy + | ChangeRequestNewStrategy, + index: number, +) => { + const isChangeRequest = ( + strategy: IFeatureStrategy | ChangeRequestStrategy, + ): strategy is ChangeRequestStrategy => 'changeRequest' in strategy; + + if (isChangeRequest(strategy)) { + const { id, title } = strategy.changeRequest; + const text = title ? `#${id} (${title})` : `#${id}`; return ( - - {text} - +
  • +

    + {strategy.featureName}{' '} + {formatStrategyNameParens(strategy) + + ' — in change request '} + + + {text} + +

    +
    • ); - }; - if (changeRequests.length < 2) { - return changeRequests.map(makeLink); } else { - const sorted = [...changeRequests].sort((a, b) => a.id - b.id); - - const last = sorted.at(-1)!; - const first = sorted.slice(0, -1); - - return `${first.map(makeLink).join(', ')} and ${makeLink(last)}`; + return ( +
  • + + {strategy.featureName!} {formatStrategyNameParens(strategy)} + +
    • + ); } }; diff --git a/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/sort-strategies.test.ts b/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/sort-strategies.test.ts index 3acb8b8821..c8b1be72ca 100644 --- a/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/sort-strategies.test.ts +++ b/frontend/src/component/segments/SegmentDelete/SegmentDeleteUsedSegment/sort-strategies.test.ts @@ -1,7 +1,4 @@ -import { - sortAndFlattenStrategies, - sortStrategiesByFeature, -} from './sort-strategies'; +import { sortStrategiesByFeature } from './sort-strategies'; describe('sorting strategies by feature', () => { test('strategies with the same id are sorted: existing first, then change requests', () => { diff --git a/frontend/src/hooks/api/getters/useStrategiesBySegment/useStrategiesBySegment.ts b/frontend/src/hooks/api/getters/useStrategiesBySegment/useStrategiesBySegment.ts index 6782aa137b..bfb9fa92aa 100644 --- a/frontend/src/hooks/api/getters/useStrategiesBySegment/useStrategiesBySegment.ts +++ b/frontend/src/hooks/api/getters/useStrategiesBySegment/useStrategiesBySegment.ts @@ -6,7 +6,7 @@ import { IFeatureStrategy } from 'interfaces/strategy'; import { useConditionalSWR } from '../useConditionalSWR/useConditionalSWR'; export type ChangeRequestInfo = { id: number; title: string | null }; -type ChangeRequestNewStrategy = { +export type ChangeRequestNewStrategy = { projectId: string; featureName: string; strategyName: string; @@ -14,7 +14,9 @@ type ChangeRequestNewStrategy = { changeRequest: ChangeRequestInfo; }; -type ChangeRequestUpdatedStrategy = ChangeRequestNewStrategy & { id: string }; +export type ChangeRequestUpdatedStrategy = ChangeRequestNewStrategy & { + id: string; +}; export type ChangeRequestStrategy = | ChangeRequestNewStrategy