feat: 🎸 Improve usability of Google Cloud adapter, including direct routes to studies (#989)
This commit is contained in:
1 parent
c6f306c0de
commit
2bc361cdca
18 files changed
+413
-138
No files matched your search
@@ -1,11 +1,13 @@
|
||||
import actions from './actions.js';
|
||||
import reducers from './reducers';
|
||||
import localStorage from './localStorage.js';
|
||||
import sessionStorage from './sessionStorage.js';
|
||||
|
||||
const redux = {
|
||||
reducers,
|
||||
actions,
|
||||
localStorage,
|
||||
sessionStorage,
|
||||
};
|
||||
|
||||
export default redux;
|
||||
@@ -2,7 +2,7 @@ import redux from './index.js';
|
||||
|
||||
describe('redux exports', () => {
|
||||
test('have not changed', () => {
|
||||
const expectedExports = ['actions', 'reducers', 'localStorage'].sort();
|
||||
const expectedExports = ['actions', 'reducers', 'localStorage', 'sessionStorage'].sort();
|
||||
|
||||
const exports = Object.keys(redux).sort();
|
||||
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
const LocalStorageApi = window.localStorage;
|
||||
const localStorageKey = 'state';
|
||||
export const loadState = () => {
|
||||
try {
|
||||
const serializedState = window.localStorage.getItem('state');
|
||||
const serializedState = LocalStorageApi.getItem(localStorageKey);
|
||||
if (!serializedState) {
|
||||
return undefined;
|
||||
}
|
||||
@@ -14,7 +16,7 @@ export const loadState = () => {
|
||||
export const saveState = state => {
|
||||
try {
|
||||
const serializedState = JSON.stringify(state);
|
||||
localStorage.setItem('state', serializedState);
|
||||
LocalStorageApi.setItem(localStorageKey, serializedState);
|
||||
} catch (e) {}
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
const SessionStorageApi = window.sessionStorage;
|
||||
const sessionStorageKey = 'state';
|
||||
export const loadState = () => {
|
||||
try {
|
||||
const serializedState = SessionStorageApi.getItem(sessionStorageKey);
|
||||
if (!serializedState) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
return JSON.parse(serializedState);
|
||||
} catch (e) {
|
||||
return undefined;
|
||||
}
|
||||
};
|
||||
|
||||
export const saveState = state => {
|
||||
try {
|
||||
const serializedState = JSON.stringify(state);
|
||||
SessionStorageApi.setItem(sessionStorageKey, serializedState);
|
||||
} catch (e) {}
|
||||
};
|
||||
|
||||
const sessionStorage = {
|
||||
saveState,
|
||||
loadState,
|
||||
};
|
||||
|
||||
export default sessionStorage;
|
||||
@@ -9,6 +9,7 @@ import studyMetadataManager from './studyMetadataManager';
|
||||
import updateMetaDataManager from './updateMetaDataManager.js';
|
||||
import writeScript from './writeScript.js';
|
||||
import DicomLoaderService from './dicomLoaderService.js';
|
||||
import * as urlUtil from './urlUtil';
|
||||
|
||||
const utils = {
|
||||
guid,
|
||||
@@ -23,6 +24,7 @@ const utils = {
|
||||
updateMetaDataManager,
|
||||
DICOMTagDescriptions,
|
||||
DicomLoaderService,
|
||||
urlUtil,
|
||||
};
|
||||
|
||||
export {
|
||||
@@ -38,6 +40,7 @@ export {
|
||||
updateMetaDataManager,
|
||||
DICOMTagDescriptions,
|
||||
DicomLoaderService,
|
||||
urlUtil,
|
||||
};
|
||||
|
||||
export default utils;
|
||||
@@ -15,6 +15,7 @@ describe('Top level exports', () => {
|
||||
'updateMetaDataManager',
|
||||
'DICOMTagDescriptions',
|
||||
'DicomLoaderService',
|
||||
'urlUtil'
|
||||
].sort();
|
||||
|
||||
const exports = Object.keys(utils.default).sort();
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
import lib from 'query-string';
|
||||
|
||||
const PARAM_SEPARATOR = ';';
|
||||
const PARAM_PATTERN_IDENTIFIER = ':';
|
||||
|
||||
function toLowerCaseFirstLetter(word) {
|
||||
return word[0].toLowerCase() + word.slice(1);
|
||||
}
|
||||
const getFilters = (location = {}) => {
|
||||
const { search } = location;
|
||||
|
||||
if (!search) {
|
||||
return;
|
||||
}
|
||||
|
||||
const searchParameters = parse(search);
|
||||
const filters = {};
|
||||
|
||||
Object.entries(searchParameters).forEach(([key, value]) => {
|
||||
filters[toLowerCaseFirstLetter(key)] = value;
|
||||
});
|
||||
|
||||
return filters;
|
||||
};
|
||||
|
||||
const decode = (strToDecode = '') => {
|
||||
try {
|
||||
const decoded = window.atob(strToDecode);
|
||||
return decoded;
|
||||
} catch (e) {
|
||||
return strToDecode;
|
||||
}
|
||||
};
|
||||
|
||||
const parse = toParse => {
|
||||
if (toParse) {
|
||||
return lib.parse(toParse);
|
||||
}
|
||||
|
||||
return {};
|
||||
};
|
||||
const parseParam = paramStr => {
|
||||
const _paramDecoded = decode(paramStr);
|
||||
if (_paramDecoded && typeof _paramDecoded === 'string') {
|
||||
return _paramDecoded.split(PARAM_SEPARATOR);
|
||||
}
|
||||
};
|
||||
|
||||
const replaceParam = (path = '', paramKey, paramValue) => {
|
||||
const paramPattern = `${PARAM_PATTERN_IDENTIFIER}${paramKey}`;
|
||||
if (paramValue) {
|
||||
return path.replace(paramPattern, paramValue);
|
||||
}
|
||||
|
||||
return path;
|
||||
};
|
||||
|
||||
const queryString = {
|
||||
getQueryFilters: getFilters,
|
||||
};
|
||||
|
||||
const paramString = {
|
||||
parseParam: parseParam,
|
||||
replaceParam: replaceParam,
|
||||
};
|
||||
|
||||
export { parse, queryString, paramString };
|
||||
Reference in new issue
Block a user