From 2f3f2ae7f098376f535e5aa993c9eedc14e36f5d Mon Sep 17 00:00:00 2001 From: Vijay A Date: Fri, 22 Mar 2024 02:33:33 +0530 Subject: Upgrade node modules --- src/features/workspaces/actions.ts | 2 +- src/features/workspaces/api.ts | 2 +- .../workspaces/components/CreateWorkspaceForm.tsx | 14 +++++++---- .../workspaces/components/EditWorkspaceForm.tsx | 28 ++++++++++++---------- .../workspaces/components/WorkspaceDrawer.tsx | 20 +++++++++------- .../workspaces/components/WorkspaceDrawerItem.tsx | 16 ++++++++----- .../workspaces/components/WorkspaceItem.tsx | 8 +++---- .../components/WorkspaceServiceListItem.tsx | 10 ++++---- .../components/WorkspaceSwitchingIndicator.tsx | 14 +++++++---- .../workspaces/components/WorkspacesDashboard.tsx | 20 +++++++++------- .../workspaces/containers/EditWorkspaceScreen.tsx | 8 +++---- .../workspaces/containers/WorkspacesScreen.tsx | 10 ++++---- src/features/workspaces/store.ts | 12 +++++----- 13 files changed, 94 insertions(+), 70 deletions(-) (limited to 'src/features/workspaces') 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 @@ import PropTypes from 'prop-types'; -import Workspace from './models/Workspace'; import { createActionsFromDefinitions } from '../../actions/lib/actions'; +import Workspace from './models/Workspace'; type WorkspaceArg = { workspace: Workspace }; 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 @@ import { pick } from 'lodash'; +import apiBase from '../../api/apiBase'; import { sendAuthRequest } from '../../api/utils/auth'; import Request from '../../stores/lib/Request'; import Workspace from './models/Workspace'; -import apiBase from '../../api/apiBase'; const debug = require('../../preload-safe-debug')( '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 @@ -import { Component, ReactElement } from 'react'; import { observer } from 'mobx-react'; -import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; -import withStyles, { WithStylesProps } from 'react-jss'; -import Input from '../../../components/ui/input/index'; +import { Component, type ReactElement } from 'react'; +import { + type WrappedComponentProps, + defineMessages, + injectIntl, +} from 'react-intl'; +import withStyles, { type WithStylesProps } from 'react-jss'; import Button from '../../../components/ui/button'; -import Form from '../../../lib/Form'; +import Input from '../../../components/ui/input/index'; import { required } from '../../../helpers/validation-helpers'; +import Form from '../../../lib/Form'; import { workspaceStore } from '../index'; 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 @@ -import { Component, ReactElement } from 'react'; +import { noop } from 'lodash'; import { observer } from 'mobx-react'; -import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; +import { Component, type ReactElement } from 'react'; +import { + type WrappedComponentProps, + defineMessages, + injectIntl, +} from 'react-intl'; +import withStyles, { type WithStylesProps } from 'react-jss'; import { Link } from 'react-router-dom'; -import withStyles, { WithStylesProps } from 'react-jss'; -import { noop } from 'lodash'; +import Button from '../../../components/ui/button'; +import { H2 } from '../../../components/ui/headline'; import Infobox from '../../../components/ui/infobox/index'; import Input from '../../../components/ui/input'; -import Button from '../../../components/ui/button'; -import Workspace from '../models/Workspace'; -import Service from '../../../models/Service'; -import Form from '../../../lib/Form'; +import Toggle from '../../../components/ui/toggle'; +import { KEEP_WS_LOADED_USID } from '../../../config'; import { required } from '../../../helpers/validation-helpers'; +import Form from '../../../lib/Form'; +import type Service from '../../../models/Service'; +import type Request from '../../../stores/lib/Request'; +import type Workspace from '../models/Workspace'; import WorkspaceServiceListItem from './WorkspaceServiceListItem'; -import Request from '../../../stores/lib/Request'; -import { KEEP_WS_LOADED_USID } from '../../../config'; -import Toggle from '../../../components/ui/toggle'; -import { H2 } from '../../../components/ui/headline'; const messages = defineMessages({ 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 @@ -import { Component, ReactElement } from 'react'; +import { mdiCog, mdiPlusBox } from '@mdi/js'; +import { noop } from 'lodash'; import { observer } from 'mobx-react'; -import withStyles, { WithStylesProps } from 'react-jss'; -import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; +import { Component, type ReactElement } from 'react'; +import { + type WrappedComponentProps, + defineMessages, + injectIntl, +} from 'react-intl'; +import withStyles, { type WithStylesProps } from 'react-jss'; import { Tooltip as ReactTooltip } from 'react-tooltip'; -import { mdiPlusBox, mdiCog } from '@mdi/js'; -import { noop } from 'lodash'; import { H1 } from '../../../components/ui/headline'; import Icon from '../../../components/ui/icon'; -import WorkspaceDrawerItem from './WorkspaceDrawerItem'; import workspaceActions from '../actions'; -import { workspaceStore } from '../index'; import { getUserWorkspacesRequest } from '../api'; -import Workspace from '../models/Workspace'; +import { workspaceStore } from '../index'; +import type Workspace from '../models/Workspace'; +import WorkspaceDrawerItem from './WorkspaceDrawerItem'; const messages = defineMessages({ 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 @@ -import { Component, MouseEventHandler, ReactElement } from 'react'; -import { observer } from 'mobx-react'; -import withStyles, { WithStylesProps } from 'react-jss'; +import { Menu } from '@electron/remote'; import classnames from 'classnames'; -import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; +import type { MenuItemConstructorOptions } from 'electron'; import { noop } from 'lodash'; -import { Menu } from '@electron/remote'; -import { MenuItemConstructorOptions } from 'electron'; +import { observer } from 'mobx-react'; +import { Component, type MouseEventHandler, type ReactElement } from 'react'; +import { + type WrappedComponentProps, + defineMessages, + injectIntl, +} from 'react-intl'; +import withStyles, { type WithStylesProps } from 'react-jss'; import { altKey, cmdOrCtrlShortcutKey } from '../../../environment'; import { acceleratorString } from '../../../jsUtils'; 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 @@ -import { Component, ReactElement } from 'react'; -import { observer } from 'mobx-react'; -import withStyles, { WithStylesProps } from 'react-jss'; import { noop } from 'lodash'; -import Workspace from '../models/Workspace'; +import { observer } from 'mobx-react'; +import { Component, type ReactElement } from 'react'; +import withStyles, { type WithStylesProps } from 'react-jss'; +import type Workspace from '../models/Workspace'; const styles = theme => ({ 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 @@ -import { Component, ReactElement } from 'react'; -import { observer } from 'mobx-react'; -import withStyles, { WithStylesProps } from 'react-jss'; import classnames from 'classnames'; import { noop } from 'lodash'; -import Toggle from '../../../components/ui/toggle'; +import { observer } from 'mobx-react'; +import { Component, type ReactElement } from 'react'; +import withStyles, { type WithStylesProps } from 'react-jss'; import ServiceIcon from '../../../components/ui/ServiceIcon'; -import Service from '../../../models/Service'; +import Toggle from '../../../components/ui/toggle'; +import type Service from '../../../models/Service'; const styles = theme => ({ 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 @@ -import { Component, ReactElement } from 'react'; -import { observer } from 'mobx-react'; -import withStyles, { WithStylesProps } from 'react-jss'; import classnames from 'classnames'; -import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; +import { observer } from 'mobx-react'; +import { Component, type ReactElement } from 'react'; +import { + type WrappedComponentProps, + defineMessages, + injectIntl, +} from 'react-intl'; +import withStyles, { type WithStylesProps } from 'react-jss'; import Loader from '../../../components/ui/loader'; -import { workspaceStore } from '../index'; import { DEFAULT_LOADER_COLOR } from '../../../config'; +import { workspaceStore } from '../index'; const messages = defineMessages({ 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 @@ -import { Component, ReactElement } from 'react'; import { observer } from 'mobx-react'; -import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; -import withStyles, { WithStylesProps } from 'react-jss'; +import { Component, type ReactElement } from 'react'; +import { + type WrappedComponentProps, + defineMessages, + injectIntl, +} from 'react-intl'; +import withStyles, { type WithStylesProps } from 'react-jss'; +import Appear from '../../../components/ui/effects/Appear'; +import { H1 } from '../../../components/ui/headline'; import Infobox from '../../../components/ui/infobox/index'; import Loader from '../../../components/ui/loader'; -import WorkspaceItem from './WorkspaceItem'; +import type Request from '../../../stores/lib/Request'; +import type Workspace from '../models/Workspace'; import CreateWorkspaceForm from './CreateWorkspaceForm'; -import Request from '../../../stores/lib/Request'; -import Appear from '../../../components/ui/effects/Appear'; -import { H1 } from '../../../components/ui/headline'; -import Workspace from '../models/Workspace'; +import WorkspaceItem from './WorkspaceItem'; const messages = defineMessages({ 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 @@ -import { Component } from 'react'; import { inject, observer } from 'mobx-react'; +import { Component } from 'react'; -import { StoresProps } from '../../../@types/ferdium-components.types'; +import type { StoresProps } from '../../../@types/ferdium-components.types'; import ErrorBoundary from '../../../components/util/ErrorBoundary'; +import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api'; import EditWorkspaceForm from '../components/EditWorkspaceForm'; -import Workspace from '../models/Workspace'; import { workspaceStore } from '../index'; -import { deleteWorkspaceRequest, updateWorkspaceRequest } from '../api'; +import Workspace from '../models/Workspace'; class EditWorkspaceScreen extends Component { 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 @@ -import { Component } from 'react'; import { inject, observer } from 'mobx-react'; -import { StoresProps } from '../../../@types/ferdium-components.types'; -import WorkspacesDashboard from '../components/WorkspacesDashboard'; +import { Component } from 'react'; +import type { StoresProps } from '../../../@types/ferdium-components.types'; import ErrorBoundary from '../../../components/util/ErrorBoundary'; -import { workspaceStore } from '../index'; import { createWorkspaceRequest, deleteWorkspaceRequest, getUserWorkspacesRequest, updateWorkspaceRequest, } from '../api'; -import Workspace from '../models/Workspace'; +import WorkspacesDashboard from '../components/WorkspacesDashboard'; +import { workspaceStore } from '../index'; +import type Workspace from '../models/Workspace'; interface IProps extends StoresProps {} 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 @@ -import { computed, observable, action, makeObservable } from 'mobx'; +import { action, computed, makeObservable, observable } from 'mobx'; import localStorage from 'mobx-localstorage'; import matchRoute from '../../helpers/routing-helpers'; -import workspaceActions from './actions'; +import { createReactions } from '../../stores/lib/Reaction'; +import { createActionBindings } from '../utils/ActionBinding'; import FeatureStore from '../utils/FeatureStore'; +import workspaceActions from './actions'; import { createWorkspaceRequest, deleteWorkspaceRequest, @@ -10,12 +12,10 @@ import { updateWorkspaceRequest, } from './api'; import { WORKSPACES_ROUTES } from './constants'; -import { createReactions } from '../../stores/lib/Reaction'; -import { createActionBindings } from '../utils/ActionBinding'; +import type { Actions } from '../../actions/lib/actions'; import { KEEP_WS_LOADED_USID } from '../../config'; -import Workspace from './models/Workspace'; -import { Actions } from '../../actions/lib/actions'; +import type Workspace from './models/Workspace'; const debug = require('../../preload-safe-debug')( 'Ferdium:feature:workspaces:store', -- cgit v1.2.3-70-g09d2