rename app (#330)

Author: craigrbarnes

packages/frontend/src/features/CohortDistance/cohortDistanceApi.ts

@@ -11,12 +11,12 @@ import {
 } from '@mantine/core';
 import { FaChartPie as SummaryChartIcon } from 'react-icons/fa';
 import { Charts } from '../../components/charts';
-import { CohortDistanceConfig } from './types';
+import { CohortSimilarityConfig } from './types';
 import ComparisonCards from './ComparisonCards';
 import { ErrorCard } from '../../components/MessageCards';
-import { getStaticDistanceData } from './statistics/data/data';
+import { getStaticSimilarityData } from './statistics/data/data';
 import { AggregationsData, useGeneralGQLQuery } from '@gen3/core';
-import { createDistanceQuery } from './statistics/queries';
+import { createSimilarityQuery } from './statistics/queries';
 import {
   processHistogramResponseAsPercentage,
   normalizeAgeOfIndex,
@@ -31,10 +31,10 @@ const SummaryChartAccordionControl = (props: AccordionControlProps) => {
   );
 };
 
-const CohortDistanceApp = (config: CohortDistanceConfig) => {
-  const groundDataset = getStaticDistanceData(config.datasets.ground.dataset);
+const CohortSimilarityApp = (config: CohortSimilarityConfig) => {
+  const groundDataset = getStaticSimilarityData(config.datasets.ground.dataset);
 
-  const gqlQuery = createDistanceQuery(); // TODO: add field mapping
+  const gqlQuery = createSimilarityQuery(); // TODO: add field mapping
 
   const {
     data: rawComparisonDataset,
@@ -58,7 +58,7 @@ const CohortDistanceApp = (config: CohortDistanceConfig) => {
 
   if (isComparisonError) {
     return (
-      <ErrorCard message={'Unable to get data need for Cohort Distance'} />
+      <ErrorCard message={'Unable to get data need for Cohort Similarity'} />
     );
   }
 
@@ -69,10 +69,10 @@ const CohortDistanceApp = (config: CohortDistanceConfig) => {
   return (
     <Stack
       classNames={{ root: 'w-full m-4 mb-2' }}
-      aria-label="Main Content of Cohort Distance App"
+      aria-label="Main Content of Cohort Similarity App"
     >
       <Title order={1} size="h3">
-        Cohort Distance Visualization
+        Cohort Similarity Visualization
       </Title>
       <Accordion variant="filled" chevronPosition="left">
         <Accordion.Item value="summaryCharts" aria-label="Summary Charts">
@@ -110,4 +110,4 @@ const CohortDistanceApp = (config: CohortDistanceConfig) => {
   );
 };
 
-export default CohortDistanceApp;
+export default CohortSimilarityApp;

…res/CohortDistance/CohortDistanceApp.tsx …CohortSimilarity/CohortSimilarityApp.tsxpackages/frontend/src/features/CohortDistance/CohortDistanceApp.tsx renamed to packages/frontend/src/features/CohortSimilarity/CohortSimilarityApp.tsx packages/frontend/src/features/CohortDistance/CohortDistanceApp.tsx renamed to packages/frontend/src/features/CohortSimilarity/CohortSimilarityApp.tsx

@@ -1,13 +1,13 @@
 import React, { useState } from 'react';
-import { DistanceChart } from './types';
+import { SimilarityChart } from './types';
 import { AggregationsData, fieldNameToTitle } from '@gen3/core';
 import { generateChart } from './charts/ChartCard';
 import { Card, Group, SegmentedControl, Text } from '@mantine/core';
 import StatisticsCard from './statistics/StatisticsCard';
 
 interface ComparisonChartProps {
   style?: string;
-  config: DistanceChart;
+  config: SimilarityChart;
   groundData: AggregationsData;
   groundLabel: string;
   comparisonData: AggregationsData;
@@ -40,7 +40,7 @@ const ComparisonChart: React.FC<ComparisonChartProps> = ({
 };
 
 interface ComparisonCardProps {
-  config: DistanceChart;
+  config: SimilarityChart;
   groundData: AggregationsData;
   groundLabel: string;
   comparisonData: AggregationsData;

…tures/CohortDistance/ComnparisonCard.tsx …res/CohortSimilarity/ComnparisonCard.tsxpackages/frontend/src/features/CohortDistance/ComnparisonCard.tsx renamed to packages/frontend/src/features/CohortSimilarity/ComnparisonCard.tsx packages/frontend/src/features/CohortDistance/ComnparisonCard.tsx renamed to packages/frontend/src/features/CohortSimilarity/ComnparisonCard.tsx

@@ -1,17 +1,16 @@
 import React from 'react';
 import { Grid } from '@mantine/core';
 import { AggregationsData } from '@gen3/core';
-import { DistanceChart, GroundWithComparisonDatasets } from './types';
+import { SimilarityChart } from './types';
 import { computeRowSpan } from '../../components/charts';
 import ComparisonCard from './ComnparisonCard';
-import comparisonCharts from './charts/ComparisonCharts';
 
 interface ComparisonCardssProps {
   ground: AggregationsData;
   groundLabel: string;
   comparison: AggregationsData;
   comparisonLabel: string;
-  comparisonChartsConfig: Record<string, DistanceChart>;
+  comparisonChartsConfig: Record<string, SimilarityChart>;
   numberOfColumns?: number;
   style?: 'tile' | 'box';
 }

…tures/CohortDistance/ComparisonCards.tsx …res/CohortSimilarity/ComparisonCards.tsxpackages/frontend/src/features/CohortDistance/ComparisonCards.tsx renamed to packages/frontend/src/features/CohortSimilarity/ComparisonCards.tsx packages/frontend/src/features/CohortDistance/ComparisonCards.tsx renamed to packages/frontend/src/features/CohortSimilarity/ComparisonCards.tsx

@@ -1,7 +1,7 @@
 import { createAppApiForRTKQ } from '@gen3/core';
 
 export const {
-  appApi: cohortDistanceApi,
+  appApi: cohortSimilarityApi,
   appStore,
   appContext,
-} = createAppApiForRTKQ('cohortDistance');
+} = createAppApiForRTKQ('cohortSimilarity');

…nd/src/features/CohortDistance/appApi.ts …/src/features/CohortSimilarity/appApi.tspackages/frontend/src/features/CohortDistance/appApi.ts renamed to packages/frontend/src/features/CohortSimilarity/appApi.ts packages/frontend/src/features/CohortDistance/appApi.ts renamed to packages/frontend/src/features/CohortSimilarity/appApi.ts

@@ -1,20 +1,20 @@
 import { Card, Group, Text, SegmentedControl } from '@mantine/core';
 import React, { useState, ReactNode } from 'react';
-import { DistanceChart } from '../types';
+import { SimilarityChart } from '../types';
 import { AggregationsData, fieldNameToTitle } from '@gen3/core';
-import CohortDistanceChartsFactory, {
+import CohortSimilarityChartsFactory, {
   DefaultComparisonChart,
-} from './cohortDistanceChartsFactory';
+} from './cohortSimilarityChartsFactory';
 
-CohortDistanceChartsFactory();
+CohortSimilarityChartsFactory();
 
 export const generateChart = (
   groundData: AggregationsData,
   groundLabel: string,
   comparisonData: AggregationsData,
   comparisonLabel: string,
   field: string,
-  config: DistanceChart,
+  config: SimilarityChart,
   showTitle: boolean = true,
 ): ReactNode => {
   // Check if the field exists in the datasets
@@ -23,7 +23,7 @@ export const generateChart = (
     return <span>Error: Data field missing</span>;
   }
 
-  const chartRenderer = CohortDistanceChartsFactory().getRenderer(
+  const chartRenderer = CohortSimilarityChartsFactory().getRenderer(
     'comparison',
     config.chartType,
   );
@@ -44,7 +44,7 @@ export const generateChart = (
 
 interface ChartCardProps {
   style?: string;
-  config: DistanceChart;
+  config: SimilarityChart;
   groundData: AggregationsData;
   groundLabel: string;
   comparisonData: AggregationsData;

…/CohortDistance/charts/BarComparison.tsx …ohortSimilarity/charts/BarComparison.tsxpackages/frontend/src/features/CohortDistance/charts/BarComparison.tsx renamed to packages/frontend/src/features/CohortSimilarity/charts/BarComparison.tsx packages/frontend/src/features/CohortDistance/charts/BarComparison.tsx renamed to packages/frontend/src/features/CohortSimilarity/charts/BarComparison.tsx

@@ -1,14 +1,14 @@
 import React from 'react';
 import { Grid } from '@mantine/core';
 import { AggregationsData } from '@gen3/core';
-import { DistanceChart, GroundWithComparisonDatasets } from '../types';
+import { SimilarityChart, GroundWithComparisonDatasets } from '../types';
 import { computeRowSpan } from '../../../components/charts';
 import ChartCard from './ChartCard';
 
 interface ComparisonChartsProps {
   data: Record<string, AggregationsData>;
   datasets: GroundWithComparisonDatasets;
-  comparisonChartsConfig: Record<string, DistanceChart>;
+  comparisonChartsConfig: Record<string, SimilarityChart>;
   numColumns?: number;
   style?: 'tile' | 'box';
 }

…ures/CohortDistance/charts/ChartCard.tsx …es/CohortSimilarity/charts/ChartCard.tsxpackages/frontend/src/features/CohortDistance/charts/ChartCard.tsx renamed to packages/frontend/src/features/CohortSimilarity/charts/ChartCard.tsx packages/frontend/src/features/CohortDistance/charts/ChartCard.tsx renamed to packages/frontend/src/features/CohortSimilarity/charts/ChartCard.tsx

@@ -18,7 +18,7 @@ const DefaultRendererCatalog = {
   },
 };
 
-const CohortDistanceChartsFactory =
+const CohortSimilarityChartsFactory =
   (): RenderFactoryTypedInstance<ComparisonChartProps> => {
     if (!instance) {
       instance = new RenderFactoryTypedInstance<ComparisonChartProps>();
@@ -27,4 +27,4 @@ const CohortDistanceChartsFactory =
     return instance;
   };
 
-export default CohortDistanceChartsFactory;
+export default CohortSimilarityChartsFactory;