Merge "fix: Optimize the directory structure of the resources folder"

src/components/Layout/GlobalHeader/OpenRc.jsx

@@ -14,7 +14,7 @@
 
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
-import { allCanReadPolicy } from 'resources/keystone/policy';
+import { allCanReadPolicy } from 'resources/skyline/policy';
 import globalAuthCatalogStore from 'stores/keystone/catalog';
 import {
   getCredentialOpenRc,

src/components/Layout/GlobalHeader/ProjectTable.jsx

@@ -14,7 +14,7 @@
 
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
-import { allCanReadPolicy } from 'resources/keystone/policy';
+import { allCanReadPolicy } from 'resources/skyline/policy';
 import globalUserStore from 'stores/keystone/user';
 
 @inject('rootStore')

src/components/Layout/GlobalHeader/Token.jsx

@@ -16,7 +16,7 @@ import React from 'react';
 import { inject, observer } from 'mobx-react';
 import { Typography } from 'antd';
 import { ModalAction } from 'containers/Action';
-import { allCanReadPolicy } from 'resources/keystone/policy';
+import { allCanReadPolicy } from 'resources/skyline/policy';
 import { getLocalTime } from 'utils/time';
 import styles from './index.less';
 

src/components/Tables/Base/Action/index.jsx

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import checkItemPolicy, { systemRoleIsReader } from 'resources/keystone/policy';
+import checkItemPolicy, { systemRoleIsReader } from 'resources/skyline/policy';
 
 export async function checkAllowed({
   item,

src/containers/List/index.jsx

@@ -31,7 +31,7 @@ import BaseTable from 'components/Tables/Base';
 import { isAdminPage } from 'utils/index';
 import Notify from 'components/Notify';
 import { checkTimeIn } from 'utils/time';
-import checkItemPolicy from 'resources/keystone/policy';
+import checkItemPolicy from 'resources/skyline/policy';
 import NotFound from 'components/Cards/NotFound';
 import { getTags } from 'components/MagicInput';
 import { getPath, getLinkRender } from 'utils/route-map';

src/containers/TabDetail/index.jsx

@@ -23,7 +23,7 @@ import NotFound from 'components/Cards/NotFound';
 import Infos from 'components/Infos';
 import Notify from 'components/Notify';
 import { toJS } from 'mobx';
-import checkItemPolicy from 'resources/keystone/policy';
+import checkItemPolicy from 'resources/skyline/policy';
 import ItemActionButtons from 'components/Tables/Base/ItemActionButtons';
 import { emptyActionConfig } from 'utils/constants';
 import { getPath, getLinkRender } from 'utils/route-map';

src/layouts/Base/index.jsx

@@ -18,7 +18,7 @@ import { toJS, reaction } from 'mobx';
 import i18n from 'core/i18n';
 import { isAdminPage, isUserCenterPage } from 'utils/index';
 import { BellOutlined } from '@ant-design/icons';
-import checkItemPolicy from 'resources/keystone/policy';
+import checkItemPolicy from 'resources/skyline/policy';
 import { Layout } from 'antd';
 import GlobalHeader from 'components/Layout/GlobalHeader';
 import { setRouteMap, getPath } from 'utils/route-map';

src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx

@@ -16,7 +16,7 @@ import { observer, inject } from 'mobx-react';
 import Base from 'containers/List';
 import { serviceStatus, serviceState } from 'resources/nova/service';
 import globalComputeHostStore from 'stores/nova/compute-host';
-import { onlyAdminCanReadPolicy } from 'resources/keystone/policy';
+import { onlyAdminCanReadPolicy } from 'resources/skyline/policy';
 import { getOptions } from 'utils';
 import actionConfigs from './actions';
 

src/pages/configuration/containers/Setting/actions/View.jsx

@@ -15,7 +15,7 @@
 import React from 'react';
 import { ModalAction } from 'containers/Action';
 import { inject, observer } from 'mobx-react';
-import { onlyAdminCanReadPolicy } from 'resources/keystone/policy';
+import { onlyAdminCanReadPolicy } from 'resources/skyline/policy';
 import CodeEditor from 'components/CodeEditor';
 
 export class View extends ModalAction {

src/pages/configuration/containers/Setting/index.jsx

@@ -15,7 +15,7 @@
 import { observer, inject } from 'mobx-react';
 import Base from 'containers/List';
 import globalSettingStore from 'stores/skyline/setting';
-import { onlyAdminCanReadPolicy } from 'resources/keystone/policy';
+import { onlyAdminCanReadPolicy } from 'resources/skyline/policy';
 import actionConfigs from './actions';
 
 export class Setting extends Base {

src/pages/network/containers/LoadBalancers/LoadBalancerInstance/actions/Delete.jsx

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { ConfirmAction } from 'containers/Action';
-import { checkPolicyRule } from 'resources/keystone/policy';
+import { checkPolicyRule } from 'resources/skyline/policy';
 import globalLbaasStore from 'stores/octavia/loadbalancer';
 import globalRootStore from 'stores/root';
 

src/pages/network/containers/Network/actions/CreateNetwork.jsx

@@ -19,7 +19,7 @@ import globalNetworkStore from 'stores/neutron/network';
 import globalProjectStore from 'stores/keystone/project';
 import { isEmpty, isFunction } from 'lodash';
 import Notify from 'components/Notify';
-import { checkPolicyRule } from 'resources/keystone/policy';
+import { checkPolicyRule } from 'resources/skyline/policy';
 import globalNeutronStore from 'stores/neutron/neutron';
 import { subnetIpv6Tip } from 'resources/neutron/network';
 import networkUtil from './networkUtil';

src/pages/network/containers/Network/actions/CreateSubnet.jsx

@@ -17,7 +17,7 @@ import { ModalAction } from 'containers/Action';
 import { ipValidate } from 'utils/validate';
 import globalNetworkStore from 'stores/neutron/network';
 import { isEmpty } from 'lodash';
-import { checkPolicyRule } from 'resources/keystone/policy';
+import { checkPolicyRule } from 'resources/skyline/policy';
 import globalProjectStore from 'stores/keystone/project';
 import globalRootStore from 'stores/root';
 import { subnetIpv6Tip } from 'resources/neutron/network';

src/pages/network/containers/Network/actions/Delete.jsx

@@ -14,7 +14,7 @@
 
 import { ConfirmAction } from 'containers/Action';
 import globalNetworkStore from 'stores/neutron/network';
-import { checkPolicyRule } from 'resources/keystone/policy';
+import { checkPolicyRule } from 'resources/skyline/policy';
 import globalRootStore from 'stores/root';
 
 export default class DeleteAction extends ConfirmAction {

src/pages/network/containers/Network/actions/Edit.jsx

@@ -15,7 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalNetworkStore from 'stores/neutron/network';
-import { checkPolicyRule } from 'resources/keystone/policy';
+import { checkPolicyRule } from 'resources/skyline/policy';
 import globalRootStore from 'stores/root';
 import { getYesNoList } from 'utils/index';
 

src/pages/network/containers/VPN/EndpointGroup/actions/Delete.jsx

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { ConfirmAction } from 'containers/Action';
-import { checkPolicyRule } from 'resources/keystone/policy';
+import { checkPolicyRule } from 'resources/skyline/policy';
 import globalVPNEndPointGroupStore from 'stores/neutron/vpn-endpoint-group';
 import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection';
 import globalRootStore from 'stores/root';

src/pages/network/containers/VPN/IKEPolicy/actions/Delete.jsx

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { ConfirmAction } from 'containers/Action';
-import { checkPolicyRule } from 'resources/keystone/policy';
+import { checkPolicyRule } from 'resources/skyline/policy';
 import globalVpnIKEPolicyStore from 'stores/neutron/vpn-ike-policy';
 import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection';
 import globalRootStore from 'stores/root';

src/pages/network/containers/VPN/IPsecPolicy/actions/Delete.jsx

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { ConfirmAction } from 'containers/Action';
-import { checkPolicyRule } from 'resources/keystone/policy';
+import { checkPolicyRule } from 'resources/skyline/policy';
 import globalVpnIPsecPolicyStore from 'stores/neutron/vpn-ipsec-policy';
 import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection';
 import globalRootStore from 'stores/root';

src/pages/network/containers/VPN/IPsecSiteConnection/actions/Delete.jsx

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { ConfirmAction } from 'containers/Action';
-import { checkPolicyRule } from 'resources/keystone/policy';
+import { checkPolicyRule } from 'resources/skyline/policy';
 import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection';
 import globalRootStore from 'stores/root';
 

src/pages/network/containers/VPN/VPNGateway/actions/Delete.jsx

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { ConfirmAction } from 'containers/Action';
-import { checkPolicyRule } from 'resources/keystone/policy';
+import { checkPolicyRule } from 'resources/skyline/policy';
 import globalVpnServicesStore from 'stores/neutron/vpn-service';
 import globalRootStore from 'stores/root';
 import globalVpnIPsecConnectionStore from 'stores/neutron/vpn-ipsec-connection';

src/pages/storage/containers/Container/Detail/actions/CopyFile.jsx

@@ -14,7 +14,7 @@
 
 import { ConfirmAction } from 'containers/Action';
 import globalObjectStore from 'stores/swift/object';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 import { isFile } from 'resources/swift/container';
 
 export default class CopyFile extends ConfirmAction {

src/pages/storage/containers/Container/Detail/actions/CreateFolder.jsx

@@ -15,7 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalObjectStore from 'stores/swift/object';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 
 @inject('rootStore')
 @observer

src/pages/storage/containers/Container/Detail/actions/CutFile.jsx

@@ -14,7 +14,7 @@
 
 import { ConfirmAction } from 'containers/Action';
 import globalObjectStore from 'stores/swift/object';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 import { isFile } from 'resources/swift/container';
 
 export default class CutFile extends ConfirmAction {

src/pages/storage/containers/Container/Detail/actions/Delete.jsx

@@ -14,7 +14,7 @@
 
 import { ConfirmAction } from 'containers/Action';
 import globalObjectStore, { ObjectStore } from 'stores/swift/object';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 import { isFile } from 'resources/swift/container';
 
 export default class Delete extends ConfirmAction {

src/pages/storage/containers/Container/Detail/actions/Download.jsx

@@ -15,7 +15,7 @@
 import { ConfirmAction } from 'containers/Action';
 import { isFile } from 'resources/swift/container';
 import globalObjectStore from 'stores/swift/object';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 import FileSaver from 'file-saver';
 
 export default class Download extends ConfirmAction {

src/pages/storage/containers/Container/Detail/actions/Edit.jsx

@@ -15,7 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalObjectStore, { ObjectStore } from 'stores/swift/object';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 import { isFile } from 'resources/swift/container';
 
 @inject('rootStore')

src/pages/storage/containers/Container/Detail/actions/PasteFile.jsx

@@ -15,7 +15,7 @@
 import React from 'react';
 import { ConfirmAction } from 'containers/Action';
 import globalObjectStore from 'stores/swift/object';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 import { isFolder } from 'resources/swift/container';
 
 export default class PasteFile extends ConfirmAction {

src/pages/storage/containers/Container/Detail/actions/Rename.jsx

@@ -15,7 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalObjectStore from 'stores/swift/object';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 import { isFile } from 'resources/swift/container';
 
 @inject('rootStore')

src/pages/storage/containers/Container/Detail/actions/UploadFile.jsx

@@ -15,7 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalObjectStore, { ObjectStore } from 'stores/swift/object';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 
 @inject('rootStore')
 @observer

src/pages/storage/containers/Container/Detail/index.jsx

@@ -18,7 +18,7 @@ import { Popover, Col, Row, Skeleton } from 'antd';
 import Base from 'containers/List';
 import globalObjectStore, { ObjectStore } from 'stores/swift/object';
 import { bytesFilter } from 'utils/index';
-import { allCanReadPolicy } from 'resources/keystone/policy';
+import { allCanReadPolicy } from 'resources/skyline/policy';
 import { toJS } from 'mobx';
 import { isEqual } from 'lodash';
 import { isFolder } from 'resources/swift/container';

src/pages/storage/containers/Container/actions/Access.jsx

@@ -15,7 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalContainerStore, { ContainerStore } from 'stores/swift/container';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 
 @inject('rootStore')
 @observer

src/pages/storage/containers/Container/actions/Create.jsx

@@ -15,7 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalContainerStore from 'stores/swift/container';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 
 @inject('rootStore')
 @observer

src/pages/storage/containers/Container/actions/Delete.jsx

@@ -14,7 +14,7 @@
 
 import { ConfirmAction } from 'containers/Action';
 import globalContainerStore from 'stores/swift/container';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 
 export default class Delete extends ConfirmAction {
   get id() {

src/pages/storage/containers/Container/index.jsx

@@ -18,7 +18,7 @@ import { Popover, Col, Row, Skeleton } from 'antd';
 import Base from 'containers/List';
 import globalContainerStore, { ContainerStore } from 'stores/swift/container';
 import { bytesFilter } from 'utils/index';
-import { allCanChangePolicy } from 'resources/keystone/policy';
+import { allCanChangePolicy } from 'resources/skyline/policy';
 import { getStrFromTimestamp } from 'utils/time';
 import { swiftEndpoint } from 'client/client/constants';
 import actionConfigs from './actions';

src/stores/root.js

@@ -20,8 +20,8 @@ import { getQueryString } from 'utils/index';
 import { setLocalStorageItem } from 'utils/local-storage';
 import { isEmpty, values } from 'lodash';
 
-const checkItemPolicy = require('resources/keystone/policy').default;
-const { onlyAdminCanReadPolicy } = require('resources/keystone/policy');
+const checkItemPolicy = require('resources/skyline/policy').default;
+const { onlyAdminCanReadPolicy } = require('resources/skyline/policy');
 
 export class RootStore {
   @observable