diff --git a/__tests__/integration/mirador/plugins/state.html b/__tests__/integration/mirador/plugins/state.html index 75617f14ccc4151714e59a15e59d067168e3578b..41e4fca994e2b96b32ca93bde085c3047e1a41b5 100644 --- a/__tests__/integration/mirador/plugins/state.html +++ b/__tests__/integration/mirador/plugins/state.html @@ -29,9 +29,9 @@ }; const pluginStateReducer = (state = initialState, action) => { - if (action.type === 'INC_SOME_NUMBER') + if (action.type === 'mirador/INC_SOME_NUMBER') return { ...state, someNumber: state.someNumber + 1 }; - if (action.type === 'SET_CANVAS') + if (action.type === 'mirador/SET_CANVAS') return { ...state, canvasChangeCount: state.canvasChangeCount + 1 }; return state; }; @@ -43,7 +43,7 @@ ); const mapDispatchToProps = (dispatch) => ({ - incSomeNumber: () => dispatch({ type: 'INC_SOME_NUMBER' }), + incSomeNumber: () => dispatch({ type: 'mirador/INC_SOME_NUMBER' }), }); const mapStateToProps = (state) => ({ diff --git a/__tests__/src/actions/annotation.test.js b/__tests__/src/actions/annotation.test.js index ceb3911ff2d9172a1c43c75bba55b1808596ee79..87b8864c3f0c184bb6e5db08e2852179931298bb 100644 --- a/__tests__/src/actions/annotation.test.js +++ b/__tests__/src/actions/annotation.test.js @@ -55,7 +55,7 @@ describe('annotation actions', () => { { annotationId: 'https://iiif.harvardartmuseums.org/manifests/object/299843/list/47174896', targetId: 'https://iiif.harvardartmuseums.org/manifests/object/299843/canvas/canvas-47174896', - type: 'REQUEST_ANNOTATION', + type: 'mirador/REQUEST_ANNOTATION', }, ]); }); @@ -70,13 +70,13 @@ describe('annotation actions', () => { { annotationId: 'https://iiif.harvardartmuseums.org/manifests/object/299843/list/47174896', targetId: 'https://iiif.harvardartmuseums.org/manifests/object/299843/canvas/canvas-47174896', - type: 'REQUEST_ANNOTATION', + type: 'mirador/REQUEST_ANNOTATION', }, { annotationId: 'https://iiif.harvardartmuseums.org/manifests/object/299843/list/47174896', annotationJson: { data: '12345' }, targetId: 'https://iiif.harvardartmuseums.org/manifests/object/299843/canvas/canvas-47174896', - type: 'RECEIVE_ANNOTATION', + type: 'mirador/RECEIVE_ANNOTATION', }, ]); }); @@ -94,13 +94,13 @@ describe('annotation actions', () => { { annotationId: 'https://iiif.harvardartmuseums.org/manifests/object/299843/list/47174896', targetId: 'https://iiif.harvardartmuseums.org/manifests/object/299843/canvas/canvas-47174896', - type: 'REQUEST_ANNOTATION', + type: 'mirador/REQUEST_ANNOTATION', }, { annotationId: 'https://iiif.harvardartmuseums.org/manifests/object/299843/list/47174896', error: new Error('invalid json response body at undefined reason: Unexpected end of JSON input'), targetId: 'https://iiif.harvardartmuseums.org/manifests/object/299843/canvas/canvas-47174896', - type: 'RECEIVE_ANNOTATION_FAILURE', + type: 'mirador/RECEIVE_ANNOTATION_FAILURE', }, ]); }); diff --git a/__tests__/src/actions/infoResponse.test.js b/__tests__/src/actions/infoResponse.test.js index 10e25a361713b7e383fcc27de00e9df42fb6ab5f..1460f10f160f5c89803132738917dbded23b0e75 100644 --- a/__tests__/src/actions/infoResponse.test.js +++ b/__tests__/src/actions/infoResponse.test.js @@ -45,7 +45,7 @@ describe('infoResponse actions', () => { it('dispatches the REQUEST_INFO_RESPONSE action', () => { store.dispatch(actions.fetchInfoResponse({ imageId: 'https://stacks.stanford.edu/image/iiif/sn904cj3429%2F12027000' })); expect(store.getActions()).toEqual([ - { infoId: 'https://stacks.stanford.edu/image/iiif/sn904cj3429%2F12027000', type: 'REQUEST_INFO_RESPONSE' }, + { infoId: 'https://stacks.stanford.edu/image/iiif/sn904cj3429%2F12027000', type: 'mirador/REQUEST_INFO_RESPONSE' }, ]); }); it('dispatches the REQUEST_INFO_RESPONSE and then RECEIVE_INFO_RESPONSE', () => { @@ -53,9 +53,9 @@ describe('infoResponse actions', () => { .then(() => { const expectedActions = store.getActions(); expect(expectedActions).toEqual([ - { infoId: 'https://stacks.stanford.edu/image/iiif/sn904cj3429%2F12027000', type: 'REQUEST_INFO_RESPONSE' }, + { infoId: 'https://stacks.stanford.edu/image/iiif/sn904cj3429%2F12027000', type: 'mirador/REQUEST_INFO_RESPONSE' }, { - infoId: 'https://stacks.stanford.edu/image/iiif/sn904cj3429%2F12027000', infoJson: { data: '12345' }, ok: true, type: 'RECEIVE_INFO_RESPONSE', + infoId: 'https://stacks.stanford.edu/image/iiif/sn904cj3429%2F12027000', infoJson: { data: '12345' }, ok: true, type: 'mirador/RECEIVE_INFO_RESPONSE', }, ]); }); @@ -83,9 +83,9 @@ describe('infoResponse actions', () => { .then(() => { const expectedActions = store.getActions(); expect(expectedActions).toEqual([ - { infoId: 'a', type: 'REQUEST_INFO_RESPONSE' }, + { infoId: 'a', type: 'mirador/REQUEST_INFO_RESPONSE' }, { - infoId: 'a', infoJson: { data: '12345' }, ok: true, type: 'RECEIVE_INFO_RESPONSE', + infoId: 'a', infoJson: { data: '12345' }, ok: true, type: 'mirador/RECEIVE_INFO_RESPONSE', }, ]); }); @@ -97,8 +97,8 @@ describe('infoResponse actions', () => { .then(() => { const expectedActions = store.getActions(); expect(expectedActions).toEqual([ - { infoId: 'https://stacks.stanford.edu/image/iiif/sn904cj3429%2F12027000', type: 'REQUEST_INFO_RESPONSE' }, - { error: new Error('invalid json response body at undefined reason: Unexpected end of JSON input'), infoId: 'https://stacks.stanford.edu/image/iiif/sn904cj3429%2F12027000', type: 'RECEIVE_INFO_RESPONSE_FAILURE' }, + { infoId: 'https://stacks.stanford.edu/image/iiif/sn904cj3429%2F12027000', type: 'mirador/REQUEST_INFO_RESPONSE' }, + { error: new Error('invalid json response body at undefined reason: Unexpected end of JSON input'), infoId: 'https://stacks.stanford.edu/image/iiif/sn904cj3429%2F12027000', type: 'mirador/RECEIVE_INFO_RESPONSE_FAILURE' }, ]); }); }); diff --git a/__tests__/src/actions/manifest.test.js b/__tests__/src/actions/manifest.test.js index 48acf60baa71d2ad49f9c814a969bd4058946d15..a75080bbeb781e089d923b45c24044008386e094 100644 --- a/__tests__/src/actions/manifest.test.js +++ b/__tests__/src/actions/manifest.test.js @@ -55,7 +55,7 @@ describe('manifest actions', () => { { manifestId: 'https://purl.stanford.edu/sn904cj3429/iiif/manifest', properties: { isFetching: true }, - type: 'REQUEST_MANIFEST', + type: 'mirador/REQUEST_MANIFEST', }, ]); }); @@ -67,12 +67,12 @@ describe('manifest actions', () => { { manifestId: 'https://purl.stanford.edu/sn904cj3429/iiif/manifest', properties: { isFetching: true }, - type: 'REQUEST_MANIFEST', + type: 'mirador/REQUEST_MANIFEST', }, { manifestId: 'https://purl.stanford.edu/sn904cj3429/iiif/manifest', manifestJson: { data: '12345' }, - type: 'RECEIVE_MANIFEST', + type: 'mirador/RECEIVE_MANIFEST', }, ]); }); @@ -87,12 +87,12 @@ describe('manifest actions', () => { { manifestId: 'https://purl.stanford.edu/sn904cj3429/iiif/manifest', properties: { isFetching: true }, - type: 'REQUEST_MANIFEST', + type: 'mirador/REQUEST_MANIFEST', }, { error: 'FetchError: invalid json response body at undefined reason: Unexpected end of JSON input', manifestId: 'https://purl.stanford.edu/sn904cj3429/iiif/manifest', - type: 'RECEIVE_MANIFEST_FAILURE', + type: 'mirador/RECEIVE_MANIFEST_FAILURE', }, ]); }); diff --git a/__tests__/src/actions/search.test.js b/__tests__/src/actions/search.test.js index 97f169d5cd7f4f7616b0c45f3947c52445017195..3f9bede258787802835e61a936cc77c35d1ae722 100644 --- a/__tests__/src/actions/search.test.js +++ b/__tests__/src/actions/search.test.js @@ -129,7 +129,7 @@ describe('search actions', () => { companionWindowId: 'companionWindowId', query: 'search terms', searchId: 'searchId', - type: 'REQUEST_SEARCH', + type: 'mirador/REQUEST_SEARCH', windowId: 'windowId', }, ]); @@ -146,14 +146,14 @@ describe('search actions', () => { { companionWindowId: 'companionWindowId', searchId: 'searchId', - type: 'REQUEST_SEARCH', + type: 'mirador/REQUEST_SEARCH', windowId: 'windowId', }, { companionWindowId: 'companionWindowId', searchId: 'searchId', searchJson: { data: '12345' }, - type: 'RECEIVE_SEARCH', + type: 'mirador/RECEIVE_SEARCH', windowId: 'windowId', }, ]); @@ -173,14 +173,14 @@ describe('search actions', () => { { companionWindowId: 'companionWindowId', searchId: 'searchId', - type: 'REQUEST_SEARCH', + type: 'mirador/REQUEST_SEARCH', windowId: 'windowId', }, { companionWindowId: 'companionWindowId', error: new Error('invalid json response body at undefined reason: Unexpected end of JSON input'), searchId: 'searchId', - type: 'RECEIVE_SEARCH_FAILURE', + type: 'mirador/RECEIVE_SEARCH_FAILURE', windowId: 'windowId', }, ]); diff --git a/src/state/actions/action-types.js b/src/state/actions/action-types.js index 3b67e7f8d0f19b6eca67ab12442ce74173ba6f56..4d97ccf3e317ad3c6f8e413dfbf45d29519b862e 100644 --- a/src/state/actions/action-types.js +++ b/src/state/actions/action-types.js @@ -1,69 +1,69 @@ /* eslint-disable sort-keys */ const ActionTypes = { - ADD_COMPANION_WINDOW: 'ADD_COMPANION_WINDOW', - UPDATE_COMPANION_WINDOW: 'UPDATE_COMPANION_WINDOW', - REMOVE_COMPANION_WINDOW: 'REMOVE_COMPANION_WINDOW', - UPDATE_WINDOW: 'UPDATE_WINDOW', + ADD_COMPANION_WINDOW: 'mirador/ADD_COMPANION_WINDOW', + UPDATE_COMPANION_WINDOW: 'mirador/UPDATE_COMPANION_WINDOW', + REMOVE_COMPANION_WINDOW: 'mirador/REMOVE_COMPANION_WINDOW', + UPDATE_WINDOW: 'mirador/UPDATE_WINDOW', - HIGHLIGHT_ANNOTATION: 'HIGHLIGHT_ANNOTATION', - REQUEST_ANNOTATION: 'REQUEST_ANNOTATION', - RECEIVE_ANNOTATION: 'RECEIVE_ANNOTATION', - RECEIVE_ANNOTATION_FAILURE: 'RECEIVE_ANNOTATION_FAILURE', - DESELECT_ANNOTATION: 'DESELECT_ANNOTATION', - SELECT_ANNOTATION: 'SELECT_ANNOTATION', - TOGGLE_ANNOTATION_DISPLAY: 'TOGGLE_ANNOTATION_DISPLAY', + HIGHLIGHT_ANNOTATION: 'mirador/HIGHLIGHT_ANNOTATION', + REQUEST_ANNOTATION: 'mirador/REQUEST_ANNOTATION', + RECEIVE_ANNOTATION: 'mirador/RECEIVE_ANNOTATION', + RECEIVE_ANNOTATION_FAILURE: 'mirador/RECEIVE_ANNOTATION_FAILURE', + DESELECT_ANNOTATION: 'mirador/DESELECT_ANNOTATION', + SELECT_ANNOTATION: 'mirador/SELECT_ANNOTATION', + TOGGLE_ANNOTATION_DISPLAY: 'mirador/TOGGLE_ANNOTATION_DISPLAY', - FOCUS_WINDOW: 'FOCUS_WINDOW', - SET_WORKSPACE_FULLSCREEN: 'SET_WORKSPACE_FULLSCREEN', - SET_WORKSPACE_VIEWPORT_POSITION: 'SET_WORKSPACE_VIEWPORT_POSITION', - TOGGLE_WORKSPACE_EXPOSE_MODE: 'TOGGLE_WORKSPACE_EXPOSE_MODE', - ADD_MANIFEST: 'ADD_MANIFEST', - ADD_WINDOW: 'ADD_WINDOW', - ADD_ERROR: 'ADD_ERROR', - IMPORT_CONFIG: 'IMPORT_CONFIG', - IMPORT_MIRADOR_STATE: 'IMPORT_MIRADOR_STATE', - SET_CANVAS: 'SET_CANVAS', - MAXIMIZE_WINDOW: 'MAXIMIZE_WINDOW', - MINIMIZE_WINDOW: 'MINIMIZE_WINDOW', - UPDATE_WINDOW_POSITION: 'UPDATE_WINDOW_POSITION', - SET_WINDOW_SIZE: 'SET_WINDOW_SIZE', - REMOVE_WINDOW: 'REMOVE_WINDOW', - PICK_WINDOWING_SYSTEM: 'PICK_WINDOWING_SYSTEM', - REQUEST_MANIFEST: 'REQUEST_MANIFEST', - RECEIVE_MANIFEST: 'RECEIVE_MANIFEST', - RECEIVE_MANIFEST_FAILURE: 'RECEIVE_MANIFEST_FAILURE', - REMOVE_ERROR: 'REMOVE_ERROR', - SET_CONFIG: 'SET_CONFIG', - UPDATE_WORKSPACE: 'UPDATE_WORKSPACE', - SET_WINDOW_THUMBNAIL_POSITION: 'SET_WINDOW_THUMBNAIL_POSITION', - SET_WINDOW_VIEW_TYPE: 'SET_WINDOW_VIEW_TYPE', - SET_WORKSPACE_ADD_VISIBILITY: 'SET_WORKSPACE_ADD_VISIBILITY', - TOGGLE_WINDOW_SIDE_BAR: 'TOGGLE_WINDOW_SIDE_BAR', - TOGGLE_DRAGGING: 'TOGGLE_DRAGGING', - SET_WINDOW_SIDE_BAR_PANEL: 'SET_WINDOW_SIDE_BAR_PANEL', - TOGGLE_ZOOM_CONTROLS: 'TOGGLE_ZOOM_CONTROLS', - UPDATE_CONFIG: 'UPDATE_CONFIG', - REMOVE_MANIFEST: 'REMOVE_MANIFEST', - REQUEST_INFO_RESPONSE: 'REQUEST_INFO_RESPONSE', - RECEIVE_INFO_RESPONSE: 'RECEIVE_INFO_RESPONSE', - RECEIVE_INFO_RESPONSE_FAILURE: 'RECEIVE_INFO_RESPONSE_FAILURE', - REMOVE_INFO_RESPONSE: 'REMOVE_INFO_RESPONSE', - UPDATE_WORKSPACE_MOSAIC_LAYOUT: 'UPDATE_WORKSPACE_MOSAIC_LAYOUT', - UPDATE_VIEWPORT: 'UPDATE_VIEWPORT', - UPDATE_ELASTIC_WINDOW_LAYOUT: 'UPDATE_ELASTIC_WINDOW_LAYOUT', + FOCUS_WINDOW: 'mirador/FOCUS_WINDOW', + SET_WORKSPACE_FULLSCREEN: 'mirador/SET_WORKSPACE_FULLSCREEN', + SET_WORKSPACE_VIEWPORT_POSITION: 'mirador/SET_WORKSPACE_VIEWPORT_POSITION', + TOGGLE_WORKSPACE_EXPOSE_MODE: 'mirador/TOGGLE_WORKSPACE_EXPOSE_MODE', + ADD_MANIFEST: 'mirador/ADD_MANIFEST', + ADD_WINDOW: 'mirador/ADD_WINDOW', + ADD_ERROR: 'mirador/ADD_ERROR', + IMPORT_CONFIG: 'mirador/IMPORT_CONFIG', + IMPORT_MIRADOR_STATE: 'mirador/IMPORT_MIRADOR_STATE', + SET_CANVAS: 'mirador/SET_CANVAS', + MAXIMIZE_WINDOW: 'mirador/MAXIMIZE_WINDOW', + MINIMIZE_WINDOW: 'mirador/MINIMIZE_WINDOW', + UPDATE_WINDOW_POSITION: 'mirador/UPDATE_WINDOW_POSITION', + SET_WINDOW_SIZE: 'mirador/SET_WINDOW_SIZE', + REMOVE_WINDOW: 'mirador/REMOVE_WINDOW', + PICK_WINDOWING_SYSTEM: 'mirador/PICK_WINDOWING_SYSTEM', + REQUEST_MANIFEST: 'mirador/REQUEST_MANIFEST', + RECEIVE_MANIFEST: 'mirador/RECEIVE_MANIFEST', + RECEIVE_MANIFEST_FAILURE: 'mirador/RECEIVE_MANIFEST_FAILURE', + REMOVE_ERROR: 'mirador/REMOVE_ERROR', + SET_CONFIG: 'mirador/SET_CONFIG', + UPDATE_WORKSPACE: 'mirador/UPDATE_WORKSPACE', + SET_WINDOW_THUMBNAIL_POSITION: 'mirador/SET_WINDOW_THUMBNAIL_POSITION', + SET_WINDOW_VIEW_TYPE: 'mirador/SET_WINDOW_VIEW_TYPE', + SET_WORKSPACE_ADD_VISIBILITY: 'mirador/SET_WORKSPACE_ADD_VISIBILITY', + TOGGLE_WINDOW_SIDE_BAR: 'mirador/TOGGLE_WINDOW_SIDE_BAR', + TOGGLE_DRAGGING: 'mirador/TOGGLE_DRAGGING', + SET_WINDOW_SIDE_BAR_PANEL: 'mirador/SET_WINDOW_SIDE_BAR_PANEL', + TOGGLE_ZOOM_CONTROLS: 'mirador/TOGGLE_ZOOM_CONTROLS', + UPDATE_CONFIG: 'mirador/UPDATE_CONFIG', + REMOVE_MANIFEST: 'mirador/REMOVE_MANIFEST', + REQUEST_INFO_RESPONSE: 'mirador/REQUEST_INFO_RESPONSE', + RECEIVE_INFO_RESPONSE: 'mirador/RECEIVE_INFO_RESPONSE', + RECEIVE_INFO_RESPONSE_FAILURE: 'mirador/RECEIVE_INFO_RESPONSE_FAILURE', + REMOVE_INFO_RESPONSE: 'mirador/REMOVE_INFO_RESPONSE', + UPDATE_WORKSPACE_MOSAIC_LAYOUT: 'mirador/UPDATE_WORKSPACE_MOSAIC_LAYOUT', + UPDATE_VIEWPORT: 'mirador/UPDATE_VIEWPORT', + UPDATE_ELASTIC_WINDOW_LAYOUT: 'mirador/UPDATE_ELASTIC_WINDOW_LAYOUT', - ADD_AUTHENTICATION_REQUEST: 'ADD_AUTHENTICATION_REQUEST', - RESOLVE_AUTHENTICATION_REQUEST: 'RESOLVE_AUTHENTICATION_REQUEST', - REQUEST_ACCESS_TOKEN: 'REQUEST_ACCESS_TOKEN', - RECEIVE_ACCESS_TOKEN: 'RECEIVE_ACCESS_TOKEN', - RECEIVE_ACCESS_TOKEN_FAILURE: 'RECEIVE_ACCESS_TOKEN_FAILURE', + ADD_AUTHENTICATION_REQUEST: 'mirador/ADD_AUTHENTICATION_REQUEST', + RESOLVE_AUTHENTICATION_REQUEST: 'mirador/RESOLVE_AUTHENTICATION_REQUEST', + REQUEST_ACCESS_TOKEN: 'mirador/REQUEST_ACCESS_TOKEN', + RECEIVE_ACCESS_TOKEN: 'mirador/RECEIVE_ACCESS_TOKEN', + RECEIVE_ACCESS_TOKEN_FAILURE: 'mirador/RECEIVE_ACCESS_TOKEN_FAILURE', - REQUEST_SEARCH: 'REQUEST_SEARCH', - RECEIVE_SEARCH: 'RECEIVE_SEARCH', - RECEIVE_SEARCH_FAILURE: 'RECEIVE_SEARCH_FAILURE', - REMOVE_SEARCH: 'REMOVE_SEARCH', + REQUEST_SEARCH: 'mirador/REQUEST_SEARCH', + RECEIVE_SEARCH: 'mirador/RECEIVE_SEARCH', + RECEIVE_SEARCH_FAILURE: 'mirador/RECEIVE_SEARCH_FAILURE', + REMOVE_SEARCH: 'mirador/REMOVE_SEARCH', - SELECT_CONTENT_SEARCH_ANNOTATION: 'SELECT_CONTENT_SEARCH_ANNOTATION', + SELECT_CONTENT_SEARCH_ANNOTATION: 'mirador/SELECT_CONTENT_SEARCH_ANNOTATION', }; export default ActionTypes;