diff --git a/src/common/api/conversion.js b/src/common/api/conversion.js index 90bfe05..25a2984 100644 --- 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,7 +23,8 @@ 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', }); @@ -30,7 +32,8 @@ export const startConversion = (udid) => { 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', }); @@ -38,35 +41,9 @@ export const startDataset = (conversionId) => { 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, - }); - } }; \ No newline at end of file diff --git a/src/common/api/conversion.test.js b/src/common/api/conversion.test.js index 27d2856..4a7c84f 100644 --- 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,7 +13,7 @@ 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' }, ); }); @@ -22,7 +21,7 @@ describe('conversion api', () => { 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' }, ); }); @@ -30,7 +29,7 @@ describe('conversion api', () => { 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' }, ); }); @@ -38,67 +37,8 @@ describe('conversion api', () => { 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(); - }); }); \ No newline at end of file diff --git a/src/common/api/conversions.js b/src/common/api/conversions.js new file mode 100644 index 0000000..fb94790 --- /dev/null +++ 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, + } + )) +); \ No newline at end of file diff --git a/src/common/constants.js b/src/common/constants.js index e3dde07..f380d35 100644 --- 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 new file mode 100644 index 0000000..0b833ad --- /dev/null +++ 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), +})); \ No newline at end of file diff --git a/src/common/store/conversion.store.js b/src/common/store/conversion.store.js index 243cef4..f026066 100644 --- a/src/common/store/conversion.store.js +++ b/src/common/store/conversion.store.js @@ -1,7 +1,6 @@ import { create } from 'zustand'; import { - deleteCreatedData, startConversion, startDataset, startTileset, @@ -38,6 +37,7 @@ const getDefaultState = () => ({ uploadEndTime: null, uploadUdId: null, uploadOperationLog: null, + uploadDescription: null, conversionStepStatus: conversionStatuses.empty, conversionStartTime: null, conversionEndTime: null, @@ -82,7 +82,6 @@ export const useConversionStore = create((set, get) => ({ uploadOperationLog: data.error ? JSON.stringify(data.error, null, 4) : defaultErrorMessage, uploadEndTime: Date.now(), }); - deleteCreatedData(); }); } else { get().fetchUploadStatus(res.headers.get(OPERATION_LOCATION)); @@ -93,7 +92,6 @@ export const useConversionStore = create((set, get) => ({ uploadOperationLog: e.message || defaultErrorMessage, uploadEndTime: Date.now(), }); - deleteCreatedData(); }); }, fetchUploadStatus: (location) => { @@ -114,7 +112,6 @@ export const useConversionStore = create((set, get) => ({ uploadOperationLog: data.error ? JSON.stringify(data.error, null, 4) : defaultErrorMessage, uploadEndTime: Date.now(), }); - deleteCreatedData(); } else if (data.status === LRO_STATUS.RUNNING) { set(() => ({ uploadOperationLog: JSON.stringify(data, null, 4), @@ -135,6 +132,7 @@ export const useConversionStore = create((set, get) => ({ get().startConversion(data.udid); set({ uploadUdId: data.udid, + uploadDescription: data.description, }); }); } else { @@ -146,7 +144,6 @@ export const useConversionStore = create((set, get) => ({ uploadOperationLog: e.message || defaultErrorMessage, uploadEndTime: Date.now(), }); - deleteCreatedData(); }); }, startConversion: (udid) => { @@ -166,7 +163,6 @@ export const useConversionStore = create((set, get) => ({ conversionOperationLog: data.error ? JSON.stringify(data.error, null, 4) : defaultErrorMessage, conversionEndTime: Date.now(), }); - deleteCreatedData(); }); } else { get().fetchConversionStatus(res.headers.get(OPERATION_LOCATION)); @@ -177,7 +173,6 @@ export const useConversionStore = create((set, get) => ({ conversionOperationLog: e.message || defaultErrorMessage, conversionEndTime: Date.now(), }); - deleteCreatedData(); }); }, fetchConversionStatus: (operationLocation) => { @@ -198,7 +193,6 @@ export const useConversionStore = create((set, get) => ({ conversionOperationLog: data.error ? JSON.stringify(data.error, null, 4) : defaultErrorMessage, conversionEndTime: Date.now(), }); - deleteCreatedData(); } else if (data.status === LRO_STATUS.RUNNING) { set(() => ({ conversionOperationLog: JSON.stringify(data, null, 4), @@ -233,7 +227,6 @@ export const useConversionStore = create((set, get) => ({ conversionOperationLog: e.message || defaultErrorMessage, conversionEndTime: Date.now(), }); - deleteCreatedData(); }); }, startDataset: (conversionId) => { @@ -253,7 +246,6 @@ export const useConversionStore = create((set, get) => ({ datasetOperationLog: data.error ? JSON.stringify(data.error, null, 4) : defaultErrorMessage, datasetEndTime: Date.now(), }); - deleteCreatedData(); }); } else { get().fetchDatasetStatus(res.headers.get(OPERATION_LOCATION)); @@ -264,7 +256,6 @@ export const useConversionStore = create((set, get) => ({ datasetOperationLog: e.message || defaultErrorMessage, datasetEndTime: Date.now(), }); - deleteCreatedData(); }); }, fetchDatasetStatus: (location) => { @@ -285,7 +276,6 @@ export const useConversionStore = create((set, get) => ({ datasetOperationLog: data.error ? JSON.stringify(data.error, null, 4) : defaultErrorMessage, datasetEndTime: Date.now(), }); - deleteCreatedData(); } else if (data.status === LRO_STATUS.RUNNING) { set(() => ({ datasetOperationLog: JSON.stringify(data, null, 4), @@ -318,7 +308,6 @@ export const useConversionStore = create((set, get) => ({ datasetOperationLog: e.message || defaultErrorMessage, datasetEndTime: Date.now(), }); - deleteCreatedData(); }); }, startTileset: (datasetId) => { @@ -338,7 +327,6 @@ export const useConversionStore = create((set, get) => ({ tilesetOperationLog: data.error ? JSON.stringify(data.error, null, 4) : defaultErrorMessage, tilesetEndTime: Date.now(), }); - deleteCreatedData(); }); } else { get().fetchTilesetStatus(res.headers.get(OPERATION_LOCATION)); @@ -349,7 +337,6 @@ export const useConversionStore = create((set, get) => ({ tilesetOperationLog: e.message || defaultErrorMessage, tilesetEndTime: Date.now(), }); - deleteCreatedData(); }); }, fetchTilesetStatus: (location) => { @@ -370,7 +357,6 @@ export const useConversionStore = create((set, get) => ({ tilesetOperationLog: data.error ? JSON.stringify(data.error, null, 4) : defaultErrorMessage, tilesetEndTime: Date.now(), }); - deleteCreatedData(); } else if (data.status === LRO_STATUS.RUNNING) { set(() => ({ tilesetOperationLog: JSON.stringify(data, null, 4), @@ -405,7 +391,6 @@ export const useConversionStore = create((set, get) => ({ tilesetOperationLog: e.message || defaultErrorMessage, tilesetEndTime: Date.now(), }); - deleteCreatedData(); }); }, })); \ No newline at end of file diff --git a/src/common/store/response.store.js b/src/common/store/response.store.js index f5b1d8f..0273456 100644 --- a/src/common/store/response.store.js +++ b/src/common/store/response.store.js @@ -66,7 +66,9 @@ export const useResponseStore = create((set, get) => ({ // Uses the operationLocation set by uploadFile() refreshStatus: () => { const operationLocation = get().operationLocation; - if (operationLocation === '') { + const lroStatus = get().lroStatus; + + if (operationLocation === '' || lroStatus === LRO_STATUS.FETCHING_DATA || lroStatus === LRO_STATUS.SUCCEEDED) { return; } @@ -103,12 +105,10 @@ export const useResponseStore = create((set, get) => ({ } if (data.status === LRO_STATUS.SUCCEEDED) { - if (get().lroStatus !== LRO_STATUS.FETCHING_DATA) { - set(() => ({ - lroStatus: LRO_STATUS.FETCHING_DATA, - })); - get().fetchManifestData(data.fetchUrl); - } + set(() => ({ + lroStatus: LRO_STATUS.FETCHING_DATA, + })); + get().fetchManifestData(data.fetchUrl); } }) .catch(({ message }) => { diff --git a/src/common/translations/en.js b/src/common/translations/en.js index 8438d34..eb05ca1 100644 --- a/src/common/translations/en.js +++ b/src/common/translations/en.js @@ -66,6 +66,7 @@ const en = { 'facility.name': 'Facility name', 'feedback': 'Feedback', 'feedback.link': 'Feedback link', + 'filter.by.name': 'Filter by name', 'geography': 'Geography', 'file.name': 'File name', 'geography.europe': 'Europe', @@ -82,6 +83,7 @@ const en = { 'levels.preview': 'Levels preview', 'level.name': 'Level name', 'level.name.of.file': 'Level name of {{filename}}', + 'loading': 'Loading...', 'logs': 'Logs', 'longitude': 'Longitude', 'manifest.file': 'Manifest file', @@ -143,6 +145,9 @@ const en = { 'upload': 'Upload', 'vertical.extent': 'Vertical Extent', 'vertical.extent.of.file': 'Vertical Extent of {{filename}}', + 'view': 'View', + 'view.all.conversions': 'View all conversions', + 'view.existing.conversions': 'View existing conversions', }, }; diff --git a/src/components/bread-crumb-nav/bread-crumb-nav.js b/src/components/bread-crumb-nav/bread-crumb-nav.js index 924ffd3..94386be 100644 --- a/src/components/bread-crumb-nav/bread-crumb-nav.js +++ b/src/components/bread-crumb-nav/bread-crumb-nav.js @@ -5,7 +5,6 @@ import { useNavigate, useLocation } from 'react-router-dom'; import { breadcrumbStyle } from './bread-crumb-nav.style'; import { getSplitPaths } from 'common/functions'; import { PATHS, ROUTE_NAME_BY_PATH } from 'common/constants'; -import { deleteCreatedData } from 'common/api/conversion'; import { useConversionStore } from 'common/store'; const routesConfirmationRequiredBeforeLeaving = [ @@ -28,7 +27,6 @@ const BreadCrumbNav = () => { } if (routesConfirmationRequiredBeforeLeaving.includes(pathname)) { if (window.confirm(t('progress.will.be.lost'))) { - deleteCreatedData(); useConversionStore.getState().reset(); navigate(path); } diff --git a/src/components/route/route.js b/src/components/route/route.js index 09c801e..4dbd771 100644 --- a/src/components/route/route.js +++ b/src/components/route/route.js @@ -24,7 +24,7 @@ const Route = ({ title, component: Component, dataRequired }) => { const shouldShowFooter = useMemo(() => progressBarSteps.findIndex(route => route.href === pathname) !== -1, [pathname]); useEffect(() => { - if (dataRequired && lroStatus !== LRO_STATUS.SUCCEEDED) { + if (dataRequired && lroStatus !== LRO_STATUS.SUCCEEDED && lroStatus !== LRO_STATUS.FETCHING_DATA) { navigate(PATHS.INDEX); } }, [dataRequired, lroStatus, navigate]); diff --git a/src/pages/conversion/__snapshots__/index.test.js.snap b/src/pages/conversion/__snapshots__/index.test.js.snap index 8983601..54e01c7 100644 --- a/src/pages/conversion/__snapshots__/index.test.js.snap +++ b/src/pages/conversion/__snapshots__/index.test.js.snap @@ -44,8 +44,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -66,15 +64,6 @@ Object { } .emotion-4 { - margin-right: 0.5rem; -} - -.emotion-5 { - color: #605e5c; - font-size: 0.6875rem; -} - -.emotion-6 { height: 2.75rem; display: -webkit-box; display: -webkit-flex; @@ -90,15 +79,26 @@ Object { padding: 0 0.5rem; border: none; width: 100%; + background-color: #E1DFDD; + font-weight: 700; cursor: pointer; } -.emotion-6:hover { +.emotion-4:hover { color: #0078d4; background-color: #F3F2F1; } -.emotion-18 { +.emotion-6 { + margin-right: 0.5rem; +} + +.emotion-7 { + color: #605e5c; + font-size: 0.6875rem; +} + +.emotion-20 { height: 2.75rem; display: -webkit-box; display: -webkit-flex; @@ -116,19 +116,19 @@ Object { width: 100%; } -.emotion-22 { +.emotion-24 { padding: 0 1rem; overflow: auto; width: calc(100% - 18rem); } @media (max-width: 600px) { - .emotion-22 { + .emotion-24 { width: calc(100% - 9rem); } } -.emotion-23 { +.emotion-25 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -139,22 +139,14 @@ Object { height: 100%; } -.emotion-24 { +.emotion-26 { margin-top: 1rem; margin-bottom: 1rem; font-size: 1rem; } -.emotion-25 { - font-weight: 600; -} - -.emotion-26 { - overflow: auto; -} - .emotion-27 { - overflow-x: auto; + font-weight: 600; } @@ -166,15 +158,35 @@ Object { class="emotion-1" > +
+
Udid :
-
-

- operation.log -

-
-            
@@ -345,8 +347,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -367,15 +367,6 @@ Object { } .emotion-4 { - margin-right: 0.5rem; -} - -.emotion-5 { - color: #605e5c; - font-size: 0.6875rem; -} - -.emotion-6 { height: 2.75rem; display: -webkit-box; display: -webkit-flex; @@ -391,15 +382,26 @@ Object { padding: 0 0.5rem; border: none; width: 100%; + background-color: #E1DFDD; + font-weight: 700; cursor: pointer; } -.emotion-6:hover { +.emotion-4:hover { color: #0078d4; background-color: #F3F2F1; } -.emotion-18 { +.emotion-6 { + margin-right: 0.5rem; +} + +.emotion-7 { + color: #605e5c; + font-size: 0.6875rem; +} + +.emotion-20 { height: 2.75rem; display: -webkit-box; display: -webkit-flex; @@ -417,19 +419,19 @@ Object { width: 100%; } -.emotion-22 { +.emotion-24 { padding: 0 1rem; overflow: auto; width: calc(100% - 18rem); } @media (max-width: 600px) { - .emotion-22 { + .emotion-24 { width: calc(100% - 9rem); } } -.emotion-23 { +.emotion-25 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -440,22 +442,14 @@ Object { height: 100%; } -.emotion-24 { +.emotion-26 { margin-top: 1rem; margin-bottom: 1rem; font-size: 1rem; } -.emotion-25 { - font-weight: 600; -} - -.emotion-26 { - overflow: auto; -} - .emotion-27 { - overflow-x: auto; + font-weight: 600; }
@@ -466,15 +460,35 @@ Object { class="emotion-1" > +
+
Udid :
-
-

- operation.log -

-
-          
diff --git a/src/pages/conversion/__snapshots__/step-button.test.js.snap b/src/pages/conversion/__snapshots__/step-button.test.js.snap index f606008..4911d59 100644 --- a/src/pages/conversion/__snapshots__/step-button.test.js.snap +++ b/src/pages/conversion/__snapshots__/step-button.test.js.snap @@ -19,8 +19,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -90,8 +88,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -216,8 +212,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -289,8 +283,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -417,8 +409,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -490,8 +480,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -618,8 +606,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -692,8 +678,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -837,8 +821,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -929,8 +911,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -1060,8 +1040,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } @@ -1134,8 +1112,6 @@ Object { padding: 0 0.5rem; border: none; width: 100%; - background-color: #E1DFDD; - font-weight: 700; cursor: pointer; } diff --git a/src/pages/conversion/__snapshots__/tileset-content.test.js.snap b/src/pages/conversion/__snapshots__/tileset-content.test.js.snap index d80453b..9b233b8 100644 --- a/src/pages/conversion/__snapshots__/tileset-content.test.js.snap +++ b/src/pages/conversion/__snapshots__/tileset-content.test.js.snap @@ -85,18 +85,18 @@ Object { font-weight: 600; } -.emotion-4 { +.emotion-3 { opacity: 0.5; font-size: 0.75rem; cursor: pointer; margin: 0 0.5rem; } -.emotion-4:hover { +.emotion-3:hover { opacity: 0.75; } -.emotion-5 { +.emotion-6 { overflow: auto; } @@ -115,7 +115,16 @@ Object { MapConfigurationId : - + my-map-config + + +
: - + default_some-id