fix: Fix check item action in EditAuthorization

kubesphere · Jul 7, 2020 · 3b9ed82 · 3b9ed82
1 parent 78f7bb7
commit 3b9ed82
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/components/Modals/EditAuthorization/CheckItem.jsx b/src/components/Modals/EditAuthorization/CheckItem.jsx
@@ -25,12 +25,20 @@ import styles from './index.scss'
 
 export default class CheckItem extends Component {
   handleCheck = () => {
-    const { roleTemplates, data, onChange } = this.props
+    const { roleTemplates, roleTemplatesMap, data, onChange } = this.props
 
     let newTemplates = [...roleTemplates]
-
     if (newTemplates.includes(data.name)) {
-      newTemplates = newTemplates.filter(item => item !== data.name)
+      if (
+        !newTemplates.some(
+          item =>
+            roleTemplatesMap[item] &&
+            roleTemplatesMap[item].dependencies &&
+            roleTemplatesMap[item].dependencies.includes(data.name)
+        )
+      ) {
+        newTemplates = newTemplates.filter(item => item !== data.name)
+      }
     } else {
       newTemplates.push(data.name, ...data.dependencies)
     }

diff --git a/src/pages/projects/components/Modals/RollBack/index.jsx b/src/pages/projects/components/Modals/RollBack/index.jsx
@@ -48,6 +48,8 @@ export default class RollBackModal extends React.Component {
     super(props)
 
     this.revisionStore = props.store
+
+    this.form = React.createRef()
   }
 
   get revisions() {
@@ -101,7 +103,7 @@ export default class RollBackModal extends React.Component {
 
   handleOk = () => {
     const { detail, onOk } = this.props
-    if (this.form) {
+    if (this.form && this.form.current) {
       const form = this.form.current
       form &&
         form.validate(() => {