[DT-2772] Add Other Data Location option and update URL handling (#3289)

Author: kevinmarete

cypress/component/StudyAssets/consent_group_list.spec.tsx

@@ -5,14 +5,15 @@ import ConsentGroupList from 'src/components/consent_group_list/ConsentGroupList
 import ConsentGroupSummary from 'src/components/consent_group_list/ConsentGroupSummary'
 import ConsentGroupRow from 'src/components/consent_group_list/ConsentGroupRow'
 import {
-  testDeleteViaModal,
-  testViewModeFlow,
   testCloseViewMode,
+  testDeleteViaModal,
   testEditModeRender,
-  testViewModeRender,
-  testViewActionTrigger,
   testSummaryViewActionTrigger,
+  testViewActionTrigger,
+  testViewModeFlow,
+  testViewModeRender,
 } from './testUtils'
+import { DataLocationType } from 'src/pages/data_submission/v2/v2-models'
 
 const sampleConsentGroup: ConsentGroup2 = {
   consentGroupId: 'cg1',
@@ -22,7 +23,7 @@ const sampleConsentGroup: ConsentGroup2 = {
   generalResearchUse: true,
   irb: false,
   accessManagement: 'open',
-  dataLocation: 'Not Determined',
+  dataLocation: DataLocationType.NotDetermined,
 }
 
 const ConsentGroupListHarness: React.FC<{ initial: ConsentGroup2[] }> = ({ initial }) => {

package-lock.json

@@ -54,7 +54,7 @@
     "@types/react-dom": "18.3.1",
     "@types/react-modal": "3.16.3",
     "@vitejs/plugin-react": "5.1.2",
-    "cypress": "15.8.2",
+    "cypress": "15.9.0",
     "cypress-vite": "1.8.0",
     "eslint": "9.39.2",
     "eslint-plugin-cypress": "5.2.0",

package.json

@@ -7,6 +7,7 @@ import { AccessManagementType, ConsentGroup, ConsentGroup2, selectedPrimaryGroup
 import { DacPicker } from 'src/components/forms/DacPicker'
 import { FileInput } from 'src/components/forms/FileInput'
 import { DataSet } from 'src/libs/ajax/DataSet'
+import { DataLocationType } from 'src/pages/data_submission/v2/v2-models'
 
 interface ConsentGroupAddEditProps {
   readonly id: number
@@ -22,7 +23,6 @@ interface Validation {
   accessManagement?: ValidationError
   numberOfParticipants?: ValidationError
   dataAccessCommitteeId?: ValidationError
-  dataLocation?: ValidationError
   primaryConsent?: ValidationError
   gs?: ValidationError
   mor?: ValidationError
@@ -166,7 +166,6 @@ export default function ConsentGroupAddEdit(props: ConsentGroupAddEditProps): Re
     if (showOtherPrimaryText && (!cg.otherPrimary?.trim())) {
       v.otherPrimary = makeError('required')
     }
-    if (!cg.dataLocation?.trim()) v.dataLocation = makeError('required')
     if (showGSText && (!cg.gs?.trim())) {
       v.gs = makeError('required')
     }
@@ -585,7 +584,6 @@ export default function ConsentGroupAddEdit(props: ConsentGroupAddEditProps): Re
           {/* location */}
           <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between' }}>
             <FormFieldTitle
-              required={true}
               title="Data Location"
               description="Please provide the location of your data resource for this consent group"
               disabled={readOnly}
@@ -598,14 +596,14 @@ export default function ConsentGroupAddEdit(props: ConsentGroupAddEditProps): Re
               name="dataLocation"
               type={FormFieldTypes.SELECT}
               selectOptions={[
-                'AnVIL Workspace',
-                'Terra Workspace',
-                'TDR Location',
-                'Not Determined',
+                DataLocationType.AnVILWorkspace,
+                DataLocationType.TerraWorkspace,
+                DataLocationType.TDRLocation,
+                DataLocationType.NotDetermined,
+                DataLocationType.Other,
               ]}
               placeholder="Data Location(s)"
               defaultValue={current?.dataLocation}
-              validation={validation.dataLocation}
               onChange={({ key, value }: { key: string, value: string }) => {
                 if (value === 'Not Determined') {
                   const next = structuredClone(current)

src/components/consent_group_list/ConsentGroupAddEdit.tsx

@@ -8,6 +8,7 @@ import DatasetExportButton from 'src/components/data_search/DatasetExportButton'
 import { dataUseCellData } from 'src/components/dac_dataset_table/DACDatasetTableCellData'
 import 'src/components/data_search/DatasetSearch.css'
 import { muiCheckboxFix } from 'src/libs/muiThemeFix'
+import { DataLocationType } from 'src/pages/data_submission/v2/v2-models'
 
 export interface DatasetSearchTableTab<T> {
   key: string
@@ -420,16 +421,20 @@ export const makeDatasetTableHeader = (datasets: DatasetTerm[], selected: number
       cellStyle: makeHeaderStyle(cellWidths.dataLocation),
       cellDataFn: (dataset: DatasetTerm) => {
         let dataLocation
-        if (dataset.dataLocation === 'TDR Location') {
-          dataLocation = 'Terra Data Repo'
+        const TERRA_DATA_REPO = 'Terra Data Repo'
+        if (dataset.dataLocation === DataLocationType.TDRLocation) {
+          dataLocation = TERRA_DATA_REPO
         }
-        else if (dataset.dataLocation === 'Terra Workspace') {
+        else if (dataset.dataLocation === DataLocationType.TerraWorkspace) {
           dataLocation = dataset.url
-            ? <Link href={dataset.url}>Terra Workspace</Link>
-            : 'Terra Data Repo'
+            ? <Link href={dataset.url}>{DataLocationType.TerraWorkspace}</Link>
+            : TERRA_DATA_REPO
         }
-        else if (dataset.dataLocation === 'Not Determined') {
-          dataLocation = 'Not Determined'
+        else if (dataset.dataLocation === DataLocationType.NotDetermined) {
+          dataLocation = DataLocationType.NotDetermined
+        }
+        else if (dataset.dataLocation === DataLocationType.Other) {
+          dataLocation = dataset.url ? new URL(dataset.url).hostname : ''
         }
         else {
           dataLocation = dataset.url

src/components/data_search/DatasetSearchTableConstants.tsx

@@ -541,17 +541,30 @@ export class AccessManagement extends StringDatasetProperty {
   }
 }
 
+export enum DataLocationType {
+  AnVILWorkspace = 'AnVIL Workspace',
+  TerraWorkspace = 'Terra Workspace',
+  TDRLocation = 'TDR Location',
+  NotDetermined = 'Not Determined',
+  Other = 'Other',
+}
+
 export class DataLocation extends StringDatasetProperty {
   static readonly schemaProperty = 'dataLocation'
   static readonly propertyName = 'Data Location'
-  static readonly VALUES = ['AnVIL Workspace', 'Terra Workspace', 'TDR Location', 'Not Determined']
+  static readonly VALUES = [
+    DataLocationType.AnVILWorkspace,
+    DataLocationType.TerraWorkspace,
+    DataLocationType.TDRLocation,
+    DataLocationType.NotDetermined,
+    DataLocationType.Other,
+  ]
+
   constructor(value?: string, datasetId?: number, propertyId?: number) {
     super('Data Location', '', DataLocation.propertyName, DataLocation.schemaProperty, value, datasetId, propertyId)
   }
 }
 
-export type DataLocationType = 'AnVIL Workspace' | 'Terra Workspace' | 'TDR Location' | 'Not Determined'
-
 export class DataURL extends StringDatasetProperty {
   static readonly schemaProperty = 'url'
   static readonly propertyName = 'URL'