fix: Display volume template info in statefulsets setting modal (#3522)

Signed-off-by: TheYoungManLi <cjl@kubesphere.io>
kubesphere · Aug 3, 2022 · bfc27a9 · bfc27a9
1 parent b17f3ea
commit bfc27a9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/components/Forms/Workload/VolumeSettings/VolumeTemplateList/Card.jsx b/src/components/Forms/Workload/VolumeSettings/VolumeTemplateList/Card.jsx
@@ -25,7 +25,7 @@ import { List } from 'components/Base'
 
 import styles from './index.scss'
 
-const Card = ({ volume, onDelete, onEdit }) => {
+const Card = ({ volume, onDelete, onEdit, banEdit = false }) => {
   const handleDelete = () => onDelete(volume.metadata.name)
   const handleEdit = () => onEdit(volume)
 
@@ -70,6 +70,22 @@ const Card = ({ volume, onDelete, onEdit }) => {
     </div>
   )
 
+  if (banEdit) {
+    return (
+      <List.Item
+        icon="storage"
+        title={get(volume, 'metadata.name', '-')}
+        description={`${t('Storage Classs')}: ${get(
+          volume,
+          'spec.storageClassName',
+          '-'
+        )}`}
+        extras={mount}
+        details={details}
+      />
+    )
+  }
+
   return (
     <List.Item
       icon="storage"

diff --git a/src/components/Forms/Workload/VolumeSettings/VolumeTemplateList/index.jsx b/src/components/Forms/Workload/VolumeSettings/VolumeTemplateList/index.jsx
@@ -35,6 +35,7 @@ export default class VolumeList extends React.Component {
     onChange: PropTypes.func,
     onShowAddVolume: PropTypes.func,
     onShowEdit: PropTypes.func,
+    hideVolumeSetting: PropTypes.bool,
   }
 
   static defaultProps = {
@@ -45,6 +46,7 @@ export default class VolumeList extends React.Component {
     onChange() {},
     onShowAddVolume() {},
     onShowEdit() {},
+    hideVolumeSetting: false,
   }
 
   static contextTypes = {
@@ -144,7 +146,7 @@ export default class VolumeList extends React.Component {
   }
 
   render() {
-    const { className } = this.props
+    const { className, hideVolumeSetting } = this.props
     const formatVolumes = this.getFormattedVolumes()
 
     return (
@@ -158,11 +160,12 @@ export default class VolumeList extends React.Component {
                   key={get(volume, 'metadata.name')}
                   onEdit={this.handleEdit}
                   onDelete={this.handleDelete}
+                  banEdit={hideVolumeSetting}
                 />
               ))}
             </ul>
           )}
-          {this.renderAddVolume()}
+          {!hideVolumeSetting && this.renderAddVolume()}
         </div>
       </div>
     )

diff --git a/src/components/Forms/Workload/VolumeSettings/index.jsx b/src/components/Forms/Workload/VolumeSettings/index.jsx
@@ -666,7 +666,7 @@ class VolumeSettings extends React.Component {
           />
         )}
         <div className={styles.volumes}>
-          {isSTS && !hideVolumeSetting && (
+          {isSTS && (
             <Form.Item>
               <VolumeTemplateList
                 prefix={this.prefix}
@@ -676,6 +676,7 @@ class VolumeSettings extends React.Component {
                 onShowEdit={this.showEditVolumeTemplate}
                 collectSavedLog={collectSavedLog}
                 logPath={logPath}
+                hideVolumeSetting={hideVolumeSetting}
               />
             </Form.Item>
           )}