github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(more-resources): address CE review comments [r8s-103] (#110)

release/2.24.0
Ali 2024-11-12 10:41:43 +13:00 committed by GitHub
parent 6d31f4876a
commit d25de4f459
8 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/react/kubernetes/more-resources/ClusterRolesView/ClusterRoleBindingsDatatable/ClusterRoleBindingsDatatable.tsx
View File

@ -21,7 +21,7 @@ import { DefaultDatatableSettings } from '../../../datatables/DefaultDatatableSe
import { ClusterRoleBinding } from './types'; import { ClusterRoleBinding } from './types';
import { columns } from './columns'; import { columns } from './columns';
import { useClusterRoleBindings } from './queries/useClusterRoleBindings'; import { useClusterRoleBindings } from './queries/useClusterRoleBindings';
import { useDeleteClusterRoleBindings } from './queries/useDeleteClusterRoleBindings'; import { useDeleteClusterRoleBindingsMutation } from './queries/useDeleteClusterRoleBindingsMutation';
const storageKey = 'clusterRoleBindings'; const storageKey = 'clusterRoleBindings';
const settingsStore = createStore(storageKey); const settingsStore = createStore(storageKey);
@ -99,7 +99,7 @@ type TableActionsProps = {
function TableActions({ selectedItems }: TableActionsProps) { function TableActions({ selectedItems }: TableActionsProps) {
const environmentId = useEnvironmentId(); const environmentId = useEnvironmentId();
const deleteClusterRoleBindingsMutation = const deleteClusterRoleBindingsMutation =
useDeleteClusterRoleBindings(environmentId); useDeleteClusterRoleBindingsMutation(environmentId);
const router = useRouter(); const router = useRouter();
async function handleRemoveClick(roles: SelectedRole[]) { async function handleRemoveClick(roles: SelectedRole[]) {

4
app/react/kubernetes/more-resources/ClusterRolesView/ClusterRoleBindingsDatatable/queries/useDeleteClusterRoleBindings.ts → app/react/kubernetes/more-resources/ClusterRolesView/ClusterRoleBindingsDatatable/queries/useDeleteClusterRoleBindingsMutation.ts
View File

@ -6,7 +6,9 @@ import { EnvironmentId } from '@/react/portainer/environments/types';
import { queryKeys } from './query-keys'; import { queryKeys } from './query-keys';
export function useDeleteClusterRoleBindings(environmentId: EnvironmentId) { export function useDeleteClusterRoleBindingsMutation(
environmentId: EnvironmentId
) {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation(deleteClusterRoleBindings, { return useMutation(deleteClusterRoleBindings, {
...withInvalidate(queryClient, [queryKeys.list(environmentId)]), ...withInvalidate(queryClient, [queryKeys.list(environmentId)]),

5
app/react/kubernetes/more-resources/ClusterRolesView/ClusterRolesDatatable/ClusterRolesDatatable.tsx
View File

@ -23,7 +23,7 @@ import { RoleBinding } from '../../RolesView/RoleBindingsDatatable/types';
import { ClusterRole, ClusterRoleRowData } from './types'; import { ClusterRole, ClusterRoleRowData } from './types';
import { columns } from './columns'; import { columns } from './columns';
import { useClusterRoles } from './queries/useClusterRoles'; import { useClusterRoles } from './queries/useClusterRoles';
import { useDeleteClusterRoles } from './queries/useDeleteClusterRoles'; import { useDeleteClusterRolesMutation } from './queries/useDeleteClusterRolesMutation';
const storageKey = 'clusterRoles'; const storageKey = 'clusterRoles';
const settingsStore = createStore(storageKey); const settingsStore = createStore(storageKey);
@ -101,7 +101,8 @@ type TableActionsProps = {
function TableActions({ selectedItems }: TableActionsProps) { function TableActions({ selectedItems }: TableActionsProps) {
const environmentId = useEnvironmentId(); const environmentId = useEnvironmentId();
const deleteClusterRolesMutation = useDeleteClusterRoles(environmentId); const deleteClusterRolesMutation =
useDeleteClusterRolesMutation(environmentId);
const router = useRouter(); const router = useRouter();
async function handleRemoveClick(roles: SelectedRole[]) { async function handleRemoveClick(roles: SelectedRole[]) {

2
app/react/kubernetes/more-resources/ClusterRolesView/ClusterRolesDatatable/queries/useDeleteClusterRoles.ts → app/react/kubernetes/more-resources/ClusterRolesView/ClusterRolesDatatable/queries/useDeleteClusterRolesMutation.ts
View File

@ -6,7 +6,7 @@ import { EnvironmentId } from '@/react/portainer/environments/types';
import { queryKeys } from './query-keys'; import { queryKeys } from './query-keys';
export function useDeleteClusterRoles(environmentId: EnvironmentId) { export function useDeleteClusterRolesMutation(environmentId: EnvironmentId) {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation(deleteClusterRoles, { return useMutation(deleteClusterRoles, {
onSuccess: () => onSuccess: () =>

5
app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/RoleBindingsDatatable.tsx
View File

@ -26,7 +26,7 @@ import {
import { RoleBinding } from './types'; import { RoleBinding } from './types';
import { columns } from './columns'; import { columns } from './columns';
import { useRoleBindings } from './queries/useRoleBindings'; import { useRoleBindings } from './queries/useRoleBindings';
import { useDeleteRoleBindings } from './queries/useDeleteRoleBindings'; import { useDeleteRoleBindingsMutation } from './queries/useDeleteRoleBindingsMutation';
const storageKey = 'roleBindings'; const storageKey = 'roleBindings';
interface TableSettings interface TableSettings
@ -111,7 +111,8 @@ type TableActionsProps = {
function TableActions({ selectedItems }: TableActionsProps) { function TableActions({ selectedItems }: TableActionsProps) {
const environmentId = useEnvironmentId(); const environmentId = useEnvironmentId();
const deleteRoleBindingsMutation = useDeleteRoleBindings(environmentId); const deleteRoleBindingsMutation =
useDeleteRoleBindingsMutation(environmentId);
const router = useRouter(); const router = useRouter();
async function handleRemoveClick(roles: SelectedRole[]) { async function handleRemoveClick(roles: SelectedRole[]) {

2
app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/queries/useDeleteRoleBindings.ts → app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/queries/useDeleteRoleBindingsMutation.ts
View File

@ -6,7 +6,7 @@ import { EnvironmentId } from '@/react/portainer/environments/types';
import { queryKeys } from './query-keys'; import { queryKeys } from './query-keys';
export function useDeleteRoleBindings(environmentId: EnvironmentId) { export function useDeleteRoleBindingsMutation(environmentId: EnvironmentId) {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation(deleteRoleBindings, { return useMutation(deleteRoleBindings, {
...withInvalidate(queryClient, [queryKeys.list(environmentId)]), ...withInvalidate(queryClient, [queryKeys.list(environmentId)]),

4
app/react/kubernetes/more-resources/RolesView/RolesDatatable/RolesDatatable.tsx
View File

@ -27,7 +27,7 @@ import { RoleBinding } from '../RoleBindingsDatatable/types';
import { columns } from './columns'; import { columns } from './columns';
import { Role, RoleRowData } from './types'; import { Role, RoleRowData } from './types';
import { useRoles } from './queries/useRoles'; import { useRoles } from './queries/useRoles';
import { useDeleteRoles } from './queries/useDeleteRoles'; import { useDeleteRolesMutation } from './queries/useDeleteRolesMutation';
const storageKey = 'roles'; const storageKey = 'roles';
interface TableSettings interface TableSettings
@ -99,7 +99,7 @@ type TableActionsProps = {
function TableActions({ selectedItems }: TableActionsProps) { function TableActions({ selectedItems }: TableActionsProps) {
const environmentId = useEnvironmentId(); const environmentId = useEnvironmentId();
const deleteRolesMutation = useDeleteRoles(environmentId); const deleteRolesMutation = useDeleteRolesMutation(environmentId);
const router = useRouter(); const router = useRouter();
return ( return (

2
app/react/kubernetes/more-resources/RolesView/RolesDatatable/queries/useDeleteRoles.ts → app/react/kubernetes/more-resources/RolesView/RolesDatatable/queries/useDeleteRolesMutation.ts
View File

@ -6,7 +6,7 @@ import { EnvironmentId } from '@/react/portainer/environments/types';
import { queryKeys } from './query-keys'; import { queryKeys } from './query-keys';
export function useDeleteRoles(environmentId: EnvironmentId) { export function useDeleteRolesMutation(environmentId: EnvironmentId) {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation(deleteRole, { return useMutation(deleteRole, {
...withInvalidate(queryClient, [queryKeys.list(environmentId)]), ...withInvalidate(queryClient, [queryKeys.list(environmentId)]),