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/workspaces | |
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/workspaces')
13 files changed, 94 insertions, 70 deletions
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', |