fix: 如果没有deleteable默认可删除

tingfuyeh · tingfuyeh · commit 0ad2e2d72966 · 2024-11-04T16:25:12.000+08:00
diff --git a/web/src/polaris/administration/accessLimiting/getColumns.tsx b/web/src/polaris/administration/accessLimiting/getColumns.tsx
@@ -93,15 +93,15 @@ export default ({ creators }: AccessLimitingDuck): Column<RateLimit>[] => [
         {
           id: 'modify',
           text: '编辑',
-          disabled:!x.editable,
+          disabled: !x.editable,
           fn: dispatch => {
             dispatch(creators.modify(x))
           },
         },
         {
           id: 'remove',
           text: '删除',
-          disabled:!x.deleteable,
+          disabled: x.deleteable === false,
           fn: dispatch => {
             dispatch(creators.delete(x))
           },
diff --git a/web/src/polaris/administration/breaker/faultDetect/getColumns.tsx b/web/src/polaris/administration/breaker/faultDetect/getColumns.tsx
@@ -89,7 +89,7 @@ export default (props: DuckCmpProps<FaultDetectDuck>): Column<FaultDetectRule>[]
               }}
             />
             <Action
-              disabled={!x.deleteable}
+              disabled={x.deleteable === false}
               text={'删除'}
               fn={() => {
                 dispatch(creators.remove(x))
diff --git a/web/src/polaris/administration/breaker/getColumns.tsx b/web/src/polaris/administration/breaker/getColumns.tsx
@@ -111,7 +111,7 @@ export default (props: DuckCmpProps<CircuitBreakerDuck>): Column<CircuitBreakerR
               }}
             />
             <Action
-              disabled={!x.deleteable}
+              disabled={x.deleteable === false}
               text={'删除'}
               fn={() => {
                 dispatch(creators.remove(x))
diff --git a/web/src/polaris/administration/dynamicRoute/customRoute/getColumns.tsx b/web/src/polaris/administration/dynamicRoute/customRoute/getColumns.tsx
@@ -99,32 +99,32 @@ export default (
           fn: (dispatch?: Dispatch<any>, e?) => void
           disabled: boolean
         }[] = [
-            {
-              id: 'switchStatus',
-              text: x.enable ? '禁用' : '启用',
-              fn: dispatch => {
-                const swtichStatusAction = x.enable ? SwitchStatusAction.disable : SwitchStatusAction.start
-                dispatch(creators.switchStatus(x.id, x.name, swtichStatusAction))
-              },
-              disabled: !x.editable,
+          {
+            id: 'switchStatus',
+            text: x.enable ? '禁用' : '启用',
+            fn: dispatch => {
+              const swtichStatusAction = x.enable ? SwitchStatusAction.disable : SwitchStatusAction.start
+              dispatch(creators.switchStatus(x.id, x.name, swtichStatusAction))
             },
-            {
-              id: 'modify',
-              text: '编辑',
-              fn: dispatch => {
-                dispatch(creators.modify(x))
-              },
-              disabled: !x.editable,
+            disabled: !x.editable,
+          },
+          {
+            id: 'modify',
+            text: '编辑',
+            fn: dispatch => {
+              dispatch(creators.modify(x))
             },
-            {
-              id: 'remove',
-              text: '删除',
-              fn: dispatch => {
-                dispatch(creators.delete(x))
-              },
-              disabled: !x.deleteable,
+            disabled: !x.editable,
+          },
+          {
+            id: 'remove',
+            text: '删除',
+            fn: dispatch => {
+              dispatch(creators.delete(x))
             },
-          ]
+            disabled: x.deleteable === false,
+          },
+        ]
         return (
           <React.Fragment>
             {actions.map(action => (
diff --git a/web/src/polaris/configuration/fileGroup/detail/file/Page.tsx b/web/src/polaris/configuration/fileGroup/detail/file/Page.tsx
@@ -560,7 +560,7 @@ function renderTree(props, folder, path: string, currPath: string) {
                       >
                         {'查看发布历史'}
                       </List.Item>
-                      <List.Item onClick={() => handlers.delete(obj.name)} disabled={!deleteable}>
+                      <List.Item onClick={() => handlers.delete(obj.name)} disabled={deleteable === false}>
                         删除
                       </List.Item>
                     </List>
diff --git a/web/src/polaris/configuration/fileGroup/detail/version/getColumns.tsx b/web/src/polaris/configuration/fileGroup/detail/version/getColumns.tsx
@@ -68,7 +68,7 @@ export default ({
             <Action fn={dispatch => dispatch(creators.rollback(x))} disabled={!editable || !!x.active}>
               {'回滚'}
             </Action>
-            <Action fn={dispatch => dispatch(creators.delete(x))} disabled={!deleteable}>
+            <Action fn={dispatch => dispatch(creators.delete(x))} disabled={deleteable === false}>
               {'删除'}
             </Action>
           </React.Fragment>
diff --git a/web/src/polaris/configuration/fileGroup/getColumns.tsx b/web/src/polaris/configuration/fileGroup/getColumns.tsx
@@ -61,8 +61,8 @@ export default ({ duck: { creators } }: DuckCmpProps<ConfigFileGroupDuck>): Colu
           </Action>
           <Action
             fn={dispatch => dispatch(creators.remove(x))}
-            disabled={!x.deleteable}
-            tip={!x.deleteable ? '无权限' : '编辑'}
+            disabled={x.deleteable === false}
+            tip={x.deleteable === false ? '无权限' : '编辑'}
           >
             {'删除'}
           </Action>
diff --git a/web/src/polaris/namespace/getColumns.tsx b/web/src/polaris/namespace/getColumns.tsx
@@ -85,7 +85,7 @@ export default ({ duck: { creators } }: DuckCmpProps<NamespacePageDuck>): Column
           <Action fn={dispatch => dispatch(creators.edit(x))} disabled={!x.editable} tip={'编辑'}>
             {'编辑'}
           </Action>
-          <Action fn={dispatch => dispatch(creators.remove(x))} disabled={!x.deleteable} tip={'删除'}>
+          <Action fn={dispatch => dispatch(creators.remove(x))} disabled={x.deleteable === false} tip={'删除'}>
             {'删除'}
           </Action>
         </React.Fragment>
diff --git a/web/src/polaris/service/detail/circuitBreaker/getColumns.tsx b/web/src/polaris/service/detail/circuitBreaker/getColumns.tsx
@@ -96,8 +96,8 @@ export default ({ duck: { creators, selector }, store }: DuckCmpProps<RoutePageD
             </Action>
             <Action
               fn={dispatch => dispatch(creators.remove(x.id))}
-              disabled={isReadOnly(namespace) || !deleteable}
-              tip={isReadOnly(namespace) ? '该命名空间为只读的' : !deleteable ? '无写权限' : '删除'}
+              disabled={isReadOnly(namespace) || deleteable === false}
+              tip={isReadOnly(namespace) ? '该命名空间为只读的' : deleteable === false ? '无写权限' : '删除'}
             >
               <Icon type={'delete'}></Icon>
             </Action>
diff --git a/web/src/polaris/service/detail/instance/Page.tsx b/web/src/polaris/service/detail/instance/Page.tsx
@@ -213,8 +213,8 @@ export default function ServiceInstancePage(props: DuckCmpProps<ServicePageDuck>
                 style={{ marginRight: 10 }}
                 button={
                   <Button
-                    disabled={selection?.length === 0 || !deleteable}
-                    tooltip={selection?.length === 0 ? '请选择实例' : !deleteable ? '无写权限' : ''}
+                    disabled={selection?.length === 0 || deleteable === false}
+                    tooltip={selection?.length === 0 ? '请选择实例' : deleteable === false ? '无写权限' : ''}
                   >
                     其他操作
                   </Button>
diff --git a/web/src/polaris/service/detail/instance/PageDuck.ts b/web/src/polaris/service/detail/instance/PageDuck.ts
@@ -155,13 +155,13 @@ export default class ServicePageDuck extends GridPageDuck {
   *saga() {
     const { types, creators, selector, ducks } = this
     yield* super.saga()
-    yield takeLatest(types.CREATE, function* () {
+    yield takeLatest(types.CREATE, function*() {
       const {
         data: { name, namespace },
       } = selector(yield select())
       const res = yield* resolvePromise(
-        new Promise((resolve) => {
-          showDialog(Create, CreateDuck, function* (duck: CreateDuck) {
+        new Promise(resolve => {
+          showDialog(Create, CreateDuck, function*(duck: CreateDuck) {
             try {
               resolve(yield* duck.execute({}, { isModify: false, service: name, namespace }))
             } finally {
@@ -174,14 +174,14 @@ export default class ServicePageDuck extends GridPageDuck {
         yield put(creators.reload())
       }
     })
-    yield takeLatest(types.EDIT, function* (action) {
+    yield takeLatest(types.EDIT, function*(action) {
       const {
         data: { name, namespace },
       } = selector(yield select())
       const data = action.payload
       const res = yield* resolvePromise(
-        new Promise((resolve) => {
-          showDialog(Create, CreateDuck, function* (duck: CreateDuck) {
+        new Promise(resolve => {
+          showDialog(Create, CreateDuck, function*(duck: CreateDuck) {
             try {
               resolve(
                 yield* duck.execute(data, {
@@ -201,86 +201,83 @@ export default class ServicePageDuck extends GridPageDuck {
         yield put(creators.reload())
       }
     })
-    yield takeLatest(types.CHANGE_TAGS, function* (action) {
+    yield takeLatest(types.CHANGE_TAGS, function*(action) {
       const tags = action.payload
       const customFilters = { ...EmptyCustomFilter }
-      const validTags = tags.map((item) => {
+      const validTags = tags.map(item => {
         if (item.attr) return item
         else return { ...item, attr: DefaultHostTagAttribute }
       })
       yield put({ type: types.SET_TAGS, payload: validTags })
-      validTags.forEach((tag) => {
+      validTags.forEach(tag => {
         const key = tag?.attr?.key || HostTagKey
         if (key === MetadataTagKey) {
-          customFilters[key] = tag.values.map((item) => ({ key: item.key, value: item.value || '' }))?.[0]
+          customFilters[key] = tag.values.map(item => ({ key: item.key, value: item.value || '' }))?.[0]
         } else {
           if (tag.attr.type === 'input') customFilters[key] = tag.values[0].name
           else customFilters[key] = tag.values[0].key
         }
       })
       // https://github.com/polarismesh/polaris/issues/793
       // 因为上面设置默认“健康状态”为“健康”，如果没有选择“健康状态”，就默认“健康状态”为“全部”
-      const hasHealthyTag = validTags.find((tag) => HealthyTagKey === tag?.attr?.key)
+      const hasHealthyTag = validTags.find(tag => HealthyTagKey === tag?.attr?.key)
       if (!hasHealthyTag) {
         customFilters[HealthyTagKey] = '__all__'
       }
       yield put({ type: types.SET_CUSTOM_FILTERS, payload: customFilters })
     })
-    yield takeLatest(ducks.grid.types.FETCH_DONE, function* (action) {
+    yield takeLatest(ducks.grid.types.FETCH_DONE, function*(action) {
       const { searchParams, list } = action.payload
       const { selection } = selector(yield select())
-      const validSelection = selection.filter((id) => !!list.find((item) => item.id === id))
+      const validSelection = selection.filter(id => !!list.find(item => item.id === id))
       yield put(creators.setSelection(validSelection))
       yield put({ type: types.SET_LAST_SEARCH_PARAMS, payload: JSON.stringify(searchParams) })
     })
-    yield takeLatest(
-      [types.MODIFY_ISOLATE_STATUS, types.MODIFY_HEALTH_STATUS, types.MODIFY_WEIGHT],
-      function* (action) {
-        const batchEditType =
-          action.type === types.MODIFY_WEIGHT
-            ? BATCH_EDIT_TYPE.WEIGHT
-            : action.type === types.MODIFY_ISOLATE_STATUS
-            ? BATCH_EDIT_TYPE.ISOLATE
-            : BATCH_EDIT_TYPE.HEALTHY
-        const {
-          data: { name, namespace },
-        } = selector(yield select())
-        const list = ducks.grid.selectors.list(yield select())
-        const ids = action.payload
-        const instances = ids.map((id) => list.find((instance) => instance.id === id))
-        const res = yield* resolvePromise(
-          new Promise((resolve) => {
-            showDialog(Create, CreateDuck, function* (duck: CreateDuck) {
-              try {
-                resolve(
-                  yield* duck.execute(instances[0], {
-                    isModify: true,
-                    service: name,
-                    namespace,
-                    batchEditType,
-                    instance: instances[0],
-                    instances,
-                  }),
-                )
-              } finally {
-                resolve(false)
-              }
-            })
-          }),
-        )
-        if (res) {
-          yield put(creators.reload())
-        }
-      },
-    )
-    yield takeLatest(types.REMOVE, function* (action) {
+    yield takeLatest([types.MODIFY_ISOLATE_STATUS, types.MODIFY_HEALTH_STATUS, types.MODIFY_WEIGHT], function*(action) {
+      const batchEditType =
+        action.type === types.MODIFY_WEIGHT
+          ? BATCH_EDIT_TYPE.WEIGHT
+          : action.type === types.MODIFY_ISOLATE_STATUS
+          ? BATCH_EDIT_TYPE.ISOLATE
+          : BATCH_EDIT_TYPE.HEALTHY
+      const {
+        data: { name, namespace },
+      } = selector(yield select())
+      const list = ducks.grid.selectors.list(yield select())
+      const ids = action.payload
+      const instances = ids.map(id => list.find(instance => instance.id === id))
+      const res = yield* resolvePromise(
+        new Promise(resolve => {
+          showDialog(Create, CreateDuck, function*(duck: CreateDuck) {
+            try {
+              resolve(
+                yield* duck.execute(instances[0], {
+                  isModify: true,
+                  service: name,
+                  namespace,
+                  batchEditType,
+                  instance: instances[0],
+                  instances,
+                }),
+              )
+            } finally {
+              resolve(false)
+            }
+          })
+        }),
+      )
+      if (res) {
+        yield put(creators.reload())
+      }
+    })
+    yield takeLatest(types.REMOVE, function*(action) {
       const ids = action.payload
       const confirm = yield Modal.confirm({
         message: `确认删除实例`,
         description: '删除后，无法恢复',
       })
       if (confirm) {
-        const res = yield deleteInstances(ids.map((id) => ({ id })))
+        const res = yield deleteInstances(ids.map(id => ({ id })))
         yield put(creators.reload())
       }
     })
diff --git a/web/src/polaris/service/detail/instance/getColumns.tsx b/web/src/polaris/service/detail/instance/getColumns.tsx
diff --git a/web/src/polaris/service/detail/route/getColumns.tsx b/web/src/polaris/service/detail/route/getColumns.tsx
diff --git a/web/src/polaris/service/getColumns.tsx b/web/src/polaris/service/getColumns.tsx
diff --git a/web/src/polaris/serviceAlias/getColumns.tsx b/web/src/polaris/serviceAlias/getColumns.tsx

Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ function renderTree(props, folder, path: string, currPath: string) {`
`560`	`560`	`>`
`561`	`561`	`{'查看发布历史'}`
`562`	`562`	`</List.Item>`
`563`		`- <List.Item onClick={() => handlers.delete(obj.name)} disabled={!deleteable}>`
	`563`	`+ <List.Item onClick={() => handlers.delete(obj.name)} disabled={deleteable === false}>`
`564`	`564`	`删除`
`565`	`565`	`</List.Item>`
`566`	`566`	`</List>`