Merge branch 'catalog-ui-362-obsolete-api-v0' into 'master'

Obsolete API v0

See merge request !319

config/webpack-base.config.js

@@ -76,7 +76,7 @@ module.exports = {
                     }
 
                     if (p.startsWith('/uploads')) {
-                      p = p.replace(/^\/uploads/, '/api/v0/repository/download');
+                      p = p.replace(/^\/uploads/, '/api/v1/repository/download');
                     }
 
                     // If authorization header is not provided, use access_token from cookie

src/constants/apiURLS.ts

@@ -3,23 +3,14 @@ const origin = typeof window !== 'undefined' ? window.location.origin : 'http://
 export const API_ROOT = `${origin}/proxy`;
 
 export const LOGIN_URL = `${API_ROOT}/oauth/token`;
-export const LOGOUT_URL = `${API_ROOT}/api/v0/me/logout`;
+export const LOGOUT_URL = `${API_ROOT}/api/v1/me/logout`;
 export const CHECK_TOKEN_URL = `${API_ROOT}/oauth/check_token`;
 export const VERIFY_GOOGLE_TOKEN_URL = `${API_ROOT}/google/verify-token`;
 
-export const APIv0_BASE_URL = `${API_ROOT}/api/v0`;
 export const APIv1_BASE_URL = `${API_ROOT}/api/v1`;
 // Me API
-const ME_API = `${APIv0_BASE_URL}/me`;
+const ME_API = `${APIv1_BASE_URL}/me`;
 export const GET_USER_PROFILE_URL = `${ME_API}/profile`;
 export const CHANGE_USER_PASSWORD_URL = `${ME_API}/password`;
 
-
-// Partner API
-const PARTNER_API = `${APIv0_BASE_URL}/partner`;
-export const GET_PARTNER_URL = `${PARTNER_API}`;
-export const REMOVE_PARTNER_URL = `${PARTNER_API}`;
-export const CREATE_PARTNER_URL = `${PARTNER_API}/create`;
-export const UPDATE_PARTNER_URL = `${PARTNER_API}/update`;
-export const LIST_PARTNER_URL = `${PARTNER_API}/list`;
 export const REPOSITORY_DOWNLOADFILE_URL = `/proxy/uploads`;

src/datasets/ui/c/DatasetDisplay.tsx

@@ -341,7 +341,7 @@ class DetailInfo extends React.Component<IDetailInfoProps, any> {
                               {
                                   dataset.repositoryFiles && dataset.repositoryFiles.map((e: RepositoryFile) => (
                                       <PropertiesItem key={ e.uuid } title={
-                                        <a href={ `/proxy/api/v0/repository/download/${e.uuid}` }>
+                                        <a href={ `/proxy/api/v1/repository/download/${e.uuid}` }>
                                           <Button variant="raised" component="span" className={ `${classes.buttonGreen} ${classes.button}` }>
                                             Download
                                           </Button>

src/descriptorlists/ui/c/DescriptorListDisplay.tsx

@@ -243,7 +243,7 @@ class DetailInfo extends React.Component<IDetailInfoProps, any> {
                                     }
                                     { descriptorList.state !== PublishState.PUBLISHED && descriptorList._permissions.delete && <Button onClick={ this.onDelete } type="button">Delete</Button> }
                                     { descriptorList._permissions.manage && <Permissions clazz={ DescriptorList.clazz } id={ descriptorList.id } /> }
-                                    <a target="_blank" href={ `/proxy/api/v0/descriptorlist/${descriptorList.uuid}/html` }><Button type="button">Download as HTML</Button></a>
+                                    <a target="_blank" href={ `/proxy/api/v1/descriptorlist/${descriptorList.uuid}/html` }><Button type="button">Download as HTML</Button></a>
                                 </CardActions>
                             ) }
                         </Card>

src/service/CropService.ts

@@ -5,10 +5,10 @@ import { axiosBackend } from 'utilities/requestUtils';
 
 import Crop from 'model/genesys/Crop';
 
-const URL_LIST_CROPS = `/api/v0/crops`;
-const URL_SAVE_CROP = `/api/v0/crops/save`;
-const URL_GET_CROP = UrlTemplate.parse(`/api/v0/crops/{shortName}`);
-const URL_DELETE_CROP = UrlTemplate.parse(`/api/v0/crops/{shortName}`);
+const URL_LIST_CROPS = `/api/v1/crops/list`;
+const URL_SAVE_CROP = `/api/v1/crops/save`;
+const URL_GET_CROP = UrlTemplate.parse(`/api/v1/crops/{shortName}`);
+const URL_DELETE_CROP = UrlTemplate.parse(`/api/v1/crops/{shortName}`);
 
 /*
 * Defined in Swagger as 'crop'
@@ -16,7 +16,7 @@ const URL_DELETE_CROP = UrlTemplate.parse(`/api/v0/crops/{shortName}`);
 class CropService {
 
   /**
-   * listCrops at /api/v0/crops
+   * listCrops at /api/v1/crops/list
    *
    */
   public static listCrops(): Promise<Crop[]> {
@@ -33,7 +33,7 @@ class CropService {
   }
 
   /**
-   * saveCrop at /api/v0/crops/save
+   * saveCrop at /api/v1/crops/save
    *
    * @param cropJson cropJson
    */
@@ -51,7 +51,7 @@ class CropService {
   }
 
   /**
-   * getCrop at /api/v0/crops/{shortName}
+   * getCrop at /api/v1/crops/{shortName}
    *
    * @param shortName shortName
    */
@@ -69,7 +69,7 @@ class CropService {
   }
 
   /**
-   * deleteCrop at /api/v0/crops/{shortName}
+   * deleteCrop at /api/v1/crops/{shortName}
    *
    * @param shortName shortName
    */

src/service/DatasetService.ts

@@ -12,34 +12,34 @@ import FilteredPage from 'model/FilteredPage';
 import Page, { IPageRequest } from 'model/Page';
 import RepositoryFile from 'model/repository/RepositoryFile';
 
-const URL_ADD_DESCRIPTORS = UrlTemplate.parse(`/api/v0/dataset/add-descriptors/{UUID},{version}`);
-const URL_APPROVE_DATASET = `/api/v0/dataset/approve`;
-const URL_CREATE_DATASET = `/api/v0/dataset/create`;
-const URL_REVIEW_DATASET = `/api/v0/dataset/for-review`;
-const URL_DATASET_LIST = `/api/v0/dataset/list`;
-const URL_MY_DATASETS = `/api/v0/dataset/list-mine`;
-const URL_REJECT_DATASET = `/api/v0/dataset/reject`;
-const URL_REMOVE_DESCRIPTORS = UrlTemplate.parse(`/api/v0/dataset/remove-descriptors/{UUID},{version}`);
-const URL_UPDATE_DESCRIPTORS = UrlTemplate.parse(`/api/v0/dataset/set-descriptors/{UUID},{version}`);
-const URL_UPDATE_DATASET = `/api/v0/dataset/update`;
-const URL_UPSERT_ACCESSIONS = UrlTemplate.parse(`/api/v0/dataset/upsertaccessions/{UUID},{version}`);
-const URL_GET_DATASET = UrlTemplate.parse(`/api/v0/dataset/{UUID}`);
-const URL_DELETE_DATASET = UrlTemplate.parse(`/api/v0/dataset/{UUID},{version}`);
-const URL_AUTOCOMPLETE = `/api/v0/dataset/{UUID}/datasetcreator/autocomplete`;
-const URL_CREATE_DATASET_CREATOR = UrlTemplate.parse(`/api/v0/dataset/{UUID}/datasetcreator/create`);
-const URL_DELETE_DATASET_CREATOR = UrlTemplate.parse(`/api/v0/dataset/{UUID}/datasetcreator/delete`);
-const URL_LIST_DATASET_CREATORS = UrlTemplate.parse(`/api/v0/dataset/{UUID}/datasetcreator/list`);
-const URL_UPDATE_DATASET_CREATOR = UrlTemplate.parse(`/api/v0/dataset/{UUID}/datasetcreator/update`);
-const URL_LOAD_BY_UUID = UrlTemplate.parse(`/api/v0/dataset/{UUID}/datasetcreator/{creatorUuid}`);
-const URL_ADD_FILE_TO_DATASET = UrlTemplate.parse(`/api/v0/dataset/{UUID}/files/add`);
-const URL_REMOVE_FILE_OF_DATASET = UrlTemplate.parse(`/api/v0/dataset/{UUID}/files/delete/{fileUuid}`);
-const URL_GET_LIST = UrlTemplate.parse(`/api/v0/dataset/{UUID}/files/list`);
-const URL_UPDATE_DATASET_FILE = UrlTemplate.parse(`/api/v0/dataset/{UUID}/files/update`);
-const URL_CREATE_LOCATION = UrlTemplate.parse(`/api/v0/dataset/{UUID}/location/create`);
-const URL_DELETE_LOCATION = UrlTemplate.parse(`/api/v0/dataset/{UUID}/location/delete`);
-const URL_LIST_LOCATION = UrlTemplate.parse(`/api/v0/dataset/{UUID}/location/list`);
-const URL_UPDATE_LOCATION = UrlTemplate.parse(`/api/v0/dataset/{UUID}/location/update`);
-const URL_LOAD_LOCATION_BY_UUID = UrlTemplate.parse(`/api/v0/dataset/{UUID}/location/{locationUuid}`);
+const URL_ADD_DESCRIPTORS = UrlTemplate.parse(`/api/v1/dataset/add-descriptors/{UUID},{version}`);
+const URL_APPROVE_DATASET = `/api/v1/dataset/approve`;
+const URL_CREATE_DATASET = `/api/v1/dataset/create`;
+const URL_REVIEW_DATASET = `/api/v1/dataset/for-review`;
+const URL_DATASET_LIST = `/api/v1/dataset/list`;
+const URL_MY_DATASETS = `/api/v1/dataset/list-mine`;
+const URL_REJECT_DATASET = `/api/v1/dataset/reject`;
+const URL_REMOVE_DESCRIPTORS = UrlTemplate.parse(`/api/v1/dataset/remove-descriptors/{UUID},{version}`);
+const URL_UPDATE_DESCRIPTORS = UrlTemplate.parse(`/api/v1/dataset/set-descriptors/{UUID},{version}`);
+const URL_UPDATE_DATASET = `/api/v1/dataset/update`;
+const URL_UPSERT_ACCESSIONS = UrlTemplate.parse(`/api/v1/dataset/upsertaccessions/{UUID},{version}`);
+const URL_GET_DATASET = UrlTemplate.parse(`/api/v1/dataset/{UUID}`);
+const URL_DELETE_DATASET = UrlTemplate.parse(`/api/v1/dataset/{UUID},{version}`);
+const URL_AUTOCOMPLETE = `/api/v1/dataset/{UUID}/datasetcreator/autocomplete`;
+const URL_CREATE_DATASET_CREATOR = UrlTemplate.parse(`/api/v1/dataset/{UUID}/datasetcreator/create`);
+const URL_DELETE_DATASET_CREATOR = UrlTemplate.parse(`/api/v1/dataset/{UUID}/datasetcreator/delete`);
+const URL_LIST_DATASET_CREATORS = UrlTemplate.parse(`/api/v1/dataset/{UUID}/datasetcreator/list`);
+const URL_UPDATE_DATASET_CREATOR = UrlTemplate.parse(`/api/v1/dataset/{UUID}/datasetcreator/update`);
+const URL_LOAD_BY_UUID = UrlTemplate.parse(`/api/v1/dataset/{UUID}/datasetcreator/{creatorUuid}`);
+const URL_ADD_FILE_TO_DATASET = UrlTemplate.parse(`/api/v1/dataset/{UUID}/files/add`);
+const URL_REMOVE_FILE_OF_DATASET = UrlTemplate.parse(`/api/v1/dataset/{UUID}/files/delete/{fileUuid}`);
+const URL_GET_LIST = UrlTemplate.parse(`/api/v1/dataset/{UUID}/files/list`);
+const URL_UPDATE_DATASET_FILE = UrlTemplate.parse(`/api/v1/dataset/{UUID}/files/update`);
+const URL_CREATE_LOCATION = UrlTemplate.parse(`/api/v1/dataset/{UUID}/location/create`);
+const URL_DELETE_LOCATION = UrlTemplate.parse(`/api/v1/dataset/{UUID}/location/delete`);
+const URL_LIST_LOCATION = UrlTemplate.parse(`/api/v1/dataset/{UUID}/location/list`);
+const URL_UPDATE_LOCATION = UrlTemplate.parse(`/api/v1/dataset/{UUID}/location/update`);
+const URL_LOAD_LOCATION_BY_UUID = UrlTemplate.parse(`/api/v1/dataset/{UUID}/location/{locationUuid}`);
 
 /*
 * Defined in Swagger as 'dataset'
@@ -47,7 +47,7 @@ const URL_LOAD_LOCATION_BY_UUID = UrlTemplate.parse(`/api/v0/dataset/{UUID}/loca
 class DatasetService {
 
   /**
-   * addDescriptors at /api/v0/dataset/add-descriptors/{UUID},{version}
+   * addDescriptors at /api/v1/dataset/add-descriptors/{UUID},{version}
    *
    * @param UUID UUID
    * @param version version
@@ -67,7 +67,7 @@ class DatasetService {
   }
 
   /**
-   * approveDataset at /api/v0/dataset/approve
+   * approveDataset at /api/v1/dataset/approve
    *
    * @param uuid uuid
    * @param version version
@@ -90,7 +90,7 @@ class DatasetService {
   }
 
   /**
-   * createDataset at /api/v0/dataset/create
+   * createDataset at /api/v1/dataset/create
    *
    * @param dataset dataset
    */
@@ -108,7 +108,7 @@ class DatasetService {
   }
 
   /**
-   * reviewDataset at /api/v0/dataset/for-review
+   * reviewDataset at /api/v1/dataset/for-review
    *
    * @param uuid uuid
    * @param version version
@@ -131,7 +131,7 @@ class DatasetService {
   }
 
   /**
-   * datasetList at /api/v0/dataset/list
+   * datasetList at /api/v1/dataset/list
    *
    * @param filter filter
    * @param page undefined
@@ -157,7 +157,7 @@ class DatasetService {
   }
 
   /**
-   * myDatasets at /api/v0/dataset/list-mine
+   * myDatasets at /api/v1/dataset/list-mine
    *
    * @param filter filter
    * @param page undefined
@@ -183,7 +183,7 @@ class DatasetService {
   }
 
   /**
-   * rejectDataset at /api/v0/dataset/reject
+   * rejectDataset at /api/v1/dataset/reject
    *
    * @param uuid uuid
    * @param version version
@@ -206,7 +206,7 @@ class DatasetService {
   }
 
   /**
-   * removeDescriptors at /api/v0/dataset/remove-descriptors/{UUID},{version}
+   * removeDescriptors at /api/v1/dataset/remove-descriptors/{UUID},{version}
    *
    * @param UUID UUID
    * @param version version
@@ -226,7 +226,7 @@ class DatasetService {
   }
 
   /**
-   * updateDescriptors at /api/v0/dataset/set-descriptors/{UUID},{version}
+   * updateDescriptors at /api/v1/dataset/set-descriptors/{UUID},{version}
    *
    * @param UUID UUID
    * @param version version
@@ -246,7 +246,7 @@ class DatasetService {
   }
 
   /**
-   * updateDataset at /api/v0/dataset/update
+   * updateDataset at /api/v1/dataset/update
    *
    * @param dataset dataset
    */
@@ -264,7 +264,7 @@ class DatasetService {
   }
 
   /**
-   * upsertAccessions at /api/v0/dataset/upsertaccessions/{UUID},{version}
+   * upsertAccessions at /api/v1/dataset/upsertaccessions/{UUID},{version}
    *
    * @param UUID UUID
    * @param version version
@@ -284,7 +284,7 @@ class DatasetService {
   }
 
   /**
-   * getDataset at /api/v0/dataset/{UUID}
+   * getDataset at /api/v1/dataset/{UUID}
    *
    * @param UUID UUID
    */
@@ -302,7 +302,7 @@ class DatasetService {
   }
 
   /**
-   * deleteDataset at /api/v0/dataset/{UUID},{version}
+   * deleteDataset at /api/v1/dataset/{UUID},{version}
    *
    * @param UUID UUID
    * @param version version
@@ -321,7 +321,7 @@ class DatasetService {
   }
 
   /**
-   * autocomplete at /api/v0/dataset/{UUID}/datasetcreator/autocomplete
+   * autocomplete at /api/v1/dataset/{UUID}/datasetcreator/autocomplete
    *
    * @param c c
    */
@@ -342,7 +342,7 @@ class DatasetService {
   }
 
   /**
-   * createDatasetCreator at /api/v0/dataset/{UUID}/datasetcreator/create
+   * createDatasetCreator at /api/v1/dataset/{UUID}/datasetcreator/create
    *
    * @param UUID UUID
    * @param datasetCreator datasetCreator
@@ -361,7 +361,7 @@ class DatasetService {
   }
 
   /**
-   * deleteDatasetCreator at /api/v0/dataset/{UUID}/datasetcreator/delete
+   * deleteDatasetCreator at /api/v1/dataset/{UUID}/datasetcreator/delete
    *
    * @param UUID UUID
    * @param datasetCreator datasetCreator
@@ -380,7 +380,7 @@ class DatasetService {
   }
 
   /**
-   * listDatasetCreators at /api/v0/dataset/{UUID}/datasetcreator/list
+   * listDatasetCreators at /api/v1/dataset/{UUID}/datasetcreator/list
    *
    * @param UUID UUID
    * @param page undefined
@@ -405,7 +405,7 @@ class DatasetService {
   }
 
   /**
-   * updateDatasetCreator at /api/v0/dataset/{UUID}/datasetcreator/update
+   * updateDatasetCreator at /api/v1/dataset/{UUID}/datasetcreator/update
    *
    * @param UUID UUID
    * @param datasetCreator datasetCreator
@@ -424,7 +424,7 @@ class DatasetService {
   }
 
   /**
-   * loadByUuid at /api/v0/dataset/{UUID}/datasetcreator/{creatorUuid}
+   * loadByUuid at /api/v1/dataset/{UUID}/datasetcreator/{creatorUuid}
    *
    * @param creatorUuid creatorUuid
    */
@@ -442,7 +442,7 @@ class DatasetService {
   }
 
   /**
-   * addFileToDataset at /api/v0/dataset/{UUID}/files/add
+   * addFileToDataset at /api/v1/dataset/{UUID}/files/add
    *
    * @param UUID UUID
    * @param file file
@@ -465,7 +465,7 @@ class DatasetService {
   }
 
   /**
-   * removeFileOfDataset at /api/v0/dataset/{UUID}/files/delete/{fileUuid}
+   * removeFileOfDataset at /api/v1/dataset/{UUID}/files/delete/{fileUuid}
    *
    * @param fileUuid fileUuid
    * @param UUID UUID
@@ -484,7 +484,7 @@ class DatasetService {
   }
 
   /**
-   * getList at /api/v0/dataset/{UUID}/files/list
+   * getList at /api/v1/dataset/{UUID}/files/list
    *
    * @param UUID UUID
    */
@@ -502,7 +502,7 @@ class DatasetService {
   }
 
   /**
-   * updateDatasetFile at /api/v0/dataset/{UUID}/files/update
+   * updateDatasetFile at /api/v1/dataset/{UUID}/files/update
    *
    * @param UUID UUID
    * @param metadata metadata
@@ -521,7 +521,7 @@ class DatasetService {
   }
 
   /**
-   * createLocation at /api/v0/dataset/{UUID}/location/create
+   * createLocation at /api/v1/dataset/{UUID}/location/create
    *
    * @param UUID UUID
    * @param datasetLocation datasetLocation
@@ -540,7 +540,7 @@ class DatasetService {
   }
 
   /**
-   * deleteLocation at /api/v0/dataset/{UUID}/location/delete
+   * deleteLocation at /api/v1/dataset/{UUID}/location/delete
    *
    * @param UUID UUID
    * @param datasetLocation datasetLocation
@@ -559,7 +559,7 @@ class DatasetService {
   }
 
   /**
-   * listLocation at /api/v0/dataset/{UUID}/location/list
+   * listLocation at /api/v1/dataset/{UUID}/location/list
    *
    * @param UUID UUID
    * @param page undefined
@@ -584,7 +584,7 @@ class DatasetService {
   }
 
   /**
-   * updateLocation at /api/v0/dataset/{UUID}/location/update
+   * updateLocation at /api/v1/dataset/{UUID}/location/update
    *
    * @param UUID UUID
    * @param datasetLocation datasetLocation
@@ -603,7 +603,7 @@ class DatasetService {
   }
 
   /**
-   * loadLocationByUuid at /api/v0/dataset/{UUID}/location/{locationUuid}
+   * loadLocationByUuid at /api/v1/dataset/{UUID}/location/{locationUuid}
    *
    * @param locationUuid locationUuid
    */

src/service/DescriptorListService.ts

@@ -8,21 +8,21 @@ import DescriptorListFilter from 'model/catalog/DescriptorListFilter';
 import FilteredPage from 'model/FilteredPage';
 import { IPageRequest } from 'model/Page';
 
-const URL_ADD_DESCRIPTOR = UrlTemplate.parse(`/api/v0/descriptorlist/add-descriptors/{UUID},{version}`);
-const URL_APPROVE_DESCRIPTOR_LIST = `/api/v0/descriptorlist/approve`;
-const URL_AUTOCOMPLETE = `/api/v0/descriptorlist/autocomplete`;
-const URL_CREATE_DESCRIPTOR_LIST = `/api/v0/descriptorlist/create`;
-const URL_REVIEW_DESCRIPTOR_LIST = `/api/v0/descriptorlist/for-review`;
-const URL_LIST_DESCRIPTOR_LISTS = `/api/v0/descriptorlist/list`;
-const URL_MY_DESCRIPTOR_LISTS = `/api/v0/descriptorlist/list-mine`;
-const URL_LIST_DESCRIPTOR_LISTS_BY_CODE = UrlTemplate.parse(`/api/v0/descriptorlist/list/{filterCode}`);
-const URL_REJECT_DESCRIPTOR_LIST = `/api/v0/descriptorlist/reject`;
-const URL_REMOVE_DESCRIPTOR = UrlTemplate.parse(`/api/v0/descriptorlist/remove-descriptors/{UUID},{version}`);
-const URL_SET_DESCRIPTOR = UrlTemplate.parse(`/api/v0/descriptorlist/set-descriptors/{UUID},{version}`);
-const URL_UPDATE_DESCRIPTOR_LIST = `/api/v0/descriptorlist/update`;
-const URL_GET_DESCRIPTOR_LIST = UrlTemplate.parse(`/api/v0/descriptorlist/{UUID}`);
-const URL_DELETE_DESCRIPTOR_LIST = UrlTemplate.parse(`/api/v0/descriptorlist/{UUID},{version}`);
-const URL_GENERATE_DOCUMENT = UrlTemplate.parse(`/api/v0/descriptorlist/{UUID}/html`);
+const URL_ADD_DESCRIPTOR = UrlTemplate.parse(`/api/v1/descriptorlist/add-descriptors/{UUID},{version}`);
+const URL_APPROVE_DESCRIPTOR_LIST = `/api/v1/descriptorlist/approve`;
+const URL_AUTOCOMPLETE = `/api/v1/descriptorlist/autocomplete`;
+const URL_CREATE_DESCRIPTOR_LIST = `/api/v1/descriptorlist/create`;
+const URL_REVIEW_DESCRIPTOR_LIST = `/api/v1/descriptorlist/for-review`;
+const URL_LIST_DESCRIPTOR_LISTS = `/api/v1/descriptorlist/list`;
+const URL_MY_DESCRIPTOR_LISTS = `/api/v1/descriptorlist/list-mine`;
+const URL_LIST_DESCRIPTOR_LISTS_BY_CODE = UrlTemplate.parse(`/api/v1/descriptorlist/list/{filterCode}`);
+const URL_REJECT_DESCRIPTOR_LIST = `/api/v1/descriptorlist/reject`;
+const URL_REMOVE_DESCRIPTOR = UrlTemplate.parse(`/api/v1/descriptorlist/remove-descriptors/{UUID},{version}`);
+const URL_SET_DESCRIPTOR = UrlTemplate.parse(`/api/v1/descriptorlist/set-descriptors/{UUID},{version}`);
+const URL_UPDATE_DESCRIPTOR_LIST = `/api/v1/descriptorlist/update`;
+const URL_GET_DESCRIPTOR_LIST = UrlTemplate.parse(`/api/v1/descriptorlist/{UUID}`);
+const URL_DELETE_DESCRIPTOR_LIST = UrlTemplate.parse(`/api/v1/descriptorlist/{UUID},{version}`);
+const URL_GENERATE_DOCUMENT = UrlTemplate.parse(`/api/v1/descriptorlist/{UUID}/html`);