Merge pull request #90 from Azure/users/v-aryapparov/onboarding-v2-da…

…shboard onboarding v2 dashboard
Azure · Sep 15, 2023 · 6e673c9 · 6e673c9
2 parents 07e7d0b + d522c15
commit 6e673c9
Show file tree

Hide file tree

Showing 36 changed files with 877 additions and 983 deletions.
diff --git a/src/common/api/conversion.js b/src/common/api/conversion.js
@@ -1,6 +1,6 @@
 import { getEnvs } from 'common/functions';
 import { useUserStore } from '../store/user.store';
-import { useConversionStore } from '../store/conversion.store';
+import { useReviewManifestStore } from '../store/review-manifest.store';
 
 const apiVersion = '2.0';
 const previewApiVersion = '2023-03-01-preview';
@@ -10,7 +10,8 @@ const conversionOutputOntology = 'facility-2.0';
 
 export const uploadConversion = (file) => {
   const { geography, subscriptionKey } = useUserStore.getState();
-  const url = `${getEnvs()[geography].URL}/mapData?dataFormat=${dataFormat}&api-version=${apiVersion}&subscription-key=${subscriptionKey}`;
+  const { getOriginalPackageName } = useReviewManifestStore.getState();
+  const url = `${getEnvs()[geography].URL}/mapData?dataFormat=${dataFormat}&api-version=${apiVersion}&subscription-key=${subscriptionKey}&description=${getOriginalPackageName()}`;
   return fetch(url, {
     method: 'POST',
     headers: {
@@ -22,51 +23,27 @@ export const uploadConversion = (file) => {
 
 export const startConversion = (udid) => {
   const { geography, subscriptionKey } = useUserStore.getState();
-  const url = `${getEnvs()[geography].URL}/conversions?udid=${udid}&outputOntology=${conversionOutputOntology}&api-version=${previewApiVersion}&subscription-key=${subscriptionKey}&dwgPackageVersion=${conversionDwgPackageVersion}`;
+  const { getOriginalPackageName } = useReviewManifestStore.getState();
+  const url = `${getEnvs()[geography].URL}/conversions?udid=${udid}&outputOntology=${conversionOutputOntology}&api-version=${previewApiVersion}&subscription-key=${subscriptionKey}&dwgPackageVersion=${conversionDwgPackageVersion}&description=${getOriginalPackageName()}`;
   return fetch(url, {
     method: 'POST',
   });
 };
 
 export const startDataset = (conversionId) => {
   const { geography, subscriptionKey } = useUserStore.getState();
-  const url = `${getEnvs()[geography].URL}/datasets?api-version=${apiVersion}&conversionId=${conversionId}&subscription-key=${subscriptionKey}`;
+  const { getOriginalPackageName } = useReviewManifestStore.getState();
+  const url = `${getEnvs()[geography].URL}/datasets?api-version=${apiVersion}&conversionId=${conversionId}&subscription-key=${subscriptionKey}&description=${getOriginalPackageName()}`;
   return fetch(url, {
     method: 'POST',
   });
 };
 
 export const startTileset = (datasetId) => {
   const { geography, subscriptionKey } = useUserStore.getState();
-  const url = `${getEnvs()[geography].URL}/tilesets?api-version=${previewApiVersion}&datasetId=${datasetId}&subscription-key=${subscriptionKey}`;
+  const { getOriginalPackageName } = useReviewManifestStore.getState();
+  const url = `${getEnvs()[geography].URL}/tilesets?api-version=${previewApiVersion}&datasetId=${datasetId}&subscription-key=${subscriptionKey}&description=${getOriginalPackageName()}`;
   return fetch(url, {
     method: 'POST',
   });
-};
-
-export const deleteCreatedData = () => {
-  const { geography, subscriptionKey } = useUserStore.getState();
-  const { uploadUdId, conversionId, datasetId, tilesetId } = useConversionStore.getState();
-
-  if (tilesetId !== null) {
-    return;
-  }
-  if (uploadUdId !== null) {
-    fetch(`${getEnvs()[geography].URL}/mapData/${uploadUdId}?api-version=2.0&subscription-key=${subscriptionKey}`, {
-      method: 'DELETE',
-      keepalive: true,
-    });
-  }
-  if (conversionId !== null) {
-    fetch(`${getEnvs()[geography].URL}/conversions/${conversionId}?api-version=2.0&subscription-key=${subscriptionKey}`, {
-      method: 'DELETE',
-      keepalive: true,
-    });
-  }
-  if (datasetId !== null) {
-    fetch(`${getEnvs()[geography].URL}/datasets/${datasetId}?api-version=2.0&subscription-key=${subscriptionKey}`, {
-      method: 'DELETE',
-      keepalive: true,
-    });
-  }
 };
diff --git a/src/common/api/conversion.test.js b/src/common/api/conversion.test.js
@@ -1,5 +1,4 @@
-import { uploadConversion, startConversion, startDataset, startTileset, deleteCreatedData } from './conversion';
-import { useConversionStore } from '../store';
+import { uploadConversion, startConversion, startDataset, startTileset } from './conversion';
 
 jest.mock('../store/user.store', () => ({
   useUserStore: {
@@ -14,91 +13,32 @@ describe('conversion api', () => {
   it('should call uploadConversion request', () => {
     uploadConversion('myFile');
     expect(global.fetch).toHaveBeenCalledWith(
-      'https://eu.atlas.microsoft.com/mapData?dataFormat=dwgzippackage&api-version=2.0&subscription-key=subKeeeeeeey',
+      'https://eu.atlas.microsoft.com/mapData?dataFormat=dwgzippackage&api-version=2.0&subscription-key=subKeeeeeeey&description=',
       { 'body': 'myFile', 'headers': { 'Content-Type': 'application/octet-stream' }, 'method': 'POST' },
     );
   });
 
   it('should call startConversion request', () => {
     startConversion('yuuu-deee-iii-deeee');
     expect(global.fetch).toHaveBeenCalledWith(
-      'https://eu.atlas.microsoft.com/conversions?udid=yuuu-deee-iii-deeee&outputOntology=facility-2.0&api-version=2023-03-01-preview&subscription-key=subKeeeeeeey&dwgPackageVersion=2.0',
+      'https://eu.atlas.microsoft.com/conversions?udid=yuuu-deee-iii-deeee&outputOntology=facility-2.0&api-version=2023-03-01-preview&subscription-key=subKeeeeeeey&dwgPackageVersion=2.0&description=',
       { 'method': 'POST' },
     );
   });
 
   it('should call startDataset request', () => {
     startDataset('con-ver-sion-id');
     expect(global.fetch).toHaveBeenCalledWith(
-      'https://eu.atlas.microsoft.com/datasets?api-version=2.0&conversionId=con-ver-sion-id&subscription-key=subKeeeeeeey',
+      'https://eu.atlas.microsoft.com/datasets?api-version=2.0&conversionId=con-ver-sion-id&subscription-key=subKeeeeeeey&description=',
       { 'method': 'POST' },
     );
   });
 
   it('should call startTileset request', () => {
     startTileset('da-ta-set-id');
     expect(global.fetch).toHaveBeenCalledWith(
-      'https://eu.atlas.microsoft.com/tilesets?api-version=2023-03-01-preview&datasetId=da-ta-set-id&subscription-key=subKeeeeeeey',
+      'https://eu.atlas.microsoft.com/tilesets?api-version=2023-03-01-preview&datasetId=da-ta-set-id&subscription-key=subKeeeeeeey&description=',
       { 'method': 'POST' },
     );
   });
-
-  it('should delete uploaded data', () => {
-    useConversionStore.setState({
-      uploadUdId: 123,
-    });
-    deleteCreatedData();
-    expect(global.fetch).toHaveBeenCalledWith(
-      'https://eu.atlas.microsoft.com/mapData/123?api-version=2.0&subscription-key=subKeeeeeeey',
-      { 'method': 'DELETE', 'keepalive': true },
-    );
-  });
-
-  it('should delete uploaded data and conversion', () => {
-    useConversionStore.setState({
-      uploadUdId: 123,
-      conversionId: 234,
-    });
-    deleteCreatedData();
-    expect(global.fetch).toHaveBeenCalledWith(
-      'https://eu.atlas.microsoft.com/mapData/123?api-version=2.0&subscription-key=subKeeeeeeey',
-      { 'method': 'DELETE', 'keepalive': true },
-    );
-    expect(global.fetch).toHaveBeenCalledWith(
-      'https://eu.atlas.microsoft.com/conversions/234?api-version=2.0&subscription-key=subKeeeeeeey',
-      { 'method': 'DELETE', 'keepalive': true },
-    );
-  });
-
-  it('should delete uploaded data and conversion and dataset', () => {
-    useConversionStore.setState({
-      uploadUdId: 123,
-      conversionId: 234,
-      datasetId: 345,
-    });
-    deleteCreatedData();
-    expect(global.fetch).toHaveBeenCalledWith(
-      'https://eu.atlas.microsoft.com/mapData/123?api-version=2.0&subscription-key=subKeeeeeeey',
-      { 'method': 'DELETE', 'keepalive': true },
-    );
-    expect(global.fetch).toHaveBeenCalledWith(
-      'https://eu.atlas.microsoft.com/conversions/234?api-version=2.0&subscription-key=subKeeeeeeey',
-      { 'method': 'DELETE', 'keepalive': true },
-    );
-    expect(global.fetch).toHaveBeenCalledWith(
-      'https://eu.atlas.microsoft.com/datasets/345?api-version=2.0&subscription-key=subKeeeeeeey',
-      { 'method': 'DELETE', 'keepalive': true },
-    );
-  });
-
-  it('should delete nothing when tileset id is not null', () => {
-    useConversionStore.setState({
-      uploadUdId: 123,
-      conversionId: 234,
-      datasetId: 345,
-      tilesetId: 456,
-    });
-    deleteCreatedData();
-    expect(global.fetch).not.toHaveBeenCalled();
-  });
 });
diff --git a/src/common/api/conversions.js b/src/common/api/conversions.js
@@ -0,0 +1,42 @@
+import { getEnvs } from 'common/functions';
+import { useUserStore } from '../store/user.store';
+
+const uploadApiVersion = '2.0';
+const creatorApiVersion = '2023-03-01-preview';
+
+const getUploads = () => {
+  const { geography, subscriptionKey } = useUserStore.getState();
+  const url = `${getEnvs()[geography].URL}/mapData?api-version=${uploadApiVersion}&subscription-key=${subscriptionKey}`;
+  return fetch(url);
+};
+
+const getConversions = () => {
+  const { geography, subscriptionKey } = useUserStore.getState();
+  const url = `${getEnvs()[geography].URL}/conversions?api-version=${creatorApiVersion}&subscription-key=${subscriptionKey}`;
+  return fetch(url);
+};
+
+const getDatasets = () => {
+  const { geography, subscriptionKey } = useUserStore.getState();
+  const url = `${getEnvs()[geography].URL}/datasets?api-version=${creatorApiVersion}&subscription-key=${subscriptionKey}`;
+  return fetch(url);
+};
+
+const getTilesets = () => {
+  const { geography, subscriptionKey } = useUserStore.getState();
+  const url = `${getEnvs()[geography].URL}/tilesets?api-version=${creatorApiVersion}&subscription-key=${subscriptionKey}`;
+  return fetch(url);
+};
+
+export const getAllData = () => (
+  Promise.all([getUploads(), getConversions(), getDatasets(), getTilesets()]).then(re => (
+    Promise.all([re[0].json(), re[1].json(), re[2].json(), re[3].json()])
+  )).then(([uploads, conversions, datasets, tilesets]) => (
+    {
+      ...uploads,
+      ...conversions,
+      ...datasets,
+      ...tilesets,
+    }
+  ))
+);
diff --git a/src/common/constants.js b/src/common/constants.js
@@ -4,6 +4,8 @@ export const PATHS = {
   CREATE_GEOREFERENCE: '/create-georeference',
   REVIEW_CREATE: '/review-create',
   CONVERSION: '/review-create/conversion',
+  PAST_CONVERSION: '/past-conversion',
+  CONVERSIONS: '/conversions',
   LAYERS: '/layers',
   LEVELS: '/levels',
   INVALID_PATH: '/*',
@@ -18,6 +20,7 @@ export const ROUTE_NAME_BY_PATH = {
   [PATHS.INVALID_PATH]: 'redirect',
   [PATHS.REVIEW_CREATE]: 'prepare.drawing.package',
   [PATHS.CONVERSION]: 'create.indoor.map',
+  [PATHS.CONVERSIONS]: 'All conversions',
 };
 
 export const TRUNCATE_FRACTION_DIGITS = 8;

diff --git a/src/common/store/conversion-past.store.js b/src/common/store/conversion-past.store.js
@@ -0,0 +1,21 @@
+import { create } from 'zustand';
+
+import { conversionStatuses, conversionSteps} from './conversion.store';
+
+export const useConversionPastStore = create((set) => ({
+  selectedStep: conversionSteps.upload,
+  uploadStepStatus: conversionStatuses.empty,
+  uploadUdId: null,
+  conversionStepStatus: conversionStatuses.empty,
+  conversionId: null,
+  datasetStepStatus: conversionStatuses.empty,
+  datasetId: null,
+  tilesetStepStatus: conversionStatuses.empty,
+  tilesetId: null,
+  mapConfigurationId: null,
+  bbox: null,
+  setStep: (selectedStep) => set({
+    selectedStep,
+  }),
+  setData: (data) => set(data),
+}));