diff --git a/src/components/accounts/reducer.js b/src/components/accounts/reducer.js index 4dc0cc4..467eb77 100644 --- a/src/components/accounts/reducer.js +++ b/src/components/accounts/reducer.js @@ -4,19 +4,21 @@ export type Account = { username: string, email: string, token: string, - refreshToken: ?string, + refreshToken: ?string }; export type State = { active: ?number, - available: Array, + available: Array }; - -export type AddAction = { type: 'accounts:add', payload: Account}; -export type RemoveAction = { type: 'accounts:remove', payload: Account}; -export type ActivateAction = { type: 'accounts:activate', payload: Account}; -export type UpdateTokenAction = { type: 'accounts:updateToken', payload: string }; +export type AddAction = { type: 'accounts:add', payload: Account }; +export type RemoveAction = { type: 'accounts:remove', payload: Account }; +export type ActivateAction = { type: 'accounts:activate', payload: Account }; +export type UpdateTokenAction = { + type: 'accounts:updateToken', + payload: string +}; export type ResetAction = { type: 'accounts:reset' }; type Action = @@ -27,14 +29,14 @@ type Action = | ResetAction; export function getActiveAccount(state: { accounts: State }): ?Account { - const activeAccount = state.accounts.active; - // TODO: remove activeAccount.id, when will be sure, that magor part of users have migrated to new state structure - const accountId: number | void = typeof activeAccount === 'number' ? activeAccount : (activeAccount || {}).id; + const accountId = state.accounts.active; return state.accounts.available.find((account) => account.id === accountId); } -export function getAvailableAccounts(state: { accounts: State }): Array { +export function getAvailableAccounts(state: { + accounts: State +}): Array { return state.accounts.available; } @@ -47,8 +49,14 @@ export default function accounts( ): State { switch (action.type) { case 'accounts:add': { - if (!action.payload || !action.payload.id || !action.payload.token) { - throw new Error('Invalid or empty payload passed for accounts.add'); + if ( + !action.payload + || !action.payload.id + || !action.payload.token + ) { + throw new Error( + 'Invalid or empty payload passed for accounts.add' + ); } const { payload } = action; @@ -68,8 +76,14 @@ export default function accounts( } case 'accounts:activate': { - if (!action.payload || !action.payload.id || !action.payload.token) { - throw new Error('Invalid or empty payload passed for accounts.add'); + if ( + !action.payload + || !action.payload.id + || !action.payload.token + ) { + throw new Error( + 'Invalid or empty payload passed for accounts.add' + ); } const { payload } = action; @@ -77,10 +91,10 @@ export default function accounts( return { available: state.available.map((account) => { if (account.id === payload.id) { - return {...payload}; + return { ...payload }; } - return {...account}; + return { ...account }; }), active: payload.id }; @@ -94,14 +108,18 @@ export default function accounts( case 'accounts:remove': { if (!action.payload || !action.payload.id) { - throw new Error('Invalid or empty payload passed for accounts.remove'); + throw new Error( + 'Invalid or empty payload passed for accounts.remove' + ); } const { payload } = action; return { ...state, - available: state.available.filter((account) => account.id !== payload.id) + available: state.available.filter( + (account) => account.id !== payload.id + ) }; } @@ -118,12 +136,12 @@ export default function accounts( if (account.id === state.active) { return { ...account, - token: payload, + token: payload }; } - return {...account}; - }), + return { ...account }; + }) }; } diff --git a/src/components/contact/ContactForm.js b/src/components/contact/ContactForm.js index a2ed222..832d16d 100644 --- a/src/components/contact/ContactForm.js +++ b/src/components/contact/ContactForm.js @@ -48,7 +48,7 @@ export class ContactForm extends Component { const {onClose} = this.props; return ( -
+

diff --git a/src/components/contact/ContactLink.js b/src/components/contact/ContactLink.js index 9952399..a7f20bd 100644 --- a/src/components/contact/ContactLink.js +++ b/src/components/contact/ContactLink.js @@ -4,19 +4,30 @@ import { connect } from 'react-redux'; import { create as createPopup } from 'components/ui/popup/actions'; import ContactForm from './ContactForm'; -function ContactLink({createContactPopup, ...props}: { +function ContactLink({ + createContactPopup, + ...props +}: { createContactPopup: () => void, props: Object }) { return ( - { - event.preventDefault(); + { + event.preventDefault(); - createContactPopup(); - }} {...props} /> + createContactPopup(); + }} + {...props} + /> ); } -export default connect(null, { - createContactPopup: () => createPopup(ContactForm), -})(ContactLink); +export default connect( + null, + { + createContactPopup: () => createPopup(ContactForm) + } +)(ContactLink); diff --git a/src/components/dev/apps/ApplicationsIndex.js b/src/components/dev/apps/ApplicationsIndex.js index ed82ebb..205624b 100644 --- a/src/components/dev/apps/ApplicationsIndex.js +++ b/src/components/dev/apps/ApplicationsIndex.js @@ -22,7 +22,7 @@ type Props = { applications: Array, isLoading: bool, deleteApp: string => Promise, - resetApp: (string, bool) => Promise, + resetApp: (string, bool) => Promise }; export default class ApplicationsIndex extends Component { @@ -139,7 +139,7 @@ function Guest() { function NoApps() { return ( -
+
@@ -152,6 +152,7 @@ function NoApps() {
diff --git a/src/components/dev/apps/list/ApplicationsList.js b/src/components/dev/apps/list/ApplicationsList.js index 9a146b1..9c7d282 100644 --- a/src/components/dev/apps/list/ApplicationsList.js +++ b/src/components/dev/apps/list/ApplicationsList.js @@ -49,6 +49,7 @@ export default class ApplicationsList extends React.Component {
& ElementProps) { - const {to, ...restProps} = props; +export default function LinkButton( + props: ElementProps & ElementProps +) { + const { to, ...restProps } = props; - return ( -