diff options
author | Vijay A <vraravam@users.noreply.github.com> | 2024-03-22 02:33:33 +0530 |
---|---|---|
committer | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2024-03-21 21:24:35 +0000 |
commit | 2f3f2ae7f098376f535e5aa993c9eedc14e36f5d (patch) | |
tree | d919bda212744493a7b66c2e91a75455421d62cc /src/features | |
parent | Upgrade electron to '29.1.5' (diff) | |
download | ferdium-app-2f3f2ae7f098376f535e5aa993c9eedc14e36f5d.tar.gz ferdium-app-2f3f2ae7f098376f535e5aa993c9eedc14e36f5d.tar.zst ferdium-app-2f3f2ae7f098376f535e5aa993c9eedc14e36f5d.zip |
Upgrade node modules
Diffstat (limited to 'src/features')
28 files changed, 191 insertions, 140 deletions
diff --git a/src/features/appearance/index.ts b/src/features/appearance/index.ts index 46403275e..049080505 100644 --- a/src/features/appearance/index.ts +++ b/src/features/appearance/index.ts | |||
@@ -3,14 +3,14 @@ import { reaction } from 'mobx'; | |||
3 | import TopBarProgress from 'react-topbar-progress-indicator'; | 3 | import TopBarProgress from 'react-topbar-progress-indicator'; |
4 | 4 | ||
5 | import { pathExistsSync, readFileSync } from 'fs-extra'; | 5 | import { pathExistsSync, readFileSync } from 'fs-extra'; |
6 | import { isWindows, isLinux } from '../../environment'; | ||
7 | import { | 6 | import { |
8 | DEFAULT_APP_SETTINGS, | 7 | DEFAULT_APP_SETTINGS, |
9 | iconSizeBias, | ||
10 | SIDEBAR_SERVICES_LOCATION_TOPLEFT, | ||
11 | SIDEBAR_SERVICES_LOCATION_CENTER, | ||
12 | SIDEBAR_SERVICES_LOCATION_BOTTOMRIGHT, | 8 | SIDEBAR_SERVICES_LOCATION_BOTTOMRIGHT, |
9 | SIDEBAR_SERVICES_LOCATION_CENTER, | ||
10 | SIDEBAR_SERVICES_LOCATION_TOPLEFT, | ||
11 | iconSizeBias, | ||
13 | } from '../../config'; | 12 | } from '../../config'; |
13 | import { isLinux, isWindows } from '../../environment'; | ||
14 | import { userDataPath } from '../../environment-remote'; | 14 | import { userDataPath } from '../../environment-remote'; |
15 | 15 | ||
16 | const STYLE_ELEMENT_ID = 'custom-appearance-style'; | 16 | const STYLE_ELEMENT_ID = 'custom-appearance-style'; |
diff --git a/src/features/basicAuth/Component.tsx b/src/features/basicAuth/Component.tsx index e20f7641b..7c901344d 100644 --- a/src/features/basicAuth/Component.tsx +++ b/src/features/basicAuth/Component.tsx | |||
@@ -1,17 +1,21 @@ | |||
1 | import { Component, FormEvent, ReactElement } from 'react'; | ||
2 | import injectSheet, { WithStylesProps } from 'react-jss'; | ||
3 | import { observer } from 'mobx-react'; | ||
4 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
5 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
6 | import { noop } from 'lodash'; | 2 | import { noop } from 'lodash'; |
3 | import { observer } from 'mobx-react'; | ||
4 | import { Component, type FormEvent, type ReactElement } from 'react'; | ||
5 | import { | ||
6 | type WrappedComponentProps, | ||
7 | defineMessages, | ||
8 | injectIntl, | ||
9 | } from 'react-intl'; | ||
10 | import injectSheet, { type WithStylesProps } from 'react-jss'; | ||
7 | import Modal from '../../components/ui/Modal'; | 11 | import Modal from '../../components/ui/Modal'; |
8 | import Input from '../../components/ui/input/index'; | ||
9 | import Button from '../../components/ui/button'; | 12 | import Button from '../../components/ui/button'; |
10 | import { state, resetState, sendCredentials, cancelLogin } from './store'; | 13 | import { H1 } from '../../components/ui/headline'; |
14 | import Input from '../../components/ui/input/index'; | ||
15 | import globalMessages from '../../i18n/globalMessages'; | ||
11 | import Form from './Form'; | 16 | import Form from './Form'; |
17 | import { cancelLogin, resetState, sendCredentials, state } from './store'; | ||
12 | import styles from './styles'; | 18 | import styles from './styles'; |
13 | import globalMessages from '../../i18n/globalMessages'; | ||
14 | import { H1 } from '../../components/ui/headline'; | ||
15 | 19 | ||
16 | const messages = defineMessages({ | 20 | const messages = defineMessages({ |
17 | signIn: { | 21 | signIn: { |
diff --git a/src/features/basicAuth/index.ts b/src/features/basicAuth/index.ts index ae698cba8..bedb57309 100644 --- a/src/features/basicAuth/index.ts +++ b/src/features/basicAuth/index.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { AuthInfo, BrowserWindow, ipcRenderer } from 'electron'; | 1 | import { type AuthInfo, type BrowserWindow, ipcRenderer } from 'electron'; |
2 | 2 | ||
3 | import { state as ModalState } from './store'; | 3 | import { state as ModalState } from './store'; |
4 | 4 | ||
diff --git a/src/features/basicAuth/mainIpcHandler.ts b/src/features/basicAuth/mainIpcHandler.ts index d9cedc974..d46657748 100644 --- a/src/features/basicAuth/mainIpcHandler.ts +++ b/src/features/basicAuth/mainIpcHandler.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { BrowserWindow } from 'electron'; | 1 | import type { BrowserWindow } from 'electron'; |
2 | 2 | ||
3 | const debug = require('../../preload-safe-debug')( | 3 | const debug = require('../../preload-safe-debug')( |
4 | 'Ferdium:feature:basicAuth:main', | 4 | 'Ferdium:feature:basicAuth:main', |
diff --git a/src/features/basicAuth/store.ts b/src/features/basicAuth/store.ts index 0fc289916..489eac087 100644 --- a/src/features/basicAuth/store.ts +++ b/src/features/basicAuth/store.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { observable } from 'mobx'; | ||
2 | import { ipcRenderer } from 'electron'; | 1 | import { ipcRenderer } from 'electron'; |
2 | import { observable } from 'mobx'; | ||
3 | 3 | ||
4 | const debug = require('../../preload-safe-debug')('Ferdium:feature:basicAuth'); | 4 | const debug = require('../../preload-safe-debug')('Ferdium:feature:basicAuth'); |
5 | 5 | ||
diff --git a/src/features/publishDebugInfo/Component.tsx b/src/features/publishDebugInfo/Component.tsx index 3c6729ba0..8b38ba5af 100644 --- a/src/features/publishDebugInfo/Component.tsx +++ b/src/features/publishDebugInfo/Component.tsx | |||
@@ -1,15 +1,19 @@ | |||
1 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
2 | import { Component, ReactElement } from 'react'; | 2 | import { Component, type ReactElement } from 'react'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 3 | import { |
4 | import withStyles, { WithStylesProps } from 'react-jss'; | 4 | type WrappedComponentProps, |
5 | import { StoresProps } from '../../@types/ferdium-components.types'; | 5 | defineMessages, |
6 | import { state as ModalState } from './store'; | 6 | injectIntl, |
7 | import { H1 } from '../../components/ui/headline'; | 7 | } from 'react-intl'; |
8 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
9 | import type { StoresProps } from '../../@types/ferdium-components.types'; | ||
8 | import { sendAuthRequest } from '../../api/utils/auth'; | 10 | import { sendAuthRequest } from '../../api/utils/auth'; |
11 | import Modal from '../../components/ui/Modal'; | ||
9 | import Button from '../../components/ui/button'; | 12 | import Button from '../../components/ui/button'; |
13 | import { H1 } from '../../components/ui/headline'; | ||
10 | import Input from '../../components/ui/input/index'; | 14 | import Input from '../../components/ui/input/index'; |
11 | import Modal from '../../components/ui/Modal'; | ||
12 | import { DEBUG_API } from '../../config'; | 15 | import { DEBUG_API } from '../../config'; |
16 | import { state as ModalState } from './store'; | ||
13 | 17 | ||
14 | const debug = require('../../preload-safe-debug')( | 18 | const debug = require('../../preload-safe-debug')( |
15 | 'Ferdium:feature:publishDebugInfo', | 19 | 'Ferdium:feature:publishDebugInfo', |
diff --git a/src/features/quickSwitch/Component.tsx b/src/features/quickSwitch/Component.tsx index 7f6ad6432..a5c102386 100644 --- a/src/features/quickSwitch/Component.tsx +++ b/src/features/quickSwitch/Component.tsx | |||
@@ -1,15 +1,24 @@ | |||
1 | import { ChangeEvent, Component, createRef, ReactElement } from 'react'; | ||
2 | import { getCurrentWindow } from '@electron/remote'; | 1 | import { getCurrentWindow } from '@electron/remote'; |
3 | import { observer, inject } from 'mobx-react'; | ||
4 | import { reaction } from 'mobx'; | ||
5 | import withStyles, { WithStylesProps } from 'react-jss'; | ||
6 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
7 | import { compact, invoke, noop } from 'lodash'; | 2 | import { compact, invoke, noop } from 'lodash'; |
8 | import { StoresProps } from '../../@types/ferdium-components.types'; | 3 | import { reaction } from 'mobx'; |
9 | import Service from '../../models/Service'; | 4 | import { inject, observer } from 'mobx-react'; |
10 | import Input from '../../components/ui/input/index'; | 5 | import { |
11 | import { H1 } from '../../components/ui/headline'; | 6 | type ChangeEvent, |
7 | Component, | ||
8 | type ReactElement, | ||
9 | createRef, | ||
10 | } from 'react'; | ||
11 | import { | ||
12 | type WrappedComponentProps, | ||
13 | defineMessages, | ||
14 | injectIntl, | ||
15 | } from 'react-intl'; | ||
16 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
17 | import type { StoresProps } from '../../@types/ferdium-components.types'; | ||
12 | import Modal from '../../components/ui/Modal'; | 18 | import Modal from '../../components/ui/Modal'; |
19 | import { H1 } from '../../components/ui/headline'; | ||
20 | import Input from '../../components/ui/input/index'; | ||
21 | import type Service from '../../models/Service'; | ||
13 | import { state as ModalState } from './store'; | 22 | import { state as ModalState } from './store'; |
14 | 23 | ||
15 | const messages = defineMessages({ | 24 | const messages = defineMessages({ |
diff --git a/src/features/serviceProxy/index.ts b/src/features/serviceProxy/index.ts index c98ae00a7..68415c31e 100644 --- a/src/features/serviceProxy/index.ts +++ b/src/features/serviceProxy/index.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { autorun, action, observable } from 'mobx'; | ||
2 | import { session } from '@electron/remote'; | 1 | import { session } from '@electron/remote'; |
2 | import { action, autorun, observable } from 'mobx'; | ||
3 | 3 | ||
4 | const debug = require('../../preload-safe-debug')( | 4 | const debug = require('../../preload-safe-debug')( |
5 | 'Ferdium:feature:serviceProxy', | 5 | 'Ferdium:feature:serviceProxy', |
diff --git a/src/features/todos/actions.ts b/src/features/todos/actions.ts index 5273cc858..c2000752f 100644 --- a/src/features/todos/actions.ts +++ b/src/features/todos/actions.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { Webview } from 'react-electron-web-view'; | ||
2 | import PropTypes from 'prop-types'; | 1 | import PropTypes from 'prop-types'; |
2 | import type { Webview } from 'react-electron-web-view'; | ||
3 | import { createActionsFromDefinitions } from '../../actions/lib/actions'; | 3 | import { createActionsFromDefinitions } from '../../actions/lib/actions'; |
4 | 4 | ||
5 | export interface TodoClientMessage { | 5 | export interface TodoClientMessage { |
diff --git a/src/features/todos/components/TodosWebview.tsx b/src/features/todos/components/TodosWebview.tsx index 1ccfa3cdd..f9493d519 100644 --- a/src/features/todos/components/TodosWebview.tsx +++ b/src/features/todos/components/TodosWebview.tsx | |||
@@ -1,10 +1,15 @@ | |||
1 | import { Component, createRef, ReactElement, MouseEvent } from 'react'; | 1 | import classnames from 'classnames'; |
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import withStyles, { WithStylesProps } from 'react-jss'; | 3 | import { |
4 | Component, | ||
5 | type MouseEvent, | ||
6 | type ReactElement, | ||
7 | createRef, | ||
8 | } from 'react'; | ||
4 | import Webview from 'react-electron-web-view'; | 9 | import Webview from 'react-electron-web-view'; |
5 | import classnames from 'classnames'; | 10 | import withStyles, { type WithStylesProps } from 'react-jss'; |
6 | import { TODOS_PARTITION_ID } from '../../../config'; | 11 | import { TODOS_PARTITION_ID } from '../../../config'; |
7 | import { TodoClientMessage } from '../actions'; | 12 | import type { TodoClientMessage } from '../actions'; |
8 | 13 | ||
9 | const styles = theme => ({ | 14 | const styles = theme => ({ |
10 | root: { | 15 | root: { |
diff --git a/src/features/todos/containers/TodosScreen.tsx b/src/features/todos/containers/TodosScreen.tsx index 8941a4b39..29ecd5a0e 100644 --- a/src/features/todos/containers/TodosScreen.tsx +++ b/src/features/todos/containers/TodosScreen.tsx | |||
@@ -1,11 +1,11 @@ | |||
1 | import { Component, ReactElement } from 'react'; | 1 | import { inject, observer } from 'mobx-react'; |
2 | import { observer, inject } from 'mobx-react'; | 2 | import { Component, type ReactElement } from 'react'; |
3 | import TodosWebview from '../components/TodosWebview'; | ||
4 | import ErrorBoundary from '../../../components/util/ErrorBoundary'; | ||
5 | import { todosStore } from '..'; | 3 | import { todosStore } from '..'; |
4 | import ErrorBoundary from '../../../components/util/ErrorBoundary'; | ||
6 | import { TODOS_MIN_WIDTH } from '../../../config'; | 5 | import { TODOS_MIN_WIDTH } from '../../../config'; |
6 | import type { RealStores } from '../../../stores'; | ||
7 | import { todoActions } from '../actions'; | 7 | import { todoActions } from '../actions'; |
8 | import { RealStores } from '../../../stores'; | 8 | import TodosWebview from '../components/TodosWebview'; |
9 | 9 | ||
10 | interface IProps { | 10 | interface IProps { |
11 | stores?: RealStores; | 11 | stores?: RealStores; |
diff --git a/src/features/todos/store.ts b/src/features/todos/store.ts index 50704c73f..b3f7195e7 100644 --- a/src/features/todos/store.ts +++ b/src/features/todos/store.ts | |||
@@ -1,25 +1,26 @@ | |||
1 | import { Webview } from 'react-electron-web-view'; | 1 | import { action, computed, makeObservable, observable } from 'mobx'; |
2 | import { computed, action, observable, makeObservable } from 'mobx'; | ||
3 | import localStorage from 'mobx-localstorage'; | 2 | import localStorage from 'mobx-localstorage'; |
4 | import { Actions } from '../../actions/lib/actions'; | 3 | import type { Webview } from 'react-electron-web-view'; |
4 | import type { Actions } from '../../actions/lib/actions'; | ||
5 | 5 | ||
6 | import { ThemeType } from '../../themes'; | ||
7 | import { todoActions } from './actions'; | ||
8 | import { | 6 | import { |
9 | CUSTOM_TODO_SERVICE, | 7 | CUSTOM_TODO_SERVICE, |
10 | TODO_SERVICE_RECIPE_IDS, | 8 | DEFAULT_IS_TODO_FEATURE_ENABLED_BY_USER, |
9 | DEFAULT_TODOS_VISIBLE, | ||
11 | DEFAULT_TODOS_WIDTH, | 10 | DEFAULT_TODOS_WIDTH, |
12 | TODOS_MIN_WIDTH, | 11 | TODOS_MIN_WIDTH, |
13 | DEFAULT_TODOS_VISIBLE, | 12 | TODO_SERVICE_RECIPE_IDS, |
14 | DEFAULT_IS_TODO_FEATURE_ENABLED_BY_USER, | ||
15 | } from '../../config'; | 13 | } from '../../config'; |
16 | import { isValidExternalURL } from '../../helpers/url-helpers'; | 14 | import { isValidExternalURL } from '../../helpers/url-helpers'; |
17 | import FeatureStore from '../utils/FeatureStore'; | 15 | import { ifUndefined } from '../../jsUtils'; |
18 | import Reaction, { createReactions } from '../../stores/lib/Reaction'; | 16 | import UserAgent from '../../models/UserAgent'; |
17 | import type Reaction from '../../stores/lib/Reaction'; | ||
18 | import { createReactions } from '../../stores/lib/Reaction'; | ||
19 | import { ThemeType } from '../../themes'; | ||
19 | import { createActionBindings } from '../utils/ActionBinding'; | 20 | import { createActionBindings } from '../utils/ActionBinding'; |
21 | import FeatureStore from '../utils/FeatureStore'; | ||
22 | import { todoActions } from './actions'; | ||
20 | import { IPC, TODOS_ROUTES } from './constants'; | 23 | import { IPC, TODOS_ROUTES } from './constants'; |
21 | import UserAgent from '../../models/UserAgent'; | ||
22 | import { ifUndefined } from '../../jsUtils'; | ||
23 | 24 | ||
24 | const debug = require('../../preload-safe-debug')( | 25 | const debug = require('../../preload-safe-debug')( |
25 | 'Ferdium:feature:todos:store', | 26 | 'Ferdium:feature:todos:store', |
diff --git a/src/features/utils/FeatureStore.ts b/src/features/utils/FeatureStore.ts index 2bdd167f3..df82a7bd0 100644 --- a/src/features/utils/FeatureStore.ts +++ b/src/features/utils/FeatureStore.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import Reaction from '../../stores/lib/Reaction'; | 1 | import type Reaction from '../../stores/lib/Reaction'; |
2 | 2 | ||
3 | export default class FeatureStore { | 3 | export default class FeatureStore { |
4 | _actions: any = []; | 4 | _actions: any = []; |
diff --git a/src/features/webControls/components/WebControls.tsx b/src/features/webControls/components/WebControls.tsx index 54f45c843..aee568a7d 100644 --- a/src/features/webControls/components/WebControls.tsx +++ b/src/features/webControls/components/WebControls.tsx | |||
@@ -1,14 +1,18 @@ | |||
1 | import { createRef, Component, ReactElement, RefObject } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | ||
3 | import withStyles, { WithStylesProps } from 'react-jss'; | ||
4 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
5 | import { | 1 | import { |
6 | mdiReload, | ||
7 | mdiArrowRight, | ||
8 | mdiArrowLeft, | 2 | mdiArrowLeft, |
9 | mdiHomeOutline, | 3 | mdiArrowRight, |
10 | mdiEarth, | 4 | mdiEarth, |
5 | mdiHomeOutline, | ||
6 | mdiReload, | ||
11 | } from '@mdi/js'; | 7 | } from '@mdi/js'; |
8 | import { observer } from 'mobx-react'; | ||
9 | import { Component, type ReactElement, type RefObject, createRef } from 'react'; | ||
10 | import { | ||
11 | type WrappedComponentProps, | ||
12 | defineMessages, | ||
13 | injectIntl, | ||
14 | } from 'react-intl'; | ||
15 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
12 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | 16 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
13 | import Icon from '../../../components/ui/icon'; | 17 | import Icon from '../../../components/ui/icon'; |
14 | 18 | ||
diff --git a/src/features/webControls/containers/WebControlsScreen.tsx b/src/features/webControls/containers/WebControlsScreen.tsx index f6f1cddb8..b492264bf 100644 --- a/src/features/webControls/containers/WebControlsScreen.tsx +++ b/src/features/webControls/containers/WebControlsScreen.tsx | |||
@@ -1,17 +1,17 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { observer, inject } from 'mobx-react'; | ||
3 | import { | 1 | import { |
4 | autorun, | 2 | type IReactionDisposer, |
5 | action, | 3 | action, |
4 | autorun, | ||
6 | makeObservable, | 5 | makeObservable, |
7 | observable, | 6 | observable, |
8 | IReactionDisposer, | ||
9 | } from 'mobx'; | 7 | } from 'mobx'; |
10 | import ElectronWebView from 'react-electron-web-view'; | 8 | import { inject, observer } from 'mobx-react'; |
11 | import WebControls from '../components/WebControls'; | 9 | import { Component, type ReactElement } from 'react'; |
12 | import Service from '../../../models/Service'; | 10 | import type ElectronWebView from 'react-electron-web-view'; |
11 | import type { StoresProps } from '../../../@types/ferdium-components.types'; | ||
13 | import { SEARCH_ENGINE_URLS } from '../../../config'; | 12 | import { SEARCH_ENGINE_URLS } from '../../../config'; |
14 | import { StoresProps } from '../../../@types/ferdium-components.types'; | 13 | import type Service from '../../../models/Service'; |
14 | import WebControls from '../components/WebControls'; | ||
15 | 15 | ||
16 | const URL_EVENTS = [ | 16 | const URL_EVENTS = [ |
17 | 'load-commit', | 17 | 'load-commit', |
diff --git a/src/features/workspaces/actions.ts b/src/features/workspaces/actions.ts index cfe4f9e8e..7970c042c 100644 --- a/src/features/workspaces/actions.ts +++ b/src/features/workspaces/actions.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import PropTypes from 'prop-types'; | 1 | import PropTypes from 'prop-types'; |
2 | import Workspace from './models/Workspace'; | ||
3 | import { createActionsFromDefinitions } from '../../actions/lib/actions'; | 2 | import { createActionsFromDefinitions } from '../../actions/lib/actions'; |
3 | import Workspace from './models/Workspace'; | ||
4 | 4 | ||
5 | type WorkspaceArg = { workspace: Workspace }; | 5 | type WorkspaceArg = { workspace: Workspace }; |
6 | 6 | ||
diff --git a/src/features/workspaces/api.ts b/src/features/workspaces/api.ts index b8bb703cd..6ae71a930 100644 --- a/src/features/workspaces/api.ts +++ b/src/features/workspaces/api.ts | |||
@@ -1,8 +1,8 @@ | |||
1 | import { pick } from 'lodash'; | 1 | import { pick } from 'lodash'; |
2 | import apiBase from '../../api/apiBase'; | ||
2 | import { sendAuthRequest } from '../../api/utils/auth'; | 3 | import { sendAuthRequest } from '../../api/utils/auth'; |
3 | import Request from '../../stores/lib/Request'; | 4 | import Request from '../../stores/lib/Request'; |
4 | import Workspace from './models/Workspace'; | 5 | import Workspace from './models/Workspace'; |
5 | import apiBase from '../../api/apiBase'; | ||
6 | 6 | ||
7 | const debug = require('../../preload-safe-debug')( | 7 | const debug = require('../../preload-safe-debug')( |
8 | 'Ferdium:feature:workspaces:api', | 8 | 'Ferdium:feature:workspaces:api', |
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.tsx b/src/features/workspaces/components/CreateWorkspaceForm.tsx index b72052fe2..0c365564a 100644 --- a/src/features/workspaces/components/CreateWorkspaceForm.tsx +++ b/src/features/workspaces/components/CreateWorkspaceForm.tsx | |||
@@ -1,11 +1,15 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | 1 | import { observer } from 'mobx-react'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 2 | import { Component, type ReactElement } from 'react'; |
4 | import withStyles, { WithStylesProps } from 'react-jss'; | 3 | import { |
5 | import Input from '../../../components/ui/input/index'; | 4 | type WrappedComponentProps, |
5 | defineMessages, | ||
6 | injectIntl, | ||
7 | } from 'react-intl'; | ||
8 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
6 | import Button from '../../../components/ui/button'; | 9 | import Button from '../../../components/ui/button'; |
7 | import Form from '../../../lib/Form'; | 10 | import Input from '../../../components/ui/input/index'; |
8 | import { required } from '../../../helpers/validation-helpers'; | 11 | import { required } from '../../../helpers/validation-helpers'; |
12 | import Form from '../../../lib/Form'; | ||
9 | import { workspaceStore } from '../index'; | 13 | import { workspaceStore } from '../index'; |
10 | 14 | ||
11 | const messages = defineMessages({ | 15 | const messages = defineMessages({ |
diff --git a/src/features/workspaces/components/EditWorkspaceForm.tsx b/src/features/workspaces/components/EditWorkspaceForm.tsx index d902d29be..18e7c251e 100644 --- a/src/features/workspaces/components/EditWorkspaceForm.tsx +++ b/src/features/workspaces/components/EditWorkspaceForm.tsx | |||
@@ -1,21 +1,25 @@ | |||
1 | import { Component, ReactElement } from 'react'; | 1 | import { noop } from 'lodash'; |
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 3 | import { Component, type ReactElement } from 'react'; |
4 | import { | ||
5 | type WrappedComponentProps, | ||
6 | defineMessages, | ||
7 | injectIntl, | ||
8 | } from 'react-intl'; | ||
9 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
4 | import { Link } from 'react-router-dom'; | 10 | import { Link } from 'react-router-dom'; |
5 | import withStyles, { WithStylesProps } from 'react-jss'; | 11 | import Button from '../../../components/ui/button'; |
6 | import { noop } from 'lodash'; | 12 | import { H2 } from '../../../components/ui/headline'; |
7 | import Infobox from '../../../components/ui/infobox/index'; | 13 | import Infobox from '../../../components/ui/infobox/index'; |
8 | import Input from '../../../components/ui/input'; | 14 | import Input from '../../../components/ui/input'; |
9 | import Button from '../../../components/ui/button'; | 15 | import Toggle from '../../../components/ui/toggle'; |
10 | import Workspace from '../models/Workspace'; | 16 | import { KEEP_WS_LOADED_USID } from '../../../config'; |
11 | import Service from '../../../models/Service'; | ||
12 | import Form from '../../../lib/Form'; | ||
13 | import { required } from '../../../helpers/validation-helpers'; | 17 | import { required } from '../../../helpers/validation-helpers'; |
18 | import Form from '../../../lib/Form'; | ||
19 | import type Service from '../../../models/Service'; | ||
20 | import type Request from '../../../stores/lib/Request'; | ||
21 | import type Workspace from '../models/Workspace'; | ||
14 | import WorkspaceServiceListItem from './WorkspaceServiceListItem'; | 22 | import WorkspaceServiceListItem from './WorkspaceServiceListItem'; |
15 | import Request from '../../../stores/lib/Request'; | ||
16 | import { KEEP_WS_LOADED_USID } from '../../../config'; | ||
17 | import Toggle from '../../../components/ui/toggle'; | ||
18 | import { H2 } from '../../../components/ui/headline'; | ||
19 | 23 | ||
20 | const messages = defineMessages({ | 24 | const messages = defineMessages({ |
21 | buttonDelete: { | 25 | buttonDelete: { |
diff --git a/src/features/workspaces/components/WorkspaceDrawer.tsx b/src/features/workspaces/components/WorkspaceDrawer.tsx index 3e05cb7de..2826b741a 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.tsx +++ b/src/features/workspaces/components/WorkspaceDrawer.tsx | |||
@@ -1,17 +1,21 @@ | |||
1 | import { Component, ReactElement } from 'react'; | 1 | import { mdiCog, mdiPlusBox } from '@mdi/js'; |
2 | import { noop } from 'lodash'; | ||
2 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
3 | import withStyles, { WithStylesProps } from 'react-jss'; | 4 | import { Component, type ReactElement } from 'react'; |
4 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 5 | import { |
6 | type WrappedComponentProps, | ||
7 | defineMessages, | ||
8 | injectIntl, | ||
9 | } from 'react-intl'; | ||
10 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
5 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | 11 | import { Tooltip as ReactTooltip } from 'react-tooltip'; |
6 | import { mdiPlusBox, mdiCog } from '@mdi/js'; | ||
7 | import { noop } from 'lodash'; | ||
8 | import { H1 } from '../../../components/ui/headline'; | 12 | import { H1 } from '../../../components/ui/headline'; |
9 | import Icon from '../../../components/ui/icon'; | 13 | import Icon from '../../../components/ui/icon'; |
10 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; | ||
11 | import workspaceActions from '../actions'; | 14 | import workspaceActions from '../actions'; |
12 | import { workspaceStore } from '../index'; | ||
13 | import { getUserWorkspacesRequest } from '../api'; | 15 | import { getUserWorkspacesRequest } from '../api'; |
14 | import Workspace from '../models/Workspace'; | 16 | import { workspaceStore } from '../index'; |
17 | import type Workspace from '../models/Workspace'; | ||
18 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; | ||
15 | 19 | ||
16 | const messages = defineMessages({ | 20 | const messages = defineMessages({ |
17 | headline: { | 21 | headline: { |
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.tsx b/src/features/workspaces/components/WorkspaceDrawerItem.tsx index 85ed4c38c..1e4b57dba 100644 --- a/src/features/workspaces/components/WorkspaceDrawerItem.tsx +++ b/src/features/workspaces/components/WorkspaceDrawerItem.tsx | |||
@@ -1,11 +1,15 @@ | |||
1 | import { Component, MouseEventHandler, ReactElement } from 'react'; | 1 | import { Menu } from '@electron/remote'; |
2 | import { observer } from 'mobx-react'; | ||
3 | import withStyles, { WithStylesProps } from 'react-jss'; | ||
4 | import classnames from 'classnames'; | 2 | import classnames from 'classnames'; |
5 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 3 | import type { MenuItemConstructorOptions } from 'electron'; |
6 | import { noop } from 'lodash'; | 4 | import { noop } from 'lodash'; |
7 | import { Menu } from '@electron/remote'; | 5 | import { observer } from 'mobx-react'; |
8 | import { MenuItemConstructorOptions } from 'electron'; | 6 | import { Component, type MouseEventHandler, type ReactElement } from 'react'; |
7 | import { | ||
8 | type WrappedComponentProps, | ||
9 | defineMessages, | ||
10 | injectIntl, | ||
11 | } from 'react-intl'; | ||
12 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
9 | import { altKey, cmdOrCtrlShortcutKey } from '../../../environment'; | 13 | import { altKey, cmdOrCtrlShortcutKey } from '../../../environment'; |
10 | import { acceleratorString } from '../../../jsUtils'; | 14 | import { acceleratorString } from '../../../jsUtils'; |
11 | 15 | ||
diff --git a/src/features/workspaces/components/WorkspaceItem.tsx b/src/features/workspaces/components/WorkspaceItem.tsx index 36c6ed2f5..f24e6a85d 100644 --- a/src/features/workspaces/components/WorkspaceItem.tsx +++ b/src/features/workspaces/components/WorkspaceItem.tsx | |||
@@ -1,8 +1,8 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | ||
3 | import withStyles, { WithStylesProps } from 'react-jss'; | ||
4 | import { noop } from 'lodash'; | 1 | import { noop } from 'lodash'; |
5 | import Workspace from '../models/Workspace'; | 2 | import { observer } from 'mobx-react'; |
3 | import { Component, type ReactElement } from 'react'; | ||
4 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
5 | import type Workspace from '../models/Workspace'; | ||
6 | 6 | ||
7 | const styles = theme => ({ | 7 | const styles = theme => ({ |
8 | row: { | 8 | row: { |
diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.tsx b/src/features/workspaces/components/WorkspaceServiceListItem.tsx index 9034be37c..6f61f8a51 100644 --- a/src/features/workspaces/components/WorkspaceServiceListItem.tsx +++ b/src/features/workspaces/components/WorkspaceServiceListItem.tsx | |||
@@ -1,11 +1,11 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | ||
3 | import withStyles, { WithStylesProps } from 'react-jss'; | ||
4 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
5 | import { noop } from 'lodash'; | 2 | import { noop } from 'lodash'; |
6 | import Toggle from '../../../components/ui/toggle'; | 3 | import { observer } from 'mobx-react'; |
4 | import { Component, type ReactElement } from 'react'; | ||
5 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
7 | import ServiceIcon from '../../../components/ui/ServiceIcon'; | 6 | import ServiceIcon from '../../../components/ui/ServiceIcon'; |
8 | import Service from '../../../models/Service'; | 7 | import Toggle from '../../../components/ui/toggle'; |
8 | import type Service from '../../../models/Service'; | ||
9 | 9 | ||
10 | const styles = theme => ({ | 10 | const styles = theme => ({ |
11 | listItem: { | 11 | listItem: { |
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx b/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx index 19dd9037d..7fddd8553 100644 --- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx +++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx | |||
@@ -1,11 +1,15 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | ||
3 | import withStyles, { WithStylesProps } from 'react-jss'; | ||
4 | import classnames from 'classnames'; | 1 | import classnames from 'classnames'; |
5 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 2 | import { observer } from 'mobx-react'; |
3 | import { Component, type ReactElement } from 'react'; | ||
4 | import { | ||
5 | type WrappedComponentProps, | ||
6 | defineMessages, | ||
7 | injectIntl, | ||
8 | } from 'react-intl'; | ||
9 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
6 | import Loader from '../../../components/ui/loader'; | 10 | import Loader from '../../../components/ui/loader'; |
7 | import { workspaceStore } from '../index'; | ||
8 | import { DEFAULT_LOADER_COLOR } from '../../../config'; | 11 | import { DEFAULT_LOADER_COLOR } from '../../../config'; |
12 | import { workspaceStore } from '../index'; | ||
9 | 13 | ||
10 | const messages = defineMessages({ | 14 | const messages = defineMessages({ |
11 | switchingTo: { | 15 | switchingTo: { |
diff --git a/src/features/workspaces/components/WorkspacesDashboard.tsx b/src/features/workspaces/components/WorkspacesDashboard.tsx index 0a417bffd..8fb2cf923 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.tsx +++ b/src/features/workspaces/components/WorkspacesDashboard.tsx | |||
@@ -1,15 +1,19 @@ | |||
1 | import { Component, ReactElement } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | 1 | import { observer } from 'mobx-react'; |
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | 2 | import { Component, type ReactElement } from 'react'; |
4 | import withStyles, { WithStylesProps } from 'react-jss'; | 3 | import { |
4 | type WrappedComponentProps, | ||
5 | defineMessages, | ||
6 | injectIntl, | ||
7 | } from 'react-intl'; | ||
8 | import withStyles, { type WithStylesProps } from 'react-jss'; | ||
9 | import Appear from '../../../components/ui/effects/Appear'; | ||
10 | import { H1 } from '../../../components/ui/headline'; | ||
5 | import Infobox from '../../../components/ui/infobox/index'; | 11 | import Infobox from '../../../components/ui/infobox/index'; |
6 | import Loader from '../../../components/ui/loader'; | 12 | import Loader from '../../../components/ui/loader'; |
7 | import WorkspaceItem from './WorkspaceItem'; | 13 | import type Request from '../../../stores/lib/Request'; |
14 | import type Workspace from '../models/Workspace'; | ||
8 | import CreateWorkspaceForm from './CreateWorkspaceForm'; | 15 | import CreateWorkspaceForm from './CreateWorkspaceForm'; |
9 | import Request from '../../../stores/lib/Request'; | 16 | import WorkspaceItem from './WorkspaceItem'; |
10 | import Appear from '../../../components/ui/effects/Appear'; | ||
11 | import { H1 } from '../../../components/ui/headline'; | ||
12 | import Workspace from '../models/Workspace'; | ||
13 | 17 | ||
14 | const messages = defineMessages({ | 18 | const messages = defineMessages({ |
15 | headline: { | 19 | headline: { |
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.tsx b/src/features/workspaces/containers/EditWorkspaceScreen.tsx index abc747c33..92450d685 100644 --- a/src/features/workspaces/containers/EditWorkspaceScreen.tsx +++ b/src/features/workspaces/containers/EditWorkspaceScreen.tsx | |||
@@ -1,12 +1,12 @@ | |||
1 | import { Component } from 'react'; | ||
2 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
2 | import { Component } from 'react'; | ||
3 | 3 | ||
4 | import { StoresProps } from '../../../@types/ferdium-components.types'; | 4 | import type { StoresProps } from '../../../@types/ferdium-components.types'; |
5 | import ErrorBoundary from '../../../components/util/ErrorBoundary'; | 5 | import ErrorBoundary from '../../../components/util/ErrorBoundary'; |
6 | import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api'; | ||
6 | import EditWorkspaceForm from '../components/EditWorkspaceForm'; | 7 | import EditWorkspaceForm from '../components/EditWorkspaceForm'; |
7 | import Workspace from '../models/Workspace'; | ||
8 | import { workspaceStore } from '../index'; | 8 | import { workspaceStore } from '../index'; |
9 | import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api'; | 9 | import Workspace from '../models/Workspace'; |
10 | 10 | ||
11 | class EditWorkspaceScreen extends Component<StoresProps> { | 11 | class EditWorkspaceScreen extends Component<StoresProps> { |
12 | onDelete = () => { | 12 | onDelete = () => { |
diff --git a/src/features/workspaces/containers/WorkspacesScreen.tsx b/src/features/workspaces/containers/WorkspacesScreen.tsx index 39f19935f..92565b45c 100644 --- a/src/features/workspaces/containers/WorkspacesScreen.tsx +++ b/src/features/workspaces/containers/WorkspacesScreen.tsx | |||
@@ -1,16 +1,16 @@ | |||
1 | import { Component } from 'react'; | ||
2 | import { inject, observer } from 'mobx-react'; | 1 | import { inject, observer } from 'mobx-react'; |
3 | import { StoresProps } from '../../../@types/ferdium-components.types'; | 2 | import { Component } from 'react'; |
4 | import WorkspacesDashboard from '../components/WorkspacesDashboard'; | 3 | import type { StoresProps } from '../../../@types/ferdium-components.types'; |
5 | import ErrorBoundary from '../../../components/util/ErrorBoundary'; | 4 | import ErrorBoundary from '../../../components/util/ErrorBoundary'; |
6 | import { workspaceStore } from '../index'; | ||
7 | import { | 5 | import { |
8 | createWorkspaceRequest, | 6 | createWorkspaceRequest, |
9 | deleteWorkspaceRequest, | 7 | deleteWorkspaceRequest, |
10 | getUserWorkspacesRequest, | 8 | getUserWorkspacesRequest, |
11 | updateWorkspaceRequest, | 9 | updateWorkspaceRequest, |
12 | } from '../api'; | 10 | } from '../api'; |
13 | import Workspace from '../models/Workspace'; | 11 | import WorkspacesDashboard from '../components/WorkspacesDashboard'; |
12 | import { workspaceStore } from '../index'; | ||
13 | import type Workspace from '../models/Workspace'; | ||
14 | 14 | ||
15 | interface IProps extends StoresProps {} | 15 | interface IProps extends StoresProps {} |
16 | 16 | ||
diff --git a/src/features/workspaces/store.ts b/src/features/workspaces/store.ts index f97009186..41bf5d6f4 100644 --- a/src/features/workspaces/store.ts +++ b/src/features/workspaces/store.ts | |||
@@ -1,8 +1,10 @@ | |||
1 | import { computed, observable, action, makeObservable } from 'mobx'; | 1 | import { action, computed, makeObservable, observable } from 'mobx'; |
2 | import localStorage from 'mobx-localstorage'; | 2 | import localStorage from 'mobx-localstorage'; |
3 | import matchRoute from '../../helpers/routing-helpers'; | 3 | import matchRoute from '../../helpers/routing-helpers'; |
4 | import workspaceActions from './actions'; | 4 | import { createReactions } from '../../stores/lib/Reaction'; |
5 | import { createActionBindings } from '../utils/ActionBinding'; | ||
5 | import FeatureStore from '../utils/FeatureStore'; | 6 | import FeatureStore from '../utils/FeatureStore'; |
7 | import workspaceActions from './actions'; | ||
6 | import { | 8 | import { |
7 | createWorkspaceRequest, | 9 | createWorkspaceRequest, |
8 | deleteWorkspaceRequest, | 10 | deleteWorkspaceRequest, |
@@ -10,12 +12,10 @@ import { | |||
10 | updateWorkspaceRequest, | 12 | updateWorkspaceRequest, |
11 | } from './api'; | 13 | } from './api'; |
12 | import { WORKSPACES_ROUTES } from './constants'; | 14 | import { WORKSPACES_ROUTES } from './constants'; |
13 | import { createReactions } from '../../stores/lib/Reaction'; | ||
14 | import { createActionBindings } from '../utils/ActionBinding'; | ||
15 | 15 | ||
16 | import type { Actions } from '../../actions/lib/actions'; | ||
16 | import { KEEP_WS_LOADED_USID } from '../../config'; | 17 | import { KEEP_WS_LOADED_USID } from '../../config'; |
17 | import Workspace from './models/Workspace'; | 18 | import type Workspace from './models/Workspace'; |
18 | import { Actions } from '../../actions/lib/actions'; | ||
19 | 19 | ||
20 | const debug = require('../../preload-safe-debug')( | 20 | const debug = require('../../preload-safe-debug')( |
21 | 'Ferdium:feature:workspaces:store', | 21 | 'Ferdium:feature:workspaces:store', |