baha/skyline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix: Fix delete image error display"

Browse Source
This commit is contained in:
Zuul 2021-08-27 10:07:57 +00:00 committed by Gerrit Code Review
commit 28e1db10b2
5 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/CodeEditor/index.jsx
View File

@ -16,20 +16,28 @@ import React, { PureComponent } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classnames from 'classnames'; import classnames from 'classnames';
import { getValue } from 'utils/yaml'; import { getValue } from 'utils/yaml';
import { isString } from 'lodash';
import styles from './index.less'; import styles from './index.less';
import AceEditor from './AceEditor'; import AceEditor from './AceEditor';
const parseHtml = (value) => {
if (isString(value) && value.includes('<html>')) {
const reg = /<\/h1>[\r\n]([\s\S]*)<br \/><br \/>/;
const results = reg.exec(value);
if (results) {
return results[1];
}
}
return value;
};
const getCodeValue = (value, mode) => { const getCodeValue = (value, mode) => {
if (value instanceof String) { if (isString(value)) {
return value; return parseHtml(value);
} }
Object.keys(value).forEach((key) => { Object.keys(value).forEach((key) => {
if (typeof value[key] === 'string' && value[key].indexOf('<html>') !== -1) { if (isString(value[key])) {
const reg = /<\/h1>[\r\n]([\s\S]*)<br \/><br \/>/; value[key] = parseHtml(value[key]);
const results = reg.exec(value[key]);
if (results) {
value[key] = results[1];
}
} }
}); });
if (mode === 'json') { if (mode === 'json') {

1
src/locales/en.json
View File

@ -916,7 +916,6 @@
"Load Balancers": "Load Balancers", "Load Balancers": "Load Balancers",
"Load from local files": "Load from local files", "Load from local files": "Load from local files",
"LoadBalancers Instances": "LoadBalancers Instances", "LoadBalancers Instances": "LoadBalancers Instances",
"Loading": "Loading",
"Local": "Local", "Local": "Local",
"Local Endpoint Group": "Local Endpoint Group", "Local Endpoint Group": "Local Endpoint Group",
"Local Endpoint Group ID": "Local Endpoint Group ID", "Local Endpoint Group ID": "Local Endpoint Group ID",

1
src/locales/zh.json
View File

@ -916,7 +916,6 @@
"Load Balancers": "负载均衡", "Load Balancers": "负载均衡",
"Load from local files": "从本地文件读取", "Load from local files": "从本地文件读取",
"LoadBalancers Instances": "负载均衡", "LoadBalancers Instances": "负载均衡",
"Loading": "加载中",
"Local": "本端", "Local": "本端",
"Local Endpoint Group": "本端端点组", "Local Endpoint Group": "本端端点组",
"Local Endpoint Group ID": "本端端点组ID", "Local Endpoint Group ID": "本端端点组ID",

5
src/pages/compute/containers/Image/actions/Delete.jsx
View File

@ -44,8 +44,9 @@ export default class DeleteAction extends ConfirmAction {
return true; return true;
} }
return ( return (
(this.notDeleted(item) && this.notProtected(item) && isOwner(item)) || this.notDeleted(item) &&
this.isAdminPage this.notProtected(item) &&
(isOwner(item) || this.isAdminPage)
); );
}; };

7
src/resources/instance.jsx
View File

@ -145,8 +145,11 @@ export const isLocked = (instance) => !!instance.locked;
export const lockRender = (value) => (value ? lockIcon : unlockIcon); export const lockRender = (value) => (value ? lockIcon : unlockIcon);
export const checkStatus = (statusList = [], instance) => { export const checkStatus = (statusList = [], instance) => {
const { status } = instance; const { status, vm_state } = instance;
return statusList.indexOf(status.toLowerCase()) >= 0; return (
statusList.includes(status.toLowerCase()) ||
(vm_state && statusList.includes(vm_state.toLowerCase()))
);
}; };
export const isNotLockedOrAdmin = (instance, isAdmin = false) => { export const isNotLockedOrAdmin = (instance, isAdmin = false) => {