Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-06-04 01:18:20 +02:00
Code Issues Projects Releases Wiki Activity

feat: create ressources buttons and update all forms

Browse Source
This commit is contained in:
Youssef 2022-02-24 00:57:35 +01:00
parent 6d2ea5ebc6
commit af6542a291
17 changed files with 180 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx
View File

@ -1,12 +1,12 @@
import FormTemplate from '../../../common/FormTemplate/FormTemplate'; import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import ApiTokenForm from '../ApiTokenForm/ApiTokenForm'; import ApiTokenForm from '../ApiTokenForm/ApiTokenForm';
import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton';
import useApiTokensApi from 'hooks/api/actions/useApiTokensApi/useApiTokensApi';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useToast from 'hooks/useToast';
import useApiTokenForm from '../hooks/useApiTokenForm'; import useApiTokenForm from '../hooks/useApiTokenForm';
import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import { ADMIN } from 'component/providers/AccessProvider/permissions';
import useToast from '../../../../hooks/useToast';
import useApiTokensApi from '../../../../hooks/api/actions/useApiTokensApi/useApiTokensApi';
import PermissionButton from '../../../common/PermissionButton/PermissionButton';
import { ADMIN } from '../../../providers/AccessProvider/permissions';
import { ConfirmToken } from '../ConfirmToken/ConfirmToken'; import { ConfirmToken } from '../ConfirmToken/ConfirmToken';
import { useState } from 'react'; import { useState } from 'react';
import { scrollToTop } from '../../../common/util'; import { scrollToTop } from '../../../common/util';
@ -95,9 +95,10 @@ export const CreateApiToken = () => {
mode="Create" mode="Create"
clearErrors={clearErrors} clearErrors={clearErrors}
> >
<PermissionButton permission={ADMIN} type="submit"> <ResourceCreationButton
Create token permission={ADMIN}
</PermissionButton> ressourceName={'token'}
/>
</ApiTokenForm> </ApiTokenForm>
<ConfirmToken <ConfirmToken
open={showConfirm} open={showConfirm}

19
frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx
View File

@ -1,12 +1,12 @@
import FormTemplate from '../../../common/FormTemplate/FormTemplate'; import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import useProjectRolesApi from '../../../../hooks/api/actions/useProjectRolesApi/useProjectRolesApi'; import useProjectRolesApi from 'hooks/api/actions/useProjectRolesApi/useProjectRolesApi';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import ProjectRoleForm from '../ProjectRoleForm/ProjectRoleForm'; import ProjectRoleForm from '../ProjectRoleForm/ProjectRoleForm';
import useProjectRoleForm from '../hooks/useProjectRoleForm'; import useProjectRoleForm from '../hooks/useProjectRoleForm';
import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../../hooks/useToast'; import useToast from 'hooks/useToast';
import PermissionButton from '../../../common/PermissionButton/PermissionButton'; import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton';
import { ADMIN } from '../../../providers/AccessProvider/permissions'; import { ADMIN } from 'component/providers/AccessProvider/permissions';
const CreateProjectRole = () => { const CreateProjectRole = () => {
const { setToastData, setToastApiError } = useToast(); const { setToastData, setToastApiError } = useToast();
@ -95,9 +95,10 @@ const CreateProjectRole = () => {
validateNameUniqueness={validateNameUniqueness} validateNameUniqueness={validateNameUniqueness}
getRoleKey={getRoleKey} getRoleKey={getRoleKey}
> >
<PermissionButton permission={ADMIN} type="submit"> <ResourceCreationButton
Create role ressourceName={'role'}
</PermissionButton> permission={ADMIN}
/>
</ProjectRoleForm> </ProjectRoleForm>
</FormTemplate> </FormTemplate>
); );

27
frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx
View File

@ -1,18 +1,15 @@
import { useEffect } from 'react'; import { useEffect } from 'react';
import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import FormTemplate from '../../../common/FormTemplate/FormTemplate'; import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton';
import { ADMIN } from 'component/providers/AccessProvider/permissions';
import useProjectRolesApi from '../../../../hooks/api/actions/useProjectRolesApi/useProjectRolesApi'; import useProjectRolesApi from 'hooks/api/actions/useProjectRolesApi/useProjectRolesApi';
import useProjectRole from 'hooks/api/getters/useProjectRole/useProjectRole';
import { useHistory, useParams } from 'react-router-dom'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import ProjectRoleForm from '../ProjectRoleForm/ProjectRoleForm'; import useToast from 'hooks/useToast';
import { IPermission } from 'interfaces/user';
import { useParams, useHistory } from 'react-router-dom';
import useProjectRoleForm from '../hooks/useProjectRoleForm'; import useProjectRoleForm from '../hooks/useProjectRoleForm';
import useProjectRole from '../../../../hooks/api/getters/useProjectRole/useProjectRole'; import ProjectRoleForm from '../ProjectRoleForm/ProjectRoleForm';
import { IPermission } from '../../../../interfaces/project';
import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../../hooks/useToast';
import PermissionButton from '../../../common/PermissionButton/PermissionButton';
import { ADMIN } from '../../../providers/AccessProvider/permissions';
const EditProjectRole = () => { const EditProjectRole = () => {
const { uiConfig } = useUiConfig(); const { uiConfig } = useUiConfig();
@ -124,9 +121,7 @@ to resources within a project"
clearErrors={clearErrors} clearErrors={clearErrors}
getRoleKey={getRoleKey} getRoleKey={getRoleKey}
> >
<PermissionButton permission={ADMIN} type="submit"> <SaveChangesButton permission={ADMIN} />
Edit role
</PermissionButton>
</ProjectRoleForm> </ProjectRoleForm>
</FormTemplate> </FormTemplate>
); );

19
frontend/src/component/admin/users/CreateUser/CreateUser.tsx
View File

@ -1,15 +1,15 @@
import FormTemplate from '../../../common/FormTemplate/FormTemplate'; import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import UserForm from '../UserForm/UserForm'; import UserForm from '../UserForm/UserForm';
import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../../hooks/useToast'; import useAdminUsersApi from 'hooks/api/actions/useAdminUsersApi/useAdminUsersApi';
import useToast from 'hooks/useToast';
import useAddUserForm from '../hooks/useAddUserForm'; import useAddUserForm from '../hooks/useAddUserForm';
import useAdminUsersApi from '../../../../hooks/api/actions/useAdminUsersApi/useAdminUsersApi';
import ConfirmUserAdded from '../ConfirmUserAdded/ConfirmUserAdded'; import ConfirmUserAdded from '../ConfirmUserAdded/ConfirmUserAdded';
import { useState } from 'react'; import { useState } from 'react';
import { scrollToTop } from '../../../common/util'; import { scrollToTop } from '../../../common/util';
import PermissionButton from '../../../common/PermissionButton/PermissionButton'; import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton';
import { ADMIN } from '../../../providers/AccessProvider/permissions'; import { ADMIN } from 'component/providers/AccessProvider/permissions';
const CreateUser = () => { const CreateUser = () => {
const { setToastApiError } = useToast(); const { setToastApiError } = useToast();
@ -97,9 +97,10 @@ const CreateUser = () => {
setRootRole={setRootRole} setRootRole={setRootRole}
clearErrors={clearErrors} clearErrors={clearErrors}
> >
<PermissionButton permission={ADMIN} type="submit"> <ResourceCreationButton
Create user permission={ADMIN}
</PermissionButton> ressourceName={'user'}
/>
</UserForm> </UserForm>
<ConfirmUserAdded <ConfirmUserAdded
open={showConfirm} open={showConfirm}

20
frontend/src/component/admin/users/EditUser/EditUser.tsx
View File

@ -1,16 +1,16 @@
import FormTemplate from '../../../common/FormTemplate/FormTemplate';
import { useHistory, useParams } from 'react-router-dom'; import { useHistory, useParams } from 'react-router-dom';
import UserForm from '../UserForm/UserForm'; import UserForm from '../UserForm/UserForm';
import useAddUserForm from '../hooks/useAddUserForm'; import useAddUserForm from '../hooks/useAddUserForm';
import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../../hooks/useToast';
import useAdminUsersApi from '../../../../hooks/api/actions/useAdminUsersApi/useAdminUsersApi';
import useUserInfo from '../../../../hooks/api/getters/useUserInfo/useUserInfo';
import { scrollToTop } from '../../../common/util'; import { scrollToTop } from '../../../common/util';
import { useEffect } from 'react'; import { useEffect } from 'react';
import PermissionButton from '../../../common/PermissionButton/PermissionButton'; import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton';
import { ADMIN } from '../../../providers/AccessProvider/permissions'; import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import { EDIT } from '../../../../constants/misc'; import { ADMIN } from 'component/providers/AccessProvider/permissions';
import { EDIT } from 'constants/misc';
import useAdminUsersApi from 'hooks/api/actions/useAdminUsersApi/useAdminUsersApi';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useUserInfo from 'hooks/api/getters/useUserInfo/useUserInfo';
import useToast from 'hooks/useToast';
const EditUser = () => { const EditUser = () => {
useEffect(() => { useEffect(() => {
@ -94,9 +94,7 @@ const EditUser = () => {
clearErrors={clearErrors} clearErrors={clearErrors}
mode={EDIT} mode={EDIT}
> >
<PermissionButton permission={ADMIN} type="submit"> <SaveChangesButton permission={ADMIN} />
Edit user
</PermissionButton>
</UserForm> </UserForm>
</FormTemplate> </FormTemplate>
); );

18
frontend/src/component/common/ResourceCreationButton/ResourceCreationButton.tsx Normal file
View File

@ -0,0 +1,18 @@
import PermissionButton from '../PermissionButton/PermissionButton';
interface IResourceCreationButtonProps {
ressourceName: string;
permission: string;
}
export const ResourceCreationButton = ({
ressourceName,
permission,
...rest
}: IResourceCreationButtonProps) => {
return (
<PermissionButton permission={permission} type="submit" {...rest}>
Create {ressourceName}
</PermissionButton>
);
};

16
frontend/src/component/common/SaveChangesButton/SaveChangesButton.tsx Normal file
View File

@ -0,0 +1,16 @@
import PermissionButton from '../PermissionButton/PermissionButton';
interface ISaveChangesButtonProps {
permission: string;
}
export const SaveChangesButton = ({
permission,
...rest
}: ISaveChangesButtonProps) => {
return (
<PermissionButton permission={permission} type="submit" {...rest}>
Save
</PermissionButton>
);
};

22
frontend/src/component/context/CreateContext/CreateContext.tsx
View File

@ -1,13 +1,13 @@
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../hooks/useToast';
import FormTemplate from '../../common/FormTemplate/FormTemplate';
import useContextForm from '../hooks/useContextForm'; import useContextForm from '../hooks/useContextForm';
import ContextForm from '../ContextForm/ContextForm'; import ContextForm from '../ContextForm/ContextForm';
import PermissionButton from '../../common/PermissionButton/PermissionButton'; import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton';
import { CREATE_CONTEXT_FIELD } from '../../providers/AccessProvider/permissions'; import useToast from 'hooks/useToast';
import useContextsApi from '../../../hooks/api/actions/useContextsApi/useContextsApi'; import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import useUnleashContext from '../../../hooks/api/getters/useUnleashContext/useUnleashContext'; import { CREATE_CONTEXT_FIELD } from 'component/providers/AccessProvider/permissions';
import useContextsApi from 'hooks/api/actions/useContextsApi/useContextsApi';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useUnleashContext from 'hooks/api/getters/useUnleashContext/useUnleashContext';
const CreateContext = () => { const CreateContext = () => {
const { setToastData, setToastApiError } = useToast(); const { setToastData, setToastApiError } = useToast();
@ -91,12 +91,10 @@ const CreateContext = () => {
setErrors={setErrors} setErrors={setErrors}
clearErrors={clearErrors} clearErrors={clearErrors}
> >
<PermissionButton <ResourceCreationButton
permission={CREATE_CONTEXT_FIELD} permission={CREATE_CONTEXT_FIELD}
type="submit" ressourceName={'context'}
> />
Create context
</PermissionButton>
</ContextForm> </ContextForm>
</FormTemplate> </FormTemplate>
); );

21
frontend/src/component/context/EditContext/EditContext.tsx
View File

@ -1,13 +1,13 @@
import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton';
import { UPDATE_CONTEXT_FIELD } from 'component/providers/AccessProvider/permissions';
import useContextsApi from 'hooks/api/actions/useContextsApi/useContextsApi';
import useContext from 'hooks/api/getters/useContext/useContext';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useToast from 'hooks/useToast';
import { useEffect } from 'react'; import { useEffect } from 'react';
import { useHistory, useParams } from 'react-router-dom'; import { useHistory, useParams } from 'react-router-dom';
import useContextsApi from '../../../hooks/api/actions/useContextsApi/useContextsApi';
import useContext from '../../../hooks/api/getters/useContext/useContext';
import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../hooks/useToast';
import FormTemplate from '../../common/FormTemplate/FormTemplate';
import PermissionButton from '../../common/PermissionButton/PermissionButton';
import { scrollToTop } from '../../common/util'; import { scrollToTop } from '../../common/util';
import { UPDATE_CONTEXT_FIELD } from '../../providers/AccessProvider/permissions';
import ContextForm from '../ContextForm/ContextForm'; import ContextForm from '../ContextForm/ContextForm';
import useContextForm from '../hooks/useContextForm'; import useContextForm from '../hooks/useContextForm';
@ -103,12 +103,7 @@ const EditContext = () => {
setErrors={setErrors} setErrors={setErrors}
clearErrors={clearErrors} clearErrors={clearErrors}
> >
<PermissionButton <SaveChangesButton permission={UPDATE_CONTEXT_FIELD} />
permission={UPDATE_CONTEXT_FIELD}
type="submit"
>
Edit context
</PermissionButton>
</ContextForm> </ContextForm>
</FormTemplate> </FormTemplate>
); );

27
frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx
View File

@ -1,19 +1,19 @@
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import useEnvironmentForm from '../hooks/useEnvironmentForm'; import useEnvironmentForm from '../hooks/useEnvironmentForm';
import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../hooks/useToast';
import useEnvironmentApi from '../../../hooks/api/actions/useEnvironmentApi/useEnvironmentApi';
import EnvironmentForm from '../EnvironmentForm/EnvironmentForm'; import EnvironmentForm from '../EnvironmentForm/EnvironmentForm';
import FormTemplate from '../../common/FormTemplate/FormTemplate'; import FormTemplate from '../../common/FormTemplate/FormTemplate';
import useEnvironments from '../../../hooks/api/getters/useEnvironments/useEnvironments';
import { Alert } from '@material-ui/lab'; import { Alert } from '@material-ui/lab';
import { Button } from '@material-ui/core'; import { Button } from '@material-ui/core';
import ConditionallyRender from '../../common/ConditionallyRender'; import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton';
import PageContent from '../../common/PageContent'; import useEnvironmentApi from 'hooks/api/actions/useEnvironmentApi/useEnvironmentApi';
import HeaderTitle from '../../common/HeaderTitle'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import PermissionButton from '../../common/PermissionButton/PermissionButton'; import useToast from 'hooks/useToast';
import { ADMIN } from '../../providers/AccessProvider/permissions'; import useEnvironments from 'hooks/api/getters/useEnvironments/useEnvironments';
import useProjectRolePermissions from '../../../hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions'; import useProjectRolePermissions from 'hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions';
import ConditionallyRender from 'component/common/ConditionallyRender';
import PageContent from 'component/common/PageContent/PageContent';
import { ADMIN } from 'component/providers/AccessProvider/permissions';
import HeaderTitle from 'component/common/HeaderTitle/HeaderTitle';
const CreateEnvironment = () => { const CreateEnvironment = () => {
const { setToastApiError, setToastData } = useToast(); const { setToastApiError, setToastData } = useToast();
@ -100,9 +100,10 @@ const CreateEnvironment = () => {
mode="Create" mode="Create"
clearErrors={clearErrors} clearErrors={clearErrors}
> >
<PermissionButton permission={ADMIN} type="submit"> <ResourceCreationButton
Create environment ressourceName="environment"
</PermissionButton> permission={ADMIN}
/>
</EnvironmentForm> </EnvironmentForm>
</FormTemplate> </FormTemplate>
} }

18
frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx
View File

@ -1,11 +1,11 @@
import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton';
import useEnvironmentApi from 'hooks/api/actions/useEnvironmentApi/useEnvironmentApi';
import useEnvironment from 'hooks/api/getters/useEnvironment/useEnvironment';
import useProjectRolePermissions from 'hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useToast from 'hooks/useToast';
import { useHistory, useParams } from 'react-router-dom'; import { useHistory, useParams } from 'react-router-dom';
import useEnvironmentApi from '../../../hooks/api/actions/useEnvironmentApi/useEnvironmentApi';
import useEnvironment from '../../../hooks/api/getters/useEnvironment/useEnvironment';
import useProjectRolePermissions from '../../../hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions';
import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../hooks/useToast';
import FormTemplate from '../../common/FormTemplate/FormTemplate';
import PermissionButton from '../../common/PermissionButton/PermissionButton';
import { ADMIN } from '../../providers/AccessProvider/permissions'; import { ADMIN } from '../../providers/AccessProvider/permissions';
import EnvironmentForm from '../EnvironmentForm/EnvironmentForm'; import EnvironmentForm from '../EnvironmentForm/EnvironmentForm';
import useEnvironmentForm from '../hooks/useEnvironmentForm'; import useEnvironmentForm from '../hooks/useEnvironmentForm';
@ -85,9 +85,7 @@ const EditEnvironment = () => {
errors={errors} errors={errors}
clearErrors={clearErrors} clearErrors={clearErrors}
> >
<PermissionButton permission={ADMIN} type="submit"> <SaveChangesButton permission={ADMIN} />
Edit environment
</PermissionButton>
</EnvironmentForm> </EnvironmentForm>
</FormTemplate> </FormTemplate>
); );

25
frontend/src/component/feature/CreateFeature/CreateFeature.tsx
View File

@ -1,15 +1,15 @@
import FormTemplate from '../../common/FormTemplate/FormTemplate'; import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import FeatureForm from '../FeatureForm/FeatureForm'; import FeatureForm from '../FeatureForm/FeatureForm';
import useFeatureForm from '../hooks/useFeatureForm'; import useFeatureForm from '../hooks/useFeatureForm';
import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../hooks/useToast'; import useToast from 'hooks/useToast';
import useFeatureApi from '../../../hooks/api/actions/useFeatureApi/useFeatureApi'; import useFeatureApi from 'hooks/api/actions/useFeatureApi/useFeatureApi';
import { CREATE_FEATURE } from '../../providers/AccessProvider/permissions'; import { CREATE_FEATURE } from 'component/providers/AccessProvider/permissions';
import PermissionButton from '../../common/PermissionButton/PermissionButton';
import { CF_CREATE_BTN_ID } from '../../../testIds';
import { useContext } from 'react'; import { useContext } from 'react';
import UIContext from '../../../contexts/UIContext'; import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton';
import UIContext from 'contexts/UIContext';
import { CF_CREATE_BTN_ID } from 'testIds';
const CreateFeature = () => { const CreateFeature = () => {
const { setToastData, setToastApiError } = useToast(); const { setToastData, setToastApiError } = useToast();
@ -99,15 +99,12 @@ const CreateFeature = () => {
mode="Create" mode="Create"
clearErrors={clearErrors} clearErrors={clearErrors}
> >
<PermissionButton <ResourceCreationButton
onClick={handleSubmit} ressourceName={'Feature'}
permission={CREATE_FEATURE} permission={CREATE_FEATURE}
projectId={project} projectId={project}
type="submit"
data-test={CF_CREATE_BTN_ID} data-test={CF_CREATE_BTN_ID}
> />
Create toggle
</PermissionButton>
</FeatureForm> </FeatureForm>
</FormTemplate> </FormTemplate>
); );

21
frontend/src/component/feature/EditFeature/EditFeature.tsx
View File

@ -2,14 +2,14 @@ import FormTemplate from '../../common/FormTemplate/FormTemplate';
import { useHistory, useParams } from 'react-router-dom'; import { useHistory, useParams } from 'react-router-dom';
import FeatureForm from '../FeatureForm/FeatureForm'; import FeatureForm from '../FeatureForm/FeatureForm';
import useFeatureForm from '../hooks/useFeatureForm'; import useFeatureForm from '../hooks/useFeatureForm';
import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../hooks/useToast';
import useFeatureApi from '../../../hooks/api/actions/useFeatureApi/useFeatureApi';
import useFeature from '../../../hooks/api/getters/useFeature/useFeature';
import { IFeatureViewParams } from '../../../interfaces/params';
import * as jsonpatch from 'fast-json-patch'; import * as jsonpatch from 'fast-json-patch';
import PermissionButton from '../../common/PermissionButton/PermissionButton'; import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton';
import { UPDATE_FEATURE } from '../../providers/AccessProvider/permissions'; import { UPDATE_FEATURE } from 'component/providers/AccessProvider/permissions';
import useFeatureApi from 'hooks/api/actions/useFeatureApi/useFeatureApi';
import useFeature from 'hooks/api/getters/useFeature/useFeature';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useToast from 'hooks/useToast';
import { IFeatureViewParams } from 'interfaces/params';
const EditFeature = () => { const EditFeature = () => {
const { setToastData, setToastApiError } = useToast(); const { setToastData, setToastApiError } = useToast();
@ -101,13 +101,10 @@ const EditFeature = () => {
mode="Edit" mode="Edit"
clearErrors={clearErrors} clearErrors={clearErrors}
> >
<PermissionButton <SaveChangesButton
permission={UPDATE_FEATURE} permission={UPDATE_FEATURE}
projectId={project} projectId={project}
type="submit" />
>
Edit toggle
</PermissionButton>
</FeatureForm> </FeatureForm>
</FormTemplate> </FormTemplate>
); );

21
frontend/src/component/project/Project/CreateProject/CreateProject.tsx
View File

@ -1,13 +1,13 @@
import FormTemplate from '../../../common/FormTemplate/FormTemplate';
import useProjectApi from '../../../../hooks/api/actions/useProjectApi/useProjectApi';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import ProjectForm from '../ProjectForm/ProjectForm'; import ProjectForm from '../ProjectForm/ProjectForm';
import useProjectForm from '../hooks/useProjectForm'; import useProjectForm from '../hooks/useProjectForm';
import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton';
import useToast from '../../../../hooks/useToast'; import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import PermissionButton from '../../../common/PermissionButton/PermissionButton'; import { CREATE_PROJECT } from 'component/providers/AccessProvider/permissions';
import { CREATE_PROJECT } from '../../../providers/AccessProvider/permissions'; import useProjectApi from 'hooks/api/actions/useProjectApi/useProjectApi';
import { useAuthUser } from '../../../../hooks/api/getters/useAuth/useAuthUser'; import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useToast from 'hooks/useToast';
const CreateProject = () => { const CreateProject = () => {
const { setToastData, setToastApiError } = useToast(); const { setToastData, setToastApiError } = useToast();
@ -89,9 +89,10 @@ const CreateProject = () => {
clearErrors={clearErrors} clearErrors={clearErrors}
validateIdUniqueness={validateIdUniqueness} validateIdUniqueness={validateIdUniqueness}
> >
<PermissionButton permission={CREATE_PROJECT} type="submit"> <ResourceCreationButton
Create project ressourceName="project"
</PermissionButton> permission={CREATE_PROJECT}
/>
</ProjectForm> </ProjectForm>
</FormTemplate> </FormTemplate>
); );

18
frontend/src/component/project/Project/EditProject/EditProject.tsx
View File

@ -1,13 +1,13 @@
import FormTemplate from '../../../common/FormTemplate/FormTemplate';
import useProjectApi from '../../../../hooks/api/actions/useProjectApi/useProjectApi';
import { useHistory, useParams } from 'react-router-dom'; import { useHistory, useParams } from 'react-router-dom';
import ProjectForm from '../ProjectForm/ProjectForm'; import ProjectForm from '../ProjectForm/ProjectForm';
import useProjectForm from '../hooks/useProjectForm'; import useProjectForm from '../hooks/useProjectForm';
import useProject from '../../../../hooks/api/getters/useProject/useProject'; import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton';
import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import useToast from '../../../../hooks/useToast'; import { UPDATE_PROJECT } from 'component/providers/AccessProvider/permissions';
import PermissionButton from '../../../common/PermissionButton/PermissionButton'; import useProjectApi from 'hooks/api/actions/useProjectApi/useProjectApi';
import { UPDATE_PROJECT } from '../../../providers/AccessProvider/permissions'; import useProject from 'hooks/api/getters/useProject/useProject';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useToast from 'hooks/useToast';
const EditProject = () => { const EditProject = () => {
const { uiConfig } = useUiConfig(); const { uiConfig } = useUiConfig();
@ -90,9 +90,7 @@ const EditProject = () => {
clearErrors={clearErrors} clearErrors={clearErrors}
validateIdUniqueness={validateIdUniqueness} validateIdUniqueness={validateIdUniqueness}
> >
<PermissionButton permission={UPDATE_PROJECT} type="submit"> <SaveChangesButton permission={UPDATE_PROJECT} />
Edit project
</PermissionButton>
</ProjectForm> </ProjectForm>
</FormTemplate> </FormTemplate>
); );

19
frontend/src/component/tags/CreateTagType/CreateTagType.tsx
View File

@ -1,12 +1,12 @@
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import useTagTypesApi from '../../../hooks/api/actions/useTagTypesApi/useTagTypesApi';
import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../hooks/useToast';
import FormTemplate from '../../common/FormTemplate/FormTemplate';
import PermissionButton from '../../common/PermissionButton/PermissionButton';
import { UPDATE_TAG_TYPE } from '../../providers/AccessProvider/permissions';
import useTagTypeForm from '../TagTypeForm/useTagTypeForm'; import useTagTypeForm from '../TagTypeForm/useTagTypeForm';
import TagTypeForm from '../TagTypeForm/TagTypeForm'; import TagTypeForm from '../TagTypeForm/TagTypeForm';
import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton';
import FormTemplate from 'component/common/FormTemplate/FormTemplate';
import { UPDATE_TAG_TYPE } from 'component/providers/AccessProvider/permissions';
import useTagTypesApi from 'hooks/api/actions/useTagTypesApi/useTagTypesApi';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useToast from 'hooks/useToast';
const CreateTagType = () => { const CreateTagType = () => {
const { setToastData, setToastApiError } = useToast(); const { setToastData, setToastApiError } = useToast();
@ -77,9 +77,10 @@ const CreateTagType = () => {
clearErrors={clearErrors} clearErrors={clearErrors}
validateNameUniqueness={validateNameUniqueness} validateNameUniqueness={validateNameUniqueness}
> >
<PermissionButton permission={UPDATE_TAG_TYPE} type="submit"> <ResourceCreationButton
Create type ressourceName="type"
</PermissionButton> permission={UPDATE_TAG_TYPE}
/>
</TagTypeForm> </TagTypeForm>
</FormTemplate> </FormTemplate>
); );

16
frontend/src/component/tags/EditTagType/EditTagType.tsx
View File

@ -1,13 +1,13 @@
import { useHistory, useParams } from 'react-router-dom'; import { useHistory, useParams } from 'react-router-dom';
import useTagTypesApi from '../../../hooks/api/actions/useTagTypesApi/useTagTypesApi';
import useTagType from '../../../hooks/api/getters/useTagType/useTagType';
import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig';
import useToast from '../../../hooks/useToast';
import FormTemplate from '../../common/FormTemplate/FormTemplate';
import PermissionButton from '../../common/PermissionButton/PermissionButton';
import { UPDATE_TAG_TYPE } from '../../providers/AccessProvider/permissions'; import { UPDATE_TAG_TYPE } from '../../providers/AccessProvider/permissions';
import useTagTypeForm from '../TagTypeForm/useTagTypeForm'; import useTagTypeForm from '../TagTypeForm/useTagTypeForm';
import TagForm from '../TagTypeForm/TagTypeForm'; import TagForm from '../TagTypeForm/TagTypeForm';
import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton';
import useTagTypesApi from 'hooks/api/actions/useTagTypesApi/useTagTypesApi';
import useTagType from 'hooks/api/getters/useTagType/useTagType';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';
import useToast from 'hooks/useToast';
import FormTemplate from 'component/common/FormTemplate/FormTemplate';
const EditTagType = () => { const EditTagType = () => {
const { setToastData, setToastApiError } = useToast(); const { setToastData, setToastApiError } = useToast();
@ -74,9 +74,7 @@ const EditTagType = () => {
mode="Edit" mode="Edit"
clearErrors={clearErrors} clearErrors={clearErrors}
> >
<PermissionButton permission={UPDATE_TAG_TYPE} type="submit"> <SaveChangesButton permission={UPDATE_TAG_TYPE} />
Edit type
</PermissionButton>
</TagForm> </TagForm>
</FormTemplate> </FormTemplate>
); );