fix: Filter terminating project

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Aug 11, 2020 · 0db5966 · 0db5966
1 parent 639706f
commit 0db5966
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/components/Forms/AppDeploy/BasicInfo/Placement/index.jsx b/src/components/Forms/AppDeploy/BasicInfo/Placement/index.jsx
@@ -77,13 +77,15 @@ export default class Placment extends Component {
 
   @computed
   get namespaces() {
-    return this.projectStore.list.data.map(item => ({
-      label: item.name,
-      value: item.name,
-      opRuntime: item.opRuntime,
-      disabled: item.isFedManaged,
-      isFedManaged: item.isFedManaged,
-    }))
+    return this.projectStore.list.data
+      .filter(item => item.status !== 'Terminating')
+      .map(item => ({
+        label: item.name,
+        value: item.name,
+        opRuntime: item.opRuntime,
+        disabled: item.isFedManaged,
+        isFedManaged: item.isFedManaged,
+      }))
   }
 
   async init() {

diff --git a/src/components/Inputs/ProjectSelect/index.jsx b/src/components/Inputs/ProjectSelect/index.jsx
@@ -44,12 +44,14 @@ export default class ProjectSelect extends Component {
     const { defaultValue } = this.props
     const { data } = this.projectStore.list
 
-    const result = data.map(item => ({
-      label: item.name,
-      value: item.name,
-      disabled: item.isFedManaged,
-      isFedManaged: item.isFedManaged,
-    }))
+    const result = data
+      .filter(item => item.status !== 'Terminating')
+      .map(item => ({
+        label: item.name,
+        value: item.name,
+        disabled: item.isFedManaged,
+        isFedManaged: item.isFedManaged,
+      }))
 
     if (defaultValue && !data.find(item => item.name === defaultValue)) {
       result.unshift({