Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 05:45:22 +02:00
Code Issues Releases Activity

refactor(app): move access-control components [EE-3441] (#7559)

Browse source
This commit is contained in:
Chaim Lev-Ari 2022-09-07 07:25:00 +03:00 • committed by GitHub
parent 77c3f9131b
commit d9cc7eda51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 57 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.tsx
View file

@ -4,7 +4,7 @@ import { useRouter } from '@uirouter/react';
import { ContainerInstanceFormValues } from '@/react/azure/types';
import * as notifications from '@/portainer/services/notifications';
import { useUser } from '@/portainer/hooks/useUser';
import { AccessControlForm } from '@/portainer/access-control/AccessControlForm';
import { AccessControlForm } from '@/react/portainer/access-control/AccessControlForm';
import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId';
import { FormControl } from '@@/form-components/FormControl';

2
app/react/azure/container-instances/CreateView/CreateContainerInstanceForm.validation.ts
View file

@ -1,6 +1,6 @@
import { object, string, number, boolean } from 'yup';
import { validationSchema as accessControlSchema } from '@/portainer/access-control/AccessControlForm/AccessControlForm.validation';
import { validationSchema as accessControlSchema } from '@/react/portainer/access-control/AccessControlForm/AccessControlForm.validation';
import { validationSchema as portsSchema } from './PortsMappingField.validation';

2
app/react/azure/container-instances/CreateView/useCreateInstanceMutation.tsx
View file

@ -9,7 +9,7 @@ import {
ContainerInstanceFormValues,
ResourceGroup,
} from '@/react/azure/types';
import { applyResourceControl } from '@/portainer/access-control/access-control.service';
import { applyResourceControl } from '@/react/portainer/access-control/access-control.service';
import { getSubscriptionResourceGroups } from './utils';

2
app/react/azure/container-instances/CreateView/useLoadFormState.ts
View file

@ -5,7 +5,7 @@ import {
ResourceGroup,
Subscription,
} from '@/react/azure/types';
import { parseAccessControlFormData } from '@/portainer/access-control/utils';
import { parseAccessControlFormData } from '@/react/portainer/access-control/utils';
import { useUser } from '@/portainer/hooks/useUser';
import { useProvider } from '@/react/azure/queries/useProvider';
import { useResourceGroups } from '@/react/azure/queries/useResourceGroups';

6
app/react/azure/container-instances/ItemView/ItemView.tsx
View file

@ -2,9 +2,9 @@ import { useCurrentStateAndParams } from '@uirouter/react';
import { useQueryClient } from 'react-query';
import { useEnvironmentId } from '@/portainer/hooks/useEnvironmentId';
import { AccessControlPanel } from '@/portainer/access-control/AccessControlPanel/AccessControlPanel';
import { ResourceControlViewModel } from '@/portainer/access-control/models/ResourceControlViewModel';
import { ResourceControlType } from '@/portainer/access-control/types';
import { AccessControlPanel } from '@/react/portainer/access-control/AccessControlPanel/AccessControlPanel';
import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel';
import { ResourceControlType } from '@/react/portainer/access-control/types';
import {
ContainerGroup,
ResourceGroup,

4
app/react/azure/container-instances/ListView/columns/ownership.tsx
View file

@ -2,9 +2,9 @@ import { Column } from 'react-table';
import clsx from 'clsx';
import { ownershipIcon } from '@/portainer/filters/filters';
import { ResourceControlOwnership } from '@/portainer/access-control/types';
import { ResourceControlOwnership } from '@/react/portainer/access-control/types';
import { ContainerGroup } from '@/react/azure/types';
import { determineOwnership } from '@/portainer/access-control/models/ResourceControlViewModel';
import { determineOwnership } from '@/react/portainer/access-control/models/ResourceControlViewModel';
export const ownership: Column<ContainerGroup> = {
Header: 'Ownership',

2
app/react/azure/types.ts
View file

@ -1,4 +1,4 @@
import { AccessControlFormData } from '@/portainer/access-control/types';
import { AccessControlFormData } from '@/react/portainer/access-control/types';
import { PortainerMetadata } from '@/react/docker/types';
import { PortMapping } from './container-instances/CreateView/PortsMappingField';