merge from develop

Author: craigrbarnes

lerna.json

@@ -1,4 +1,4 @@
 {
   "packages": ["packages/*"],
-  "version": "0.10.79"
+  "version": "0.10.80"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@gen3/core",
-  "version": "0.10.79",
+  "version": "0.10.80",
   "author": "CTDS",
   "description": "Core module for Gen3.2. Packages provides an interface for interacting with the gen3 API and a redux store for managing state.",
   "license": "Apache-2.0",

packages/core/package.json

@@ -22,8 +22,13 @@ export interface Gen3FenceLoginProviders {
   readonly providers: Array<Gen3LoginProvider>;
 }
 
+interface PresignedUrlRequest {
+  readonly guid: string;
+  readonly what: string;
+}
+
 /**
- * Creates a fence API endpoint for handling login processes
+ * Creates a fence API endpoint for handling login/data processes
  * @param endpoints - defined endpoint query for logging in
  * @returns: The generated fence login API slice
  */
@@ -35,13 +40,21 @@ export const loginProvidersApi = gen3Api.injectEndpoints({
     getDownload: builder.query<Gen3FenceLoginProviders, string>({
       query: (guid) => `${GEN3_FENCE_API}/user/data/download/${guid}`,
     }),
+    getPresignedUrl: builder.query<
+      Gen3FenceLoginProviders,
+      PresignedUrlRequest
+    >({
+      query: ({ guid, what }) => `${GEN3_FENCE_API}/user/data/${what}/${guid}`,
+    }),
   }),
 });
 
 export const {
   useGetLoginProvidersQuery,
   useGetDownloadQuery,
   useLazyGetDownloadQuery,
+  useGetPresignedUrlQuery,
+  useLazyGetPresignedUrlQuery,
 } = loginProvidersApi;
 
 export interface FetchRequest {

packages/core/src/features/fence/fenceApi.ts

@@ -1,6 +1,6 @@
 {
   "name": "@gen3/frontend",
-  "version": "0.10.79",
+  "version": "0.10.80",
   "description": "Gen3 frontend components, content management, and pages",
   "keywords": [],
   "author": "Center for Translational Data Science",
@@ -49,7 +49,7 @@
     "os": false
   },
   "dependencies": {
-    "@gen3/core": "^0.10.79",
+    "@gen3/core": "^0.10.80",
     "@graphiql/react": "^0.23.1",
     "@hello-pangea/dnd": "^17.0.0",
     "@iconify/react": "^5.0.2",
@@ -88,7 +88,7 @@
     "mantine-react-table": "^2.0.0-beta.8",
     "mathjs": "^13.1.1",
     "minisearch": "^6.3.0",
-    "next": "^15.1.6",
+    "next": "^15.1.7",
     "next-compose-plugins": "^2.2.1",
     "next-images": "^1.8.5",
     "node-json-db": "^2.3.0",

packages/frontend/package.json

@@ -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;

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

@@ -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;