New initial flow

Azure · Dec 12, 2023 · 4ce48d0 · 4ce48d0
1 parent 150b262
commit 4ce48d0
Show file tree

Hide file tree

Showing 16 changed files with 691 additions and 507 deletions.
diff --git a/src/common/assets/create.png b/src/common/assets/create.png
diff --git a/src/common/assets/view.png b/src/common/assets/view.png
diff --git a/src/common/constants.js b/src/common/constants.js
@@ -1,5 +1,7 @@
 export const PATHS = {
   INDEX: '/',
+  VIEW_CONVERSIONS: '/view-conversions',
+  CREATE_UPLOAD: '/create-upload',
   PROCESSING: '/processing',
   CREATE_GEOREFERENCE: '/create-georeference',
   REVIEW_CREATE: '/review-create',
@@ -13,6 +15,8 @@ export const PATHS = {
 
 export const ROUTE_NAME_BY_PATH = {
   [PATHS.INDEX]: 'home',
+  [PATHS.CREATE_UPLOAD]: 'Create',
+  [PATHS.VIEW_CONVERSIONS]: 'View',
   [PATHS.PROCESSING]: 'processing',
   [PATHS.CREATE_GEOREFERENCE]: 'prepare.drawing.package',
   [PATHS.LAYERS]: 'prepare.drawing.package',

diff --git a/src/common/translations/en.js b/src/common/translations/en.js
@@ -9,6 +9,9 @@ const en = {
     cancel: 'Cancel',
     close: 'Close',
     create: 'Create',
+    'initial.description':
+      'Create and publish custom indoor maps that support maintaining control of design, distribution, scale, and access.',
+    'create.description': 'Create Tilesets by uploading your drawing files',
     'create.download': 'Create + Download',
     'create.indoor.map': 'Create Indoor Map',
     'create.manifest': 'Create manifest',

diff --git a/src/components/bread-crumb-nav/bread-crumb-nav.js b/src/components/bread-crumb-nav/bread-crumb-nav.js
@@ -7,7 +7,7 @@ import { useLocation, useNavigate } from 'react-router-dom';
 import { breadcrumbStyle } from './bread-crumb-nav.style';
 
 const routesReset = [PATHS.CONVERSION];
-const routesSkipAlert = [PATHS.PAST_CONVERSION];
+const routesSkipAlert = [PATHS.PAST_CONVERSION, PATHS.CREATE_UPLOAD, PATHS.VIEW_CONVERSIONS];
 
 const BreadCrumbNav = () => {
   const { t } = useTranslation();

diff --git a/src/components/bread-crumb-nav/bread-crumb-nav.style.js b/src/components/bread-crumb-nav/bread-crumb-nav.style.js
@@ -1,7 +1,7 @@
 import { color, fontSize, fontWeight } from 'common/styles';
 
 export const breadcrumbStyle = {
-  root: { margin: '0.625rem 0px' },
+  root: { margin: '0.625rem 0px', lineHeight: '1rem' },
   itemLink: {
     color: color.accent.primary,
     fontSize: fontSize.md,

diff --git a/src/components/route/route.js b/src/components/route/route.js
@@ -15,6 +15,8 @@ import { footerPadding, routeStyle } from './route.style';
 const responseStoreSelector = s => s.lroStatus;
 const userStoreSelector = s => s.subscriptionKey;
 
+const openRoutes = [PATHS.INDEX, PATHS.CREATE_UPLOAD, PATHS.VIEW_CONVERSIONS];
+
 const Route = ({ title, component: Component, dataRequired }) => {
   const { t } = useTranslation();
   const navigate = useNavigate();
@@ -28,6 +30,7 @@ const Route = ({ title, component: Component, dataRequired }) => {
   }, [currentPath]);
 
   useEffect(() => {
+    if (openRoutes.includes(currentPath)) return;
     // Redirect to index if there is no subscription key
     if (!subKey) navigate(PATHS.INDEX, { replace: true });
   }, [navigate, currentPath, subKey]);

diff --git a/src/pages/conversions/index.js b/src/pages/conversions/index.js
@@ -1,5 +1,5 @@
 import { Spinner, SpinnerSize, TextField } from '@fluentui/react';
-import { DetailsList, DetailsListLayoutMode, DetailsRow } from '@fluentui/react/lib/DetailsList';
+import { DetailsList, DetailsListLayoutMode, DetailsRow, SelectionMode } from '@fluentui/react/lib/DetailsList';
 import { PATHS } from 'common';
 import { getExistingConversions } from 'common/api/conversions';
 import { useConversionPastStore } from 'common/store/conversion-past.store';
@@ -146,7 +146,12 @@ const Conversions = () => {
           tilesetStatus: ongoingConversion.tilesetStepStatus,
           created: ongoingConversion.tilesetDate,
         },
-        date: new Date(ongoingConversion.tilesetDate ?? ongoingConversion.uploadStartTime),
+        date: new Date(
+          ongoingConversion.tilesetDate ??
+            ongoingConversion.datasetDate ??
+            ongoingConversion.conversionDate ??
+            ongoingConversion.uploadStartTime
+        ),
       });
     }
 
@@ -192,7 +197,7 @@ const Conversions = () => {
             },
           };
         })
-        .filter(item => item.description.includes(descriptionFilter))
+        .filter(item => item.description.toLowerCase().includes(descriptionFilter.toLowerCase()))
         .sort((a, b) => {
           if (a[sorting.fieldName] < b[sorting.fieldName]) {
             return sorting.descending ? 1 : -1;
@@ -232,8 +237,9 @@ const Conversions = () => {
             styles={{ root: { fontSize: '0.875rem', cursor: 'pointer' } }}
           />
         )}
+        onShouldVirtualize={() => false}
         layoutMode={DetailsListLayoutMode.justified}
-        selectionMode={0}
+        selectionMode={SelectionMode.none}
       />
     </>
   );

diff --git a/src/pages/create-manifest/FileUploader.js b/src/pages/create-manifest/FileUploader.js