Skip to content

Clean up action types #4186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marlo-longley wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Clean up action types #4186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __tests__/src/reducers/catalog.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { catalogReducer } from '../../../src/state/reducers/catalog';
import ActionTypes from '../../../src/state/actions/action-types';

describe('catalog reducer', () => {
describe('ADD_MANIFEST', () => {
describe('ADD_RESOURCE', () => {
it('adds new manifests to the state', () => {
expect(catalogReducer([], {
manifestId: '1',
Expand Down
62 changes: 0 additions & 62 deletions __tests__/src/reducers/windows.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,68 +152,6 @@ describe('windows reducer', () => {
});
});

it('should handle SET_WINDOW_SIZE', () => {
expect(windowsReducer({
abc123: {
id: 'abc123',
},
def456: {
id: 'def456',
},
}, {
payload: {
size: {
height: 200,
width: 200,
x: 20,
y: 20,
},
windowId: 'abc123',
},
type: ActionTypes.SET_WINDOW_SIZE,
})).toEqual({
abc123: {
height: 200,
id: 'abc123',
width: 200,
x: 20,
y: 20,
},
def456: {
id: 'def456',
},
});
});

it('should handle UPDATE_WINDOW_POSITION', () => {
expect(windowsReducer({
abc123: {
id: 'abc123',
},
def456: {
id: 'def456',
},
}, {
payload: {
position: {
x: 20,
y: 20,
},
windowId: 'abc123',
},
type: ActionTypes.UPDATE_WINDOW_POSITION,
})).toEqual({
abc123: {
id: 'abc123',
x: 20,
y: 20,
},
def456: {
id: 'def456',
},
});
});

it('should handle ADD_COMPANION_WINDOW', () => {
// on the right, just tacks the new id on
expect(windowsReducer({
Expand Down
8 changes: 0 additions & 8 deletions src/state/actions/action-types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,21 @@ const ActionTypes = {
TOGGLE_ANNOTATION_DISPLAY: 'mirador/TOGGLE_ANNOTATION_DISPLAY',

FOCUS_WINDOW: 'mirador/FOCUS_WINDOW',
SET_WORKSPACE_FULLSCREEN: 'mirador/SET_WORKSPACE_FULLSCREEN',
SET_WORKSPACE_VIEWPORT_POSITION: 'mirador/SET_WORKSPACE_VIEWPORT_POSITION',
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',
Expand All @@ -58,8 +52,6 @@ const ActionTypes = {
RECEIVE_ACCESS_TOKEN: 'mirador/RECEIVE_ACCESS_TOKEN',
RECEIVE_ACCESS_TOKEN_FAILURE: 'mirador/RECEIVE_ACCESS_TOKEN_FAILURE',
RESET_AUTHENTICATION_STATE: 'mirador/RESET_AUTHENTICATION_STATE',
CLEAR_ACCESS_TOKEN_QUEUE: 'mirador/CLEAR_ACCESS_TOKEN_QUEUE',

REQUEST_SEARCH: 'mirador/REQUEST_SEARCH',
RECEIVE_SEARCH: 'mirador/RECEIVE_SEARCH',
RECEIVE_SEARCH_FAILURE: 'mirador/RECEIVE_SEARCH_FAILURE',
Expand Down
20 changes: 0 additions & 20 deletions src/state/reducers/windows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,6 @@ export const windowsReducer = (state = {}, action) => {
view: action.viewType,
},
};
case ActionTypes.UPDATE_WINDOW_POSITION:
return {
...state,
[action.payload.windowId]: {
...state[action.payload.windowId],
x: action.payload.position.x,
y: action.payload.position.y,
},
};
case ActionTypes.SET_WINDOW_SIZE:
return {
...state,
[action.payload.windowId]: {
...state[action.payload.windowId],
height: action.payload.size.height,
width: action.payload.size.width,
x: action.payload.size.x,
y: action.payload.size.y,
},
};
case ActionTypes.SET_CANVAS:
if (!state[action.windowId]) return state;

Expand Down