feat: switch to datasetId everywhere

DataBiosphere · Oct 16, 2024 · 3dd4fef · 3dd4fef
1 parent 8919802
commit 3dd4fef
Show file tree

Hide file tree

Showing 21 changed files with 115 additions and 115 deletions.
diff --git a/cypress/component/DarCollectionReview/dar_collection_review.spec.js b/cypress/component/DarCollectionReview/dar_collection_review.spec.js
@@ -303,7 +303,7 @@ const dar = {
           'status': 'Open',
           'createDate': 1669062648000,
           'referenceId': 'dars-id-123',
-          'dataSetId': 13,
+          'datasetId': 13,
           'votes': {
             '8675': {
               'voteId': 8675,
@@ -396,7 +396,7 @@ const dar = {
           'status': 'Open',
           'createDate': 1669062648000,
           'referenceId': 'dars-id-123',
-          'dataSetId': 13,
+          'datasetId': 13,
           'votes': {
             '8688': {
               'voteId': 8688,
@@ -456,7 +456,7 @@ const dar = {
   },
   'datasets': [
     {
-      'dataSetId': 13,
+      'datasetId': 13,
       'objectId': null,
       'name': 'Sleep Apnea',
       'datasetName': 'Sleep Apnea',
@@ -483,7 +483,7 @@ const dar = {
       'properties': [
         {
           'propertyId': null,
-          'dataSetId': 13,
+          'datasetId': 13,
           'propertyKey': null,
           'propertyName': '# of participants',
           'propertyValue': 17,
@@ -495,7 +495,7 @@ const dar = {
         },
         {
           'propertyId': null,
-          'dataSetId': 13,
+          'datasetId': 13,
           'propertyKey': null,
           'propertyName': 'Dataset Name',
           'propertyValue': 'Sleep Apnea',
@@ -507,7 +507,7 @@ const dar = {
         },
         {
           'propertyId': null,
-          'dataSetId': 13,
+          'datasetId': 13,
           'propertyKey': null,
           'propertyName': 'Description',
           'propertyValue': 'Single cell RNA-sequence',
@@ -519,7 +519,7 @@ const dar = {
         },
         {
           'propertyId': null,
-          'dataSetId': 13,
+          'datasetId': 13,
           'propertyKey': null,
           'propertyName': 'Data Type',
           'propertyValue': 'RNA-seq',
@@ -531,7 +531,7 @@ const dar = {
         },
         {
           'propertyId': null,
-          'dataSetId': 13,
+          'datasetId': 13,
           'propertyKey': null,
           'propertyName': 'Data Depositor',
           'propertyValue': 'data_depositor@example.com',
@@ -543,7 +543,7 @@ const dar = {
         },
         {
           'propertyId': null,
-          'dataSetId': 13,
+          'datasetId': 13,
           'propertyKey': null,
           'propertyName': 'Species',
           'propertyValue': 'Human',
@@ -555,7 +555,7 @@ const dar = {
         },
         {
           'propertyId': null,
-          'dataSetId': 13,
+          'datasetId': 13,
           'propertyKey': null,
           'propertyName': 'Phenotype/Indication',
           'propertyValue': 'sleep apnea',
@@ -567,7 +567,7 @@ const dar = {
         },
         {
           'propertyId': null,
-          'dataSetId': 13,
+          'datasetId': 13,
           'propertyKey': null,
           'propertyName': 'url',
           'propertyValue': 'https://...',
@@ -658,7 +658,7 @@ const matchResponse = [
 const dacDatasets = [{
   'datasetName': null,
   'dacId': 3,
-  'dataSetId': 13,
+  'datasetId': 13,
   'consentId': 'B177D3C2-CDD8-4153-9CBF-AE4F0C34609A',
   'translatedDataUse': '',
   'deletable': null,

diff --git a/cypress/component/DataAccessRequest/data_access_request_validation.spec.js b/cypress/component/DataAccessRequest/data_access_request_validation.spec.js
@@ -64,7 +64,7 @@ const userNoLibraryCard = {
 
 const datasets = [
   {
-    dataSetId: 123456,
+    datasetId: 123456,
     datasetIdentifier: `DUOS-123456`,
     name: 'Some Dataset',
     dataUse: {

diff --git a/cypress/component/DataAccessRequest/selectable_datasets.spec.js b/cypress/component/DataAccessRequest/selectable_datasets.spec.js
@@ -6,22 +6,22 @@ import SelectableDatasets from '../../../src/pages/dar_application/SelectableDat
 
 const datasets = [
   {
-    dataSetId: 123456,
+    datasetId: 123456,
     datasetIdentifier: `DUOS-123456`,
     datasetName: 'Some Dataset 1'
   },
   {
-    dataSetId: 234567,
+    datasetId: 234567,
     datasetIdentifier: `DUOS-234567`,
     datasetName: 'Some Dataset 2'
   },
   {
-    dataSetId: 345678,
+    datasetId: 345678,
     datasetIdentifier: `DUOS-345678`,
     datasetName: 'Some Dataset 3'
   },
   {
-    dataSetId: 456789,
+    datasetId: 456789,
     datasetIdentifier: `DUOS-456789`,
     datasetName: 'Some Dataset 4'
   },

diff --git a/cypress/component/MultiDatasetVoteTab/datasets_requested.spec.js b/cypress/component/MultiDatasetVoteTab/datasets_requested.spec.js
@@ -5,7 +5,7 @@ import DatasetsRequestedPanel from '../../../src/components/collection_voting_sl
 
 const dataset = (id) => {
   return {
-    dataSetId: id,
+    datasetId: id,
     datasetIdentifier: `DUOS-${id}`,
     name: `Dataset ${id}`
   };
@@ -182,7 +182,7 @@ describe('DatasetsRequestedPanel - Tests', function () {
       <DatasetsRequestedPanel
         bucketDatasets={[
           {
-            dataSetId: 1,
+            datasetId: 1,
             name: 'Dataset 1'
           }
         ]}
@@ -199,7 +199,7 @@ describe('DatasetsRequestedPanel - Tests', function () {
       <DatasetsRequestedPanel
         bucketDatasets={[
           {
-            dataSetId: 1,
+            datasetId: 1,
             datasetIdentifier: 'DUOS-1'
           }
         ]}

diff --git a/cypress/component/MultiDatasetVoteTab/multi_dataset_vote_slab.spec.js b/cypress/component/MultiDatasetVoteTab/multi_dataset_vote_slab.spec.js
@@ -7,11 +7,11 @@ import { Votes } from '../../../src/libs/ajax/Votes';
 import {votingColors} from '../../../src/pages/dar_collection_review/MultiDatasetVotingTab';
 import {ControlledAccessType} from '../../../src/libs/dataUseTranslation';
 
-const openElection1 = {dataSetId: 10, electionId: 101, status: 'Open', electionType: 'DataAccess'};
+const openElection1 = {datasetId: 10, electionId: 101, status: 'Open', electionType: 'DataAccess'};
 
-const openElection2 = {dataSetId: 20, electionId: 102, status: 'Open', electionType: 'DataAccess'};
+const openElection2 = {datasetId: 20, electionId: 102, status: 'Open', electionType: 'DataAccess'};
 
-const closedElection = {dataSetId: 30, electionId: 103, status: 'Closed', electionType: 'DataAccess'};
+const closedElection = {datasetId: 30, electionId: 103, status: 'Closed', electionType: 'DataAccess'};
 
 const votesForOpenElection1 = {
   dataAccess: {

diff --git a/cypress/component/MultiDatasetVoteTab/multi_dataset_voting_tab.spec.js b/cypress/component/MultiDatasetVoteTab/multi_dataset_voting_tab.spec.js
@@ -15,7 +15,7 @@ const bucket1 = {
   key: 'bucket1',
   elections: [
     [
-      {dataSetId: 300, electionId: 101, status: 'Open', electionType: 'DataAccess'},
+      {datasetId: 300, electionId: 101, status: 'Open', electionType: 'DataAccess'},
       {electionId: 100, electionType: 'RP Vote'}
     ],
   ],
@@ -58,7 +58,7 @@ const bucket2 = {
   key: 'bucket2',
   elections: [
     [
-      {dataSetId: 400, electionId: 101, status: 'Open', electionType: 'DataAccess'},
+      {datasetId: 400, electionId: 101, status: 'Open', electionType: 'DataAccess'},
       {electionId: 100, electionType: 'RP Vote'}
     ],
   ],
@@ -97,8 +97,8 @@ const bucket2 = {
 
 const collection = {
   datasets: [
-    {dataSetId: 300},
-    {dataSetId: 400}
+    {datasetId: 300},
+    {datasetId: 400}
   ],
   createUser: {
     libraryCards: [{id: 1}]
@@ -107,7 +107,7 @@ const collection = {
 
 const collectionMissingLibraryCard = {
   datasets: [
-    {dataSetId: 300}
+    {datasetId: 300}
   ],
   createUser: {
     libraryCards: []
@@ -116,7 +116,7 @@ const collectionMissingLibraryCard = {
 
 beforeEach(() => {
   cy.stub(Storage, 'getCurrentUser').returns({userId: 200});
-  cy.stub(User, 'getUserRelevantDatasets').returns([{dataSetId: 300}, {dataSetId: 400}]);
+  cy.stub(User, 'getUserRelevantDatasets').returns([{datasetId: 300}, {datasetId: 400}]);
 });
 
 describe('MultiDatasetVoteTab - Tests', function() {