From 3eb091a54be4c7fe63a22dd1eac74c82db9c59f9 Mon Sep 17 00:00:00 2001 From: "Jingwei.Zhang" Date: Mon, 25 Apr 2022 09:53:46 +0800 Subject: [PATCH] fix: remove @ alias when import file Remove @ alias when import file, can use folder in the src to short import Change-Id: I9fa494cb93f152a03b6dcf3c0ecda0d31e747ea3 --- .eslintrc | 4 -- config/webpack.common.js | 1 - jest.config.js | 1 - jsconfig.json | 1 - .../containers/Backups/Detail/index.jsx | 28 ++++---- .../containers/Backups/actions/Create.jsx | 56 +++++++-------- .../Configurations/Detail/index.jsx | 42 +++++------ .../Configurations/actions/Create.jsx | 72 +++++++++---------- .../containers/Instances/Detail/index.jsx | 66 ++++++++--------- .../actions/StepCreate/StepAdvanced/index.jsx | 24 +++---- .../actions/StepCreate/StepDetails/index.jsx | 23 +++--- .../Instances/actions/StepCreate/index.jsx | 19 +++-- .../database/containers/Instances/index.jsx | 2 +- .../ShareGroupType/actions/Create.jsx | 4 +- .../ShareGroupType/actions/Delete.jsx | 2 +- .../ShareGroupType/actions/ManageAccess.jsx | 2 +- .../share/containers/ShareGroupType/index.jsx | 2 +- .../share/containers/ShareInstance/index.jsx | 2 +- .../containers/ShareType/actions/Create.jsx | 2 +- .../containers/ShareType/actions/Delete.jsx | 2 +- .../containers/ShareType/actions/Edit.jsx | 2 +- .../ShareType/actions/ManageAccess.jsx | 4 +- .../share/containers/ShareType/index.jsx | 2 +- 23 files changed, 177 insertions(+), 186 deletions(-) diff --git a/.eslintrc b/.eslintrc index f1208427..1d38d6cd 100644 --- a/.eslintrc +++ b/.eslintrc @@ -27,10 +27,6 @@ "import/resolver": { "alias": { "map": [ - [ - "@", - "./src" - ], [ "src", "./src" diff --git a/config/webpack.common.js b/config/webpack.common.js index c5a8c84b..eba3d21f 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -113,7 +113,6 @@ module.exports = { extensions: ['.js', '.jsx'], modules: [root('src'), root('src/pages'), 'node_modules'], alias: { - '@': root('src'), src: root('src'), asset: root('src/asset'), image: root('src/asset/image'), diff --git a/jest.config.js b/jest.config.js index 1ad15170..c3261807 100644 --- a/jest.config.js +++ b/jest.config.js @@ -21,7 +21,6 @@ module.exports = { moduleNameMapper: { '.+\\.(css|styl|less|sass|scss)$': 'identity-obj-proxy', '\\.svg': '/test/unit/svg-mock.js', - '^@/(.*)$': '/src/$1', '^src(.*)$': '/src$1', '^components(.*)$': '/src/components$1', '^layouts(.*)$': '/src/layouts$1', diff --git a/jsconfig.json b/jsconfig.json index a03e0f1c..453a9f8b 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -4,7 +4,6 @@ "baseUrl": ".", "experimentalDecorators": true, "paths": { - "@/*": ["./src/*"], "client/*": ["./src/client/*"], "src/*": ["./src/*"], "asset/*": ["./src/asset/*"], diff --git a/src/pages/database/containers/Backups/Detail/index.jsx b/src/pages/database/containers/Backups/Detail/index.jsx index 83289293..452cb771 100644 --- a/src/pages/database/containers/Backups/Detail/index.jsx +++ b/src/pages/database/containers/Backups/Detail/index.jsx @@ -14,8 +14,8 @@ import { inject, observer } from 'mobx-react'; import Base from 'containers/TabDetail'; +import { BackupsStore } from 'stores/trove/backups'; import BaseDetail from './BaseDetail'; -import { BackupsStore } from '@/stores/trove/backups'; @inject('rootStore') @observer @@ -25,7 +25,7 @@ export default class BackupsDetail extends Base { } get name() { - return "Backup Detail" + return 'Backup Detail'; } get listUrl() { @@ -39,23 +39,23 @@ export default class BackupsDetail extends Base { get detailInfos() { return [ { - title: t("Name"), - dataIndex: "name" + title: t('Name'), + dataIndex: 'name', }, { - title: t("Description"), - dataIndex: "description" - } - ] + title: t('Description'), + dataIndex: 'description', + }, + ]; } get tabs() { return [ { - title: t("General Info"), - key: "general_info", - component: BaseDetail - } - ] + title: t('General Info'), + key: 'general_info', + component: BaseDetail, + }, + ]; } -} \ No newline at end of file +} diff --git a/src/pages/database/containers/Backups/actions/Create.jsx b/src/pages/database/containers/Backups/actions/Create.jsx index 2a9615a2..28b1e186 100644 --- a/src/pages/database/containers/Backups/actions/Create.jsx +++ b/src/pages/database/containers/Backups/actions/Create.jsx @@ -12,26 +12,25 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { ModalAction } from "@/containers/Action"; -import { inject, observer } from "mobx-react"; -import globalInstancesStore from "stores/trove/instances"; -import globalBackupsStore from "stores/trove/backups"; +import { ModalAction } from 'containers/Action'; +import { inject, observer } from 'mobx-react'; +import globalInstancesStore from 'stores/trove/instances'; +import globalBackupsStore from 'stores/trove/backups'; @inject('rootStore') @observer export default class Create extends ModalAction { - init() { this.store = globalBackupsStore; this.getDatabaseInstance(); } - static id = "create-backups"; + static id = 'create-backups'; - static title = t("Create Backups"); + static title = t('Create Backups'); static get modalSize() { - return "middle"; + return 'middle'; } getModalSize() { @@ -39,21 +38,20 @@ export default class Create extends ModalAction { } get name() { - return t("Create Backups"); + return t('Create Backups'); } - static policy = "trove:backup:create"; + static policy = 'trove:backup:create'; static allowed() { return Promise.resolve(true); } get listInstanceName() { - return (globalInstancesStore.list.data || []) - .map((it) => ({ - value: it.id, - label: it.name, - })); + return (globalInstancesStore.list.data || []).map((it) => ({ + value: it.id, + label: it.name, + })); } async getDatabaseInstance() { @@ -63,24 +61,24 @@ export default class Create extends ModalAction { get formItems() { return [ { - name: "name", - label: t("Backup Name"), - type: "input", - required: true + name: 'name', + label: t('Backup Name'), + type: 'input', + required: true, }, { - name: "instance", - label: t("Database Instance"), - type: "select", + name: 'instance', + label: t('Database Instance'), + type: 'select', options: this.listInstanceName, - required: true + required: true, }, { - name: "description", - label: t("Description"), - type: "input" - } - ] + name: 'description', + label: t('Description'), + type: 'input', + }, + ]; } onSubmit = (values) => { @@ -92,4 +90,4 @@ export default class Create extends ModalAction { }, }); }; -} \ No newline at end of file +} diff --git a/src/pages/database/containers/Configurations/Detail/index.jsx b/src/pages/database/containers/Configurations/Detail/index.jsx index 6974ebe5..9e9275bb 100644 --- a/src/pages/database/containers/Configurations/Detail/index.jsx +++ b/src/pages/database/containers/Configurations/Detail/index.jsx @@ -14,8 +14,8 @@ import { inject, observer } from 'mobx-react'; import Base from 'containers/TabDetail'; +import globalConfigurationsStore from 'stores/trove/configurations'; import BaseDetail from './BaseDetail'; -import globalConfigurationsStore from '@/stores/trove/configurations'; import Values from './Values'; import Instances from './Instances'; @@ -27,7 +27,7 @@ export default class ConfigurationsDetail extends Base { } get name() { - return "Configurations Detail" + return 'Configurations Detail'; } get listUrl() { @@ -41,27 +41,29 @@ export default class ConfigurationsDetail extends Base { get detailInfos() { return [ { - title: t("Name"), - dataIndex: "name" - } - ] + title: t('Name'), + dataIndex: 'name', + }, + ]; } get tabs() { return [ { - title: t("General Info"), - key: "general_info", - component: BaseDetail - }, { - title: t("Values"), - key: "values", - component: Values - }, { - title: t("Instances"), - key: "instances", - component: Instances - } - ] + title: t('General Info'), + key: 'general_info', + component: BaseDetail, + }, + { + title: t('Values'), + key: 'values', + component: Values, + }, + { + title: t('Instances'), + key: 'instances', + component: Instances, + }, + ]; } -} \ No newline at end of file +} diff --git a/src/pages/database/containers/Configurations/actions/Create.jsx b/src/pages/database/containers/Configurations/actions/Create.jsx index 06208e60..aacb0bd7 100644 --- a/src/pages/database/containers/Configurations/actions/Create.jsx +++ b/src/pages/database/containers/Configurations/actions/Create.jsx @@ -12,28 +12,27 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { ModalAction } from "@/containers/Action"; -import { inject, observer } from "mobx-react"; -import globalInstancesStore from "stores/trove/instances"; -import globalConfigurationsStore from "stores/trove/configurations"; +import { ModalAction } from 'containers/Action'; +import { inject, observer } from 'mobx-react'; +import globalInstancesStore from 'stores/trove/instances'; +import globalConfigurationsStore from 'stores/trove/configurations'; import { toJS } from 'mobx'; @inject('rootStore') @observer export default class Create extends ModalAction { - init() { this.store = globalConfigurationsStore; this.getDatastores(); this.state.datastore_type = null; } - static id = "create-configurations"; + static id = 'create-configurations'; - static title = t("Create Configurations"); + static title = t('Create Configurations'); static get modalSize() { - return "middle"; + return 'middle'; } getModalSize() { @@ -41,10 +40,10 @@ export default class Create extends ModalAction { } get name() { - return t("Create Configurations"); + return t('Create Configurations'); } - static policy = "trove:configuration:create"; + static policy = 'trove:configuration:create'; static allowed() { return Promise.resolve(true); @@ -64,53 +63,54 @@ export default class Create extends ModalAction { onChangeDatastoresTypeChange = (value) => { this.setState({ - datastore_type: value - }) + datastore_type: value, + }); this.resetFormValue(['datastore_version']); }; get datastoresVersion() { - var dizi = (this.datastores).filter((item) => item.label === this.state.datastoreType) + const dizi = this.datastores + .filter((item) => item.label === this.state.datastoreType) .map((it) => { return it.originData.versions.map((e) => ({ label: e.name, - value: e.name - })) - }) + value: e.name, + })); + }); return dizi[0]; } get formItems() { return [ { - name: "name", - label: t("Name"), - type: "input", - required: true + name: 'name', + label: t('Name'), + type: 'input', + required: true, }, { - name: "description", - label: t("Description"), - type: "input" + name: 'description', + label: t('Description'), + type: 'input', }, { - name: "datastore_type", - label: t("Datastore Type"), - type: "select", + name: 'datastore_type', + label: t('Datastore Type'), + type: 'select', options: this.datastores, onChange: (value) => { - this.onChangeDatastoresTypeChange(value) + this.onChangeDatastoresTypeChange(value); }, required: true, }, { - name: "datastore_version", - label: t("Datastore Version"), - type: "select", + name: 'datastore_version', + label: t('Datastore Version'), + type: 'select', options: this.datastoresVersion, required: true, }, - ] + ]; } onSubmit = (values) => { @@ -123,9 +123,9 @@ export default class Create extends ModalAction { }, name: values.name, values: { - connect_timeout: 200 - } - } - }) + connect_timeout: 200, + }, + }, + }); }; -} \ No newline at end of file +} diff --git a/src/pages/database/containers/Instances/Detail/index.jsx b/src/pages/database/containers/Instances/Detail/index.jsx index 88e3a243..05646f85 100644 --- a/src/pages/database/containers/Instances/Detail/index.jsx +++ b/src/pages/database/containers/Instances/Detail/index.jsx @@ -14,8 +14,8 @@ import { inject, observer } from 'mobx-react'; import Base from 'containers/TabDetail'; +import globalInstancesStore from 'stores/trove/instances'; import BaseDetail from './BaseDetail'; -import globalInstancesStore from '@/stores/trove/instances'; import Users from './Users'; import Databases from './Databases'; import Backups from './Backups'; @@ -30,7 +30,7 @@ export default class InstancesDetail extends Base { } get name() { - return t("Backup Detail"); + return t('Backup Detail'); } get policy() { @@ -44,56 +44,56 @@ export default class InstancesDetail extends Base { get detailInfos() { return [ { - title: t("ID"), - dataIndex: "id" + title: t('ID'), + dataIndex: 'id', }, { - title: t("Name"), - dataIndex: "name" + title: t('Name'), + dataIndex: 'name', }, { - title: t("Status"), - dataIndex: "status" + title: t('Status'), + dataIndex: 'status', }, { - title: t("Tenant Id"), - dataIndex: "tenant_id" - } - ] + title: t('Tenant Id'), + dataIndex: 'tenant_id', + }, + ]; } get tabs() { return [ { - title: t("General Info"), - key: "general_info", - component: BaseDetail + title: t('General Info'), + key: 'general_info', + component: BaseDetail, }, { - title: t("Users"), - key: "users", - component: Users + title: t('Users'), + key: 'users', + component: Users, }, { - title: t("Databases"), - key: "databases", - component: Databases + title: t('Databases'), + key: 'databases', + component: Databases, }, { - title: t("Backups"), - key: "backups", - component: Backups + title: t('Backups'), + key: 'backups', + component: Backups, }, { - title: t("Logs"), - key: "logs", - component: Logs + title: t('Logs'), + key: 'logs', + component: Logs, }, { - title: t("Defaults"), - key: "defaults", - component: Defaults - } - ] + title: t('Defaults'), + key: 'defaults', + component: Defaults, + }, + ]; } -} \ No newline at end of file +} diff --git a/src/pages/database/containers/Instances/actions/StepCreate/StepAdvanced/index.jsx b/src/pages/database/containers/Instances/actions/StepCreate/StepAdvanced/index.jsx index 9903e132..1aca0e17 100644 --- a/src/pages/database/containers/Instances/actions/StepCreate/StepAdvanced/index.jsx +++ b/src/pages/database/containers/Instances/actions/StepCreate/StepAdvanced/index.jsx @@ -1,14 +1,14 @@ import { inject, observer } from 'mobx-react'; import Base from 'components/Form'; -import globalInstancesStore from '@/stores/trove/instances'; +import globalInstancesStore from 'stores/trove/instances'; @inject('rootStore') @observer export default class StepAdvanced extends Base { - init() { this.getConfigurationGroups(); } + get title() { return t('Initialize Databases'); } @@ -22,7 +22,7 @@ export default class StepAdvanced extends Base { get configurationGroup() { return (globalInstancesStore.list.data || []).map((it) => ({ label: it.name, - value: it.id + value: it.id, })); } @@ -33,19 +33,19 @@ export default class StepAdvanced extends Base { get formItems() { return [ { - name: "project", - label: t("Project"), - type: "label" + name: 'project', + label: t('Project'), + type: 'label', }, { - type: "divider" + type: 'divider', }, { - name: "configurationGroup", - label: t("Configuration Group"), + name: 'configurationGroup', + label: t('Configuration Group'), type: 'select', - options: this.configurationGroup - } - ] + options: this.configurationGroup, + }, + ]; } } diff --git a/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx b/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx index 82903964..0f43e3fa 100644 --- a/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx +++ b/src/pages/database/containers/Instances/actions/StepCreate/StepDetails/index.jsx @@ -16,9 +16,9 @@ import React from 'react'; import { inject, observer } from 'mobx-react'; import Base from 'components/Form'; import { toJS } from 'mobx'; -import globalInstancesStore from '@/stores/trove/instances'; +import globalInstancesStore from 'stores/trove/instances'; import globalAvailabilityZoneStore from 'stores/nova/zone'; -import FlavorSelectTable from '@/pages/compute/containers/Instance/components/FlavorSelectTable'; +import FlavorSelectTable from 'pages/compute/containers/Instance/components/FlavorSelectTable'; @inject('rootStore') @observer @@ -45,7 +45,7 @@ export default class StepDetails extends Base { get defaultValue() { const values = { - project: this.currentProjectName + project: this.currentProjectName, }; return values; } @@ -77,19 +77,20 @@ export default class StepDetails extends Base { onChangeDatastoresTypeChange = (value) => { this.setState({ - datastoreType: value + datastoreType: value, }); - this.resetFormValue(["datastore_version"]); - } + this.resetFormValue(['datastore_version']); + }; get datastoresVersion() { - var dizi = (this.datastores).filter((item) => item.label === this.state.datastore_type) + const dizi = this.datastores + .filter((item) => item.label === this.state.datastore_type) .map((it) => { return it.originData.versions.map((e) => ({ label: e.name, - value: e.name - })) - }) + value: e.name, + })); + }); return dizi[0]; } @@ -113,7 +114,7 @@ export default class StepDetails extends Base { getSystemDiskMinSize() { const flavorSize = (this.state.flavor || {}).disk || 0; - let imageSize = 0; + const imageSize = 0; return Math.max(flavorSize, imageSize, 1); } diff --git a/src/pages/database/containers/Instances/actions/StepCreate/index.jsx b/src/pages/database/containers/Instances/actions/StepCreate/index.jsx index 32081974..1aac5ea4 100644 --- a/src/pages/database/containers/Instances/actions/StepCreate/index.jsx +++ b/src/pages/database/containers/Instances/actions/StepCreate/index.jsx @@ -14,7 +14,7 @@ import { StepAction } from 'containers/Action'; import { inject, observer } from 'mobx-react'; -import globalInstancesStore from '@/stores/trove/instances'; +import globalInstancesStore from 'stores/trove/instances'; import StepDetails from './StepDetails'; import StepNetworking from './StepNetworking'; import StepInitializeDatabases from './StepInitializeDatabases'; @@ -23,25 +23,24 @@ import StepAdvanced from './StepAdvanced'; @inject('rootStore') @observer export default class StepCreate extends StepAction { - init() { this.store = globalInstancesStore; } - static id = "create-instance"; + static id = 'create-instance'; - static title = t("Create Instance") + static title = t('Create Instance'); static path = '/database/instances/create'; - static policy = "trove:instance:create"; + static policy = 'trove:instance:create'; static allowed() { return Promise.resolve(true); } get name() { - return t("Create Instance"); + return t('Create Instance'); } get listUrl() { @@ -74,11 +73,11 @@ export default class StepCreate extends StepAction { } onSubmit = (values) => { - let network = [] + let network = []; const { selectedRowKeys = [] } = values.network; - network = selectedRowKeys.map(it => ({ 'net-id': it })) - network = [{ 'net-id': selectedRowKeys[0] }] + network = selectedRowKeys.map((it) => ({ 'net-id': it })); + network = [{ 'net-id': selectedRowKeys[0] }]; return this.store.create({ instance: { @@ -114,4 +113,4 @@ export default class StepCreate extends StepAction { }, }); }; -} \ No newline at end of file +} diff --git a/src/pages/database/containers/Instances/index.jsx b/src/pages/database/containers/Instances/index.jsx index 1ae72dca..dab2b8fc 100644 --- a/src/pages/database/containers/Instances/index.jsx +++ b/src/pages/database/containers/Instances/index.jsx @@ -14,7 +14,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import globalInstancesStore from '@/stores/trove/instances'; +import globalInstancesStore from 'stores/trove/instances'; import { InstanceStatus } from 'resources/database'; import actions from './actions'; diff --git a/src/pages/share/containers/ShareGroupType/actions/Create.jsx b/src/pages/share/containers/ShareGroupType/actions/Create.jsx index 0e0670f8..aa35f25b 100644 --- a/src/pages/share/containers/ShareGroupType/actions/Create.jsx +++ b/src/pages/share/containers/ShareGroupType/actions/Create.jsx @@ -14,8 +14,8 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; -import globalShareGroupTypeStore from '@/stores/manila/share-group-type'; -import globalShareTypeStore from '@/stores/manila/share-type'; +import globalShareGroupTypeStore from 'stores/manila/share-group-type'; +import globalShareTypeStore from 'stores/manila/share-type'; import { projectTableOptions } from 'resources/project'; import { ProjectStore } from 'stores/keystone/project'; import { updateAddSelectValueToObj } from 'utils/index'; diff --git a/src/pages/share/containers/ShareGroupType/actions/Delete.jsx b/src/pages/share/containers/ShareGroupType/actions/Delete.jsx index 7c8121af..002f3a08 100644 --- a/src/pages/share/containers/ShareGroupType/actions/Delete.jsx +++ b/src/pages/share/containers/ShareGroupType/actions/Delete.jsx @@ -13,7 +13,7 @@ // limitations under the License. import { ConfirmAction } from 'containers/Action'; -import globalShareGroupTypeStore from '@/stores/manila/share-group-type'; +import globalShareGroupTypeStore from 'stores/manila/share-group-type'; export default class Delete extends ConfirmAction { get id() { diff --git a/src/pages/share/containers/ShareGroupType/actions/ManageAccess.jsx b/src/pages/share/containers/ShareGroupType/actions/ManageAccess.jsx index b94e84c0..57616cf2 100644 --- a/src/pages/share/containers/ShareGroupType/actions/ManageAccess.jsx +++ b/src/pages/share/containers/ShareGroupType/actions/ManageAccess.jsx @@ -15,7 +15,7 @@ import { inject, observer } from 'mobx-react'; import globalShareGroupTypeStore, { ShareGroupTypeStore, -} from '@/stores/manila/share-group-type'; +} from 'stores/manila/share-group-type'; import { ModalAction } from 'containers/Action'; import { ProjectStore } from 'stores/keystone/project'; import { projectTableOptions } from 'resources/project'; diff --git a/src/pages/share/containers/ShareGroupType/index.jsx b/src/pages/share/containers/ShareGroupType/index.jsx index 71b64149..27ecf9c2 100644 --- a/src/pages/share/containers/ShareGroupType/index.jsx +++ b/src/pages/share/containers/ShareGroupType/index.jsx @@ -15,7 +15,7 @@ import React from 'react'; import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import globalShareGroupTypeStore from '@/stores/manila/share-group-type'; +import globalShareGroupTypeStore from 'stores/manila/share-group-type'; import actionConfigs from './actions'; export class ShareGroupType extends Base { diff --git a/src/pages/share/containers/ShareInstance/index.jsx b/src/pages/share/containers/ShareInstance/index.jsx index 86d05799..6a07abb6 100644 --- a/src/pages/share/containers/ShareInstance/index.jsx +++ b/src/pages/share/containers/ShareInstance/index.jsx @@ -14,7 +14,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import globalShareInstanceStore from '@/stores/manila/share-instance'; +import globalShareInstanceStore from 'stores/manila/share-instance'; import { shareStatus } from 'resources/share'; export class ShareInstance extends Base { diff --git a/src/pages/share/containers/ShareType/actions/Create.jsx b/src/pages/share/containers/ShareType/actions/Create.jsx index 26736314..adff3c2c 100644 --- a/src/pages/share/containers/ShareType/actions/Create.jsx +++ b/src/pages/share/containers/ShareType/actions/Create.jsx @@ -14,7 +14,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; -import globalShareTypeStore from '@/stores/manila/share-type'; +import globalShareTypeStore from 'stores/manila/share-type'; import { projectTableOptions } from 'resources/project'; import { ProjectStore } from 'stores/keystone/project'; import KeyValueInput from 'components/FormItem/KeyValueInput'; diff --git a/src/pages/share/containers/ShareType/actions/Delete.jsx b/src/pages/share/containers/ShareType/actions/Delete.jsx index 677e20a8..47df4a9a 100644 --- a/src/pages/share/containers/ShareType/actions/Delete.jsx +++ b/src/pages/share/containers/ShareType/actions/Delete.jsx @@ -13,7 +13,7 @@ // limitations under the License. import { ConfirmAction } from 'containers/Action'; -import globalShareTypeStore from '@/stores/manila/share-type'; +import globalShareTypeStore from 'stores/manila/share-type'; export default class Delete extends ConfirmAction { get id() { diff --git a/src/pages/share/containers/ShareType/actions/Edit.jsx b/src/pages/share/containers/ShareType/actions/Edit.jsx index fac23b89..3d2939f7 100644 --- a/src/pages/share/containers/ShareType/actions/Edit.jsx +++ b/src/pages/share/containers/ShareType/actions/Edit.jsx @@ -14,7 +14,7 @@ import { inject, observer } from 'mobx-react'; import { ModalAction } from 'containers/Action'; -import globalShareTypeStore from '@/stores/manila/share-type'; +import globalShareTypeStore from 'stores/manila/share-type'; export class Edit extends ModalAction { static id = 'edit'; diff --git a/src/pages/share/containers/ShareType/actions/ManageAccess.jsx b/src/pages/share/containers/ShareType/actions/ManageAccess.jsx index 2f09f697..ca0c640d 100644 --- a/src/pages/share/containers/ShareType/actions/ManageAccess.jsx +++ b/src/pages/share/containers/ShareType/actions/ManageAccess.jsx @@ -13,9 +13,7 @@ // limitations under the License. import { inject, observer } from 'mobx-react'; -import globalShareTypeStore, { - ShareTypeStore, -} from '@/stores/manila/share-type'; +import globalShareTypeStore, { ShareTypeStore } from 'stores/manila/share-type'; import { ModalAction } from 'containers/Action'; import { ProjectStore } from 'stores/keystone/project'; import { projectTableOptions } from 'resources/project'; diff --git a/src/pages/share/containers/ShareType/index.jsx b/src/pages/share/containers/ShareType/index.jsx index 49b88504..9ad41332 100644 --- a/src/pages/share/containers/ShareType/index.jsx +++ b/src/pages/share/containers/ShareType/index.jsx @@ -14,7 +14,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import globalShareTypeStore from '@/stores/manila/share-type'; +import globalShareTypeStore from 'stores/manila/share-type'; import actionConfigs from './actions'; export class ShareType extends Base {