openstack/skyline-console
Code Issues Proposed changes

fix: fix create/delete encryption for volume type

Browse Source 
Fix encryption check for volume type

Change-Id: Id8d0b12e55e8b482d8667a8498f3fe1f82fd75f0
This commit is contained in:
zhangjingwei 2024-03-27 10:17:20 +08:00
parent e65405bd8a
commit 8613ef39f3
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/storage/containers/VolumeType/VolumeType/actions/CreateEncryption.jsx
View File

@ -15,6 +15,7 @@
import { inject, observer } from 'mobx-react'; import { inject, observer } from 'mobx-react';
import { ModalAction } from 'containers/Action'; import { ModalAction } from 'containers/Action';
import globalVolumeTypeStore from 'stores/cinder/volume-type'; import globalVolumeTypeStore from 'stores/cinder/volume-type';
import { hasEncryption } from 'resources/cinder/volume-type';
export class CreateEncryption extends ModalAction { export class CreateEncryption extends ModalAction {
static id = 'create'; static id = 'create';
@ -27,8 +28,7 @@ export class CreateEncryption extends ModalAction {
static policy = 'volume_extension:volume_type_encryption:create'; static policy = 'volume_extension:volume_type_encryption:create';
static allowed = (item) => static allowed = (item) => Promise.resolve(!hasEncryption(item));
Promise.resolve(!(item.encryption && !item.encryption.deleted_at));
get defaultValue() { get defaultValue() {
const { name } = this.item; const { name } = this.item;

4
src/pages/storage/containers/VolumeType/VolumeType/actions/DeleteEncryption.jsx
View File

@ -13,6 +13,7 @@
// limitations under the License. // limitations under the License.
import { ConfirmAction } from 'containers/Action'; import { ConfirmAction } from 'containers/Action';
import { hasEncryption } from 'resources/cinder/volume-type';
import globalVolumeTypeStore from 'stores/cinder/volume-type'; import globalVolumeTypeStore from 'stores/cinder/volume-type';
export default class DeleteEncryptionAction extends ConfirmAction { export default class DeleteEncryptionAction extends ConfirmAction {
@ -38,8 +39,7 @@ export default class DeleteEncryptionAction extends ConfirmAction {
policy = 'volume_extension:volume_type_encryption:delete'; policy = 'volume_extension:volume_type_encryption:delete';
allowedCheckFunc = (data) => allowedCheckFunc = (data) => hasEncryption(data);
Promise.resolve(data.encryption && !data.encryption.deleted_at);
onSubmit = () => { onSubmit = () => {
const { id, encryption } = this.item; const { id, encryption } = this.item;

9
src/resources/cinder/volume-type.js
View File

@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
import { isEmpty } from 'lodash';
import { multiTip } from './volume'; import { multiTip } from './volume';
export const consumerTypes = { export const consumerTypes = {
@ -66,3 +67,11 @@ export const volumeTypeSelectProps = {
columns: volumeTypeColumns, columns: volumeTypeColumns,
filterParams: volumeTypeFilters, filterParams: volumeTypeFilters,
}; };
export const hasEncryption = (volume) => {
const { encryption } = volume || {};
if (!encryption || isEmpty(encryption)) {
return false;
}
return !encryption.deleted_at;
};