gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(typings): make 'status' state slice more typesafe (#4709)

Browse Source
This commit is contained in:
Vladislav Shkodin
2020-12-15 12:38:59 +02:00
committed by GitHub
parent 92a3bfa485
commit df97aec9aa
6 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/netlify-cms-core/src/reducers/auth.ts
View File

@ -20,9 +20,9 @@ export const defaultState = fromJS({
isFetching: false,
user: undefined,
error: undefined,
});
}) as Auth;
const auth = (state = defaultState as Auth, action: AuthAction) => {
const auth = (state = defaultState, action: AuthAction) => {
switch (action.type) {
case AUTH_REQUEST:
return state.set('isFetching', true);

34
packages/netlify-cms-core/src/reducers/status.ts
View File

@ -1,16 +1,26 @@
import { Map, fromJS } from 'immutable';
import { AnyAction } from 'redux';
import { STATUS_REQUEST, STATUS_SUCCESS, STATUS_FAILURE } from '../actions/status';
import { Status } from '../types/redux';
import { fromJS } from 'immutable';
import { STATUS_REQUEST, STATUS_SUCCESS, STATUS_FAILURE, StatusAction } from '../actions/status';
import { StaticallyTypedRecord } from '../types/immutable';
interface StatusAction extends AnyAction {
payload: {
status: { auth: { status: boolean }; api: { status: boolean; statusPage: string } };
error?: Error;
};
}
export type Status = StaticallyTypedRecord<{
isFetching: boolean;
status: StaticallyTypedRecord<{
auth: StaticallyTypedRecord<{ status: boolean }>;
api: StaticallyTypedRecord<{ status: boolean; statusPage: string }>;
}>;
error: Error | undefined;
}>;
const status = (state = Map(), action: StatusAction) => {
const defaultState = fromJS({
isFetching: false,
status: {
auth: { status: true },
api: { status: true, statusPage: '' },
},
error: undefined,
}) as Status;
const status = (state = defaultState, action: StatusAction) => {
switch (action.type) {
case STATUS_REQUEST:
return state.set('isFetching', true);
@ -30,7 +40,7 @@ const status = (state = Map(), action: StatusAction) => {
};
export const selectStatus = (status: Status) => {
return status.get('status')?.toJS() || {};
return status.get('status').toJS();
};
export default status;