From af6542a2916877ddb69450421994ab4538e0edae Mon Sep 17 00:00:00 2001 From: Youssef Date: Thu, 24 Feb 2022 00:57:35 +0100 Subject: [PATCH 1/4] feat: create ressources buttons and update all forms --- .../CreateApiToken/CreateApiToken.tsx | 19 ++++++------- .../CreateProjectRole/CreateProjectRole.tsx | 19 ++++++------- .../EditProjectRole/EditProjectRole.tsx | 27 ++++++++----------- .../admin/users/CreateUser/CreateUser.tsx | 19 ++++++------- .../admin/users/EditUser/EditUser.tsx | 20 +++++++------- .../ResourceCreationButton.tsx | 18 +++++++++++++ .../SaveChangesButton/SaveChangesButton.tsx | 16 +++++++++++ .../context/CreateContext/CreateContext.tsx | 22 +++++++-------- .../context/EditContext/EditContext.tsx | 21 ++++++--------- .../CreateEnvironment/CreateEnvironment.tsx | 27 ++++++++++--------- .../EditEnvironment/EditEnvironment.tsx | 18 ++++++------- .../feature/CreateFeature/CreateFeature.tsx | 25 ++++++++--------- .../feature/EditFeature/EditFeature.tsx | 21 +++++++-------- .../Project/CreateProject/CreateProject.tsx | 21 ++++++++------- .../Project/EditProject/EditProject.tsx | 18 ++++++------- .../tags/CreateTagType/CreateTagType.tsx | 19 ++++++------- .../tags/EditTagType/EditTagType.tsx | 16 +++++------ 17 files changed, 180 insertions(+), 166 deletions(-) create mode 100644 frontend/src/component/common/ResourceCreationButton/ResourceCreationButton.tsx create mode 100644 frontend/src/component/common/SaveChangesButton/SaveChangesButton.tsx diff --git a/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx b/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx index 85f2ff0e0e..ce66a5388e 100644 --- a/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx +++ b/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx @@ -1,12 +1,12 @@ -import FormTemplate from '../../../common/FormTemplate/FormTemplate'; +import FormTemplate from 'component/common/FormTemplate/FormTemplate'; import { useHistory } from 'react-router-dom'; 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 useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; -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 { ADMIN } from 'component/providers/AccessProvider/permissions'; import { ConfirmToken } from '../ConfirmToken/ConfirmToken'; import { useState } from 'react'; import { scrollToTop } from '../../../common/util'; @@ -95,9 +95,10 @@ export const CreateApiToken = () => { mode="Create" clearErrors={clearErrors} > - - Create token - + { const { setToastData, setToastApiError } = useToast(); @@ -95,9 +95,10 @@ const CreateProjectRole = () => { validateNameUniqueness={validateNameUniqueness} getRoleKey={getRoleKey} > - - Create role - + ); diff --git a/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx b/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx index eb79af949c..d5071139d0 100644 --- a/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx +++ b/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx @@ -1,18 +1,15 @@ import { useEffect } from 'react'; - -import FormTemplate from '../../../common/FormTemplate/FormTemplate'; - -import useProjectRolesApi from '../../../../hooks/api/actions/useProjectRolesApi/useProjectRolesApi'; - -import { useHistory, useParams } from 'react-router-dom'; -import ProjectRoleForm from '../ProjectRoleForm/ProjectRoleForm'; +import FormTemplate from 'component/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 useProjectRole from 'hooks/api/getters/useProjectRole/useProjectRole'; +import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; +import useToast from 'hooks/useToast'; +import { IPermission } from 'interfaces/user'; +import { useParams, useHistory } from 'react-router-dom'; import useProjectRoleForm from '../hooks/useProjectRoleForm'; -import useProjectRole from '../../../../hooks/api/getters/useProjectRole/useProjectRole'; -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'; +import ProjectRoleForm from '../ProjectRoleForm/ProjectRoleForm'; const EditProjectRole = () => { const { uiConfig } = useUiConfig(); @@ -124,9 +121,7 @@ to resources within a project" clearErrors={clearErrors} getRoleKey={getRoleKey} > - - Edit role - + ); diff --git a/frontend/src/component/admin/users/CreateUser/CreateUser.tsx b/frontend/src/component/admin/users/CreateUser/CreateUser.tsx index f480eb7535..9270eea424 100644 --- a/frontend/src/component/admin/users/CreateUser/CreateUser.tsx +++ b/frontend/src/component/admin/users/CreateUser/CreateUser.tsx @@ -1,15 +1,15 @@ -import FormTemplate from '../../../common/FormTemplate/FormTemplate'; +import FormTemplate from 'component/common/FormTemplate/FormTemplate'; import { useHistory } from 'react-router-dom'; import UserForm from '../UserForm/UserForm'; -import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; -import useToast from '../../../../hooks/useToast'; +import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; +import useAdminUsersApi from 'hooks/api/actions/useAdminUsersApi/useAdminUsersApi'; +import useToast from 'hooks/useToast'; import useAddUserForm from '../hooks/useAddUserForm'; -import useAdminUsersApi from '../../../../hooks/api/actions/useAdminUsersApi/useAdminUsersApi'; import ConfirmUserAdded from '../ConfirmUserAdded/ConfirmUserAdded'; import { useState } from 'react'; import { scrollToTop } from '../../../common/util'; -import PermissionButton from '../../../common/PermissionButton/PermissionButton'; -import { ADMIN } from '../../../providers/AccessProvider/permissions'; +import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton'; +import { ADMIN } from 'component/providers/AccessProvider/permissions'; const CreateUser = () => { const { setToastApiError } = useToast(); @@ -97,9 +97,10 @@ const CreateUser = () => { setRootRole={setRootRole} clearErrors={clearErrors} > - - Create user - + { useEffect(() => { @@ -94,9 +94,7 @@ const EditUser = () => { clearErrors={clearErrors} mode={EDIT} > - - Edit user - + ); diff --git a/frontend/src/component/common/ResourceCreationButton/ResourceCreationButton.tsx b/frontend/src/component/common/ResourceCreationButton/ResourceCreationButton.tsx new file mode 100644 index 0000000000..4f49b10eb1 --- /dev/null +++ b/frontend/src/component/common/ResourceCreationButton/ResourceCreationButton.tsx @@ -0,0 +1,18 @@ +import PermissionButton from '../PermissionButton/PermissionButton'; + +interface IResourceCreationButtonProps { + ressourceName: string; + permission: string; +} + +export const ResourceCreationButton = ({ + ressourceName, + permission, + ...rest +}: IResourceCreationButtonProps) => { + return ( + + Create {ressourceName} + + ); +}; diff --git a/frontend/src/component/common/SaveChangesButton/SaveChangesButton.tsx b/frontend/src/component/common/SaveChangesButton/SaveChangesButton.tsx new file mode 100644 index 0000000000..f314d5a57d --- /dev/null +++ b/frontend/src/component/common/SaveChangesButton/SaveChangesButton.tsx @@ -0,0 +1,16 @@ +import PermissionButton from '../PermissionButton/PermissionButton'; + +interface ISaveChangesButtonProps { + permission: string; +} + +export const SaveChangesButton = ({ + permission, + ...rest +}: ISaveChangesButtonProps) => { + return ( + + Save + + ); +}; diff --git a/frontend/src/component/context/CreateContext/CreateContext.tsx b/frontend/src/component/context/CreateContext/CreateContext.tsx index e1faa2e9f5..28de67b0d6 100644 --- a/frontend/src/component/context/CreateContext/CreateContext.tsx +++ b/frontend/src/component/context/CreateContext/CreateContext.tsx @@ -1,13 +1,13 @@ 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 ContextForm from '../ContextForm/ContextForm'; -import PermissionButton from '../../common/PermissionButton/PermissionButton'; -import { CREATE_CONTEXT_FIELD } from '../../providers/AccessProvider/permissions'; -import useContextsApi from '../../../hooks/api/actions/useContextsApi/useContextsApi'; -import useUnleashContext from '../../../hooks/api/getters/useUnleashContext/useUnleashContext'; +import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton'; +import useToast from 'hooks/useToast'; +import FormTemplate from 'component/common/FormTemplate/FormTemplate'; +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 { setToastData, setToastApiError } = useToast(); @@ -91,12 +91,10 @@ const CreateContext = () => { setErrors={setErrors} clearErrors={clearErrors} > - - Create context - + ressourceName={'context'} + /> ); diff --git a/frontend/src/component/context/EditContext/EditContext.tsx b/frontend/src/component/context/EditContext/EditContext.tsx index 146353167b..7150dbd5ca 100644 --- a/frontend/src/component/context/EditContext/EditContext.tsx +++ b/frontend/src/component/context/EditContext/EditContext.tsx @@ -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 { 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 { UPDATE_CONTEXT_FIELD } from '../../providers/AccessProvider/permissions'; import ContextForm from '../ContextForm/ContextForm'; import useContextForm from '../hooks/useContextForm'; @@ -103,12 +103,7 @@ const EditContext = () => { setErrors={setErrors} clearErrors={clearErrors} > - - Edit context - + ); diff --git a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx index 567a09d9fb..ffabb7b9cf 100644 --- a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx +++ b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx @@ -1,19 +1,19 @@ import { useHistory } from 'react-router-dom'; 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 FormTemplate from '../../common/FormTemplate/FormTemplate'; -import useEnvironments from '../../../hooks/api/getters/useEnvironments/useEnvironments'; import { Alert } from '@material-ui/lab'; import { Button } from '@material-ui/core'; -import ConditionallyRender from '../../common/ConditionallyRender'; -import PageContent from '../../common/PageContent'; -import HeaderTitle from '../../common/HeaderTitle'; -import PermissionButton from '../../common/PermissionButton/PermissionButton'; -import { ADMIN } from '../../providers/AccessProvider/permissions'; -import useProjectRolePermissions from '../../../hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions'; +import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton'; +import useEnvironmentApi from 'hooks/api/actions/useEnvironmentApi/useEnvironmentApi'; +import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; +import useToast from 'hooks/useToast'; +import useEnvironments from 'hooks/api/getters/useEnvironments/useEnvironments'; +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 { setToastApiError, setToastData } = useToast(); @@ -100,9 +100,10 @@ const CreateEnvironment = () => { mode="Create" clearErrors={clearErrors} > - - Create environment - + } diff --git a/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx b/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx index ecfc11ec5d..431763ec1e 100644 --- a/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx +++ b/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx @@ -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 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 EnvironmentForm from '../EnvironmentForm/EnvironmentForm'; import useEnvironmentForm from '../hooks/useEnvironmentForm'; @@ -85,9 +85,7 @@ const EditEnvironment = () => { errors={errors} clearErrors={clearErrors} > - - Edit environment - + ); diff --git a/frontend/src/component/feature/CreateFeature/CreateFeature.tsx b/frontend/src/component/feature/CreateFeature/CreateFeature.tsx index 2fe8477254..5cc637c635 100644 --- a/frontend/src/component/feature/CreateFeature/CreateFeature.tsx +++ b/frontend/src/component/feature/CreateFeature/CreateFeature.tsx @@ -1,15 +1,15 @@ -import FormTemplate from '../../common/FormTemplate/FormTemplate'; +import FormTemplate from 'component/common/FormTemplate/FormTemplate'; import { useHistory } from 'react-router-dom'; import FeatureForm from '../FeatureForm/FeatureForm'; 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 { CREATE_FEATURE } from '../../providers/AccessProvider/permissions'; -import PermissionButton from '../../common/PermissionButton/PermissionButton'; -import { CF_CREATE_BTN_ID } from '../../../testIds'; +import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; +import useToast from 'hooks/useToast'; +import useFeatureApi from 'hooks/api/actions/useFeatureApi/useFeatureApi'; +import { CREATE_FEATURE } from 'component/providers/AccessProvider/permissions'; 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 { setToastData, setToastApiError } = useToast(); @@ -99,15 +99,12 @@ const CreateFeature = () => { mode="Create" clearErrors={clearErrors} > - - Create toggle - + /> ); diff --git a/frontend/src/component/feature/EditFeature/EditFeature.tsx b/frontend/src/component/feature/EditFeature/EditFeature.tsx index 239dac8030..821045589c 100644 --- a/frontend/src/component/feature/EditFeature/EditFeature.tsx +++ b/frontend/src/component/feature/EditFeature/EditFeature.tsx @@ -2,14 +2,14 @@ import FormTemplate from '../../common/FormTemplate/FormTemplate'; import { useHistory, useParams } from 'react-router-dom'; import FeatureForm from '../FeatureForm/FeatureForm'; 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 PermissionButton from '../../common/PermissionButton/PermissionButton'; -import { UPDATE_FEATURE } from '../../providers/AccessProvider/permissions'; +import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton'; +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 { setToastData, setToastApiError } = useToast(); @@ -101,13 +101,10 @@ const EditFeature = () => { mode="Edit" clearErrors={clearErrors} > - - Edit toggle - + /> ); diff --git a/frontend/src/component/project/Project/CreateProject/CreateProject.tsx b/frontend/src/component/project/Project/CreateProject/CreateProject.tsx index a847e890ee..d0ab5977be 100644 --- a/frontend/src/component/project/Project/CreateProject/CreateProject.tsx +++ b/frontend/src/component/project/Project/CreateProject/CreateProject.tsx @@ -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 ProjectForm from '../ProjectForm/ProjectForm'; import useProjectForm from '../hooks/useProjectForm'; -import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; -import useToast from '../../../../hooks/useToast'; -import PermissionButton from '../../../common/PermissionButton/PermissionButton'; -import { CREATE_PROJECT } from '../../../providers/AccessProvider/permissions'; -import { useAuthUser } from '../../../../hooks/api/getters/useAuth/useAuthUser'; +import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton'; +import FormTemplate from 'component/common/FormTemplate/FormTemplate'; +import { CREATE_PROJECT } from 'component/providers/AccessProvider/permissions'; +import useProjectApi from 'hooks/api/actions/useProjectApi/useProjectApi'; +import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser'; +import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; +import useToast from 'hooks/useToast'; const CreateProject = () => { const { setToastData, setToastApiError } = useToast(); @@ -89,9 +89,10 @@ const CreateProject = () => { clearErrors={clearErrors} validateIdUniqueness={validateIdUniqueness} > - - Create project - + ); diff --git a/frontend/src/component/project/Project/EditProject/EditProject.tsx b/frontend/src/component/project/Project/EditProject/EditProject.tsx index dcf9016168..fa372ba814 100644 --- a/frontend/src/component/project/Project/EditProject/EditProject.tsx +++ b/frontend/src/component/project/Project/EditProject/EditProject.tsx @@ -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 ProjectForm from '../ProjectForm/ProjectForm'; import useProjectForm from '../hooks/useProjectForm'; -import useProject from '../../../../hooks/api/getters/useProject/useProject'; -import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; -import useToast from '../../../../hooks/useToast'; -import PermissionButton from '../../../common/PermissionButton/PermissionButton'; -import { UPDATE_PROJECT } from '../../../providers/AccessProvider/permissions'; +import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton'; +import FormTemplate from 'component/common/FormTemplate/FormTemplate'; +import { UPDATE_PROJECT } from 'component/providers/AccessProvider/permissions'; +import useProjectApi from 'hooks/api/actions/useProjectApi/useProjectApi'; +import useProject from 'hooks/api/getters/useProject/useProject'; +import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; +import useToast from 'hooks/useToast'; const EditProject = () => { const { uiConfig } = useUiConfig(); @@ -90,9 +90,7 @@ const EditProject = () => { clearErrors={clearErrors} validateIdUniqueness={validateIdUniqueness} > - - Edit project - + ); diff --git a/frontend/src/component/tags/CreateTagType/CreateTagType.tsx b/frontend/src/component/tags/CreateTagType/CreateTagType.tsx index 147129e1b9..ff1893eb7f 100644 --- a/frontend/src/component/tags/CreateTagType/CreateTagType.tsx +++ b/frontend/src/component/tags/CreateTagType/CreateTagType.tsx @@ -1,12 +1,12 @@ 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 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 { setToastData, setToastApiError } = useToast(); @@ -77,9 +77,10 @@ const CreateTagType = () => { clearErrors={clearErrors} validateNameUniqueness={validateNameUniqueness} > - - Create type - + ); diff --git a/frontend/src/component/tags/EditTagType/EditTagType.tsx b/frontend/src/component/tags/EditTagType/EditTagType.tsx index cf73153ffe..f084df76f7 100644 --- a/frontend/src/component/tags/EditTagType/EditTagType.tsx +++ b/frontend/src/component/tags/EditTagType/EditTagType.tsx @@ -1,13 +1,13 @@ 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 useTagTypeForm from '../TagTypeForm/useTagTypeForm'; 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 { setToastData, setToastApiError } = useToast(); @@ -74,9 +74,7 @@ const EditTagType = () => { mode="Edit" clearErrors={clearErrors} > - - Edit type - + ); From 5371e15333c5d73af997a5e1ad9eca35723e3995 Mon Sep 17 00:00:00 2001 From: Youssef Date: Thu, 24 Feb 2022 09:23:07 +0100 Subject: [PATCH 2/4] refactor: change resourceCreateButton and SaveChangesButton name --- .../CreateApiToken/CreateApiToken.tsx | 7 ++----- .../CreateProjectRole/CreateProjectRole.tsx | 7 ++----- .../EditProjectRole/EditProjectRole.tsx | 4 ++-- .../admin/users/CreateUser/CreateUser.tsx | 7 ++----- .../admin/users/EditUser/EditUser.tsx | 4 ++-- .../common/CreateButton/CreateButton.tsx | 19 +++++++++++++++++++ .../PermissionButton/PermissionButton.tsx | 6 +++--- .../ResourceCreationButton.tsx | 18 ------------------ .../SaveChangesButton/SaveChangesButton.tsx | 16 ---------------- .../common/UpdateButton/UpdateButton.tsx | 13 +++++++++++++ .../context/CreateContext/CreateContext.tsx | 6 +++--- .../context/EditContext/EditContext.tsx | 4 ++-- .../CreateEnvironment/CreateEnvironment.tsx | 7 ++----- .../EditEnvironment/EditEnvironment.tsx | 4 ++-- .../feature/CreateFeature/CreateFeature.tsx | 6 +++--- .../feature/EditFeature/EditFeature.tsx | 7 ++----- .../Project/CreateProject/CreateProject.tsx | 7 ++----- .../Project/EditProject/EditProject.tsx | 4 ++-- .../tags/CreateTagType/CreateTagType.tsx | 7 ++----- .../tags/EditTagType/EditTagType.tsx | 4 ++-- 20 files changed, 67 insertions(+), 90 deletions(-) create mode 100644 frontend/src/component/common/CreateButton/CreateButton.tsx delete mode 100644 frontend/src/component/common/ResourceCreationButton/ResourceCreationButton.tsx delete mode 100644 frontend/src/component/common/SaveChangesButton/SaveChangesButton.tsx create mode 100644 frontend/src/component/common/UpdateButton/UpdateButton.tsx diff --git a/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx b/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx index ce66a5388e..6d693005fe 100644 --- a/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx +++ b/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx @@ -1,7 +1,7 @@ import FormTemplate from 'component/common/FormTemplate/FormTemplate'; import { useHistory } from 'react-router-dom'; import ApiTokenForm from '../ApiTokenForm/ApiTokenForm'; -import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton'; +import { CreateButton } from 'component/common/CreateButton/CreateButton'; import useApiTokensApi from 'hooks/api/actions/useApiTokensApi/useApiTokensApi'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import useToast from 'hooks/useToast'; @@ -95,10 +95,7 @@ export const CreateApiToken = () => { mode="Create" clearErrors={clearErrors} > - + { @@ -95,10 +95,7 @@ const CreateProjectRole = () => { validateNameUniqueness={validateNameUniqueness} getRoleKey={getRoleKey} > - + ); diff --git a/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx b/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx index d5071139d0..3bcdef9960 100644 --- a/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx +++ b/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx @@ -1,6 +1,6 @@ import { useEffect } from 'react'; import FormTemplate from 'component/common/FormTemplate/FormTemplate'; -import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton'; +import { UpdateButton } from 'component/common/UpdateButton/UpdateButton'; import { ADMIN } from 'component/providers/AccessProvider/permissions'; import useProjectRolesApi from 'hooks/api/actions/useProjectRolesApi/useProjectRolesApi'; import useProjectRole from 'hooks/api/getters/useProjectRole/useProjectRole'; @@ -121,7 +121,7 @@ to resources within a project" clearErrors={clearErrors} getRoleKey={getRoleKey} > - + ); diff --git a/frontend/src/component/admin/users/CreateUser/CreateUser.tsx b/frontend/src/component/admin/users/CreateUser/CreateUser.tsx index 9270eea424..e64a08b7d7 100644 --- a/frontend/src/component/admin/users/CreateUser/CreateUser.tsx +++ b/frontend/src/component/admin/users/CreateUser/CreateUser.tsx @@ -8,7 +8,7 @@ import useAddUserForm from '../hooks/useAddUserForm'; import ConfirmUserAdded from '../ConfirmUserAdded/ConfirmUserAdded'; import { useState } from 'react'; import { scrollToTop } from '../../../common/util'; -import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton'; +import { CreateButton } from 'component/common/CreateButton/CreateButton'; import { ADMIN } from 'component/providers/AccessProvider/permissions'; const CreateUser = () => { @@ -97,10 +97,7 @@ const CreateUser = () => { setRootRole={setRootRole} clearErrors={clearErrors} > - + { clearErrors={clearErrors} mode={EDIT} > - + ); diff --git a/frontend/src/component/common/CreateButton/CreateButton.tsx b/frontend/src/component/common/CreateButton/CreateButton.tsx new file mode 100644 index 0000000000..87f9f45464 --- /dev/null +++ b/frontend/src/component/common/CreateButton/CreateButton.tsx @@ -0,0 +1,19 @@ +import PermissionButton, { + IPermissionButtonProps, +} from '../PermissionButton/PermissionButton'; + +interface ICreateButtonProps extends IPermissionButtonProps { + name: string; +} + +export const CreateButton = ({ + name, + permission, + ...rest +}: ICreateButtonProps) => { + return ( + + Create {name} + + ); +}; diff --git a/frontend/src/component/common/PermissionButton/PermissionButton.tsx b/frontend/src/component/common/PermissionButton/PermissionButton.tsx index 161a2ee05c..0df5a0c319 100644 --- a/frontend/src/component/common/PermissionButton/PermissionButton.tsx +++ b/frontend/src/component/common/PermissionButton/PermissionButton.tsx @@ -1,10 +1,10 @@ import { Button, Tooltip } from '@material-ui/core'; import { Lock } from '@material-ui/icons'; +import AccessContext from 'contexts/AccessContext'; import { useContext } from 'react'; -import AccessContext from '../../../contexts/AccessContext'; import ConditionallyRender from '../ConditionallyRender'; -export interface IPermissionIconButtonProps +export interface IPermissionButtonProps extends React.HTMLProps { permission: string | string[]; tooltip?: string; @@ -14,7 +14,7 @@ export interface IPermissionIconButtonProps environmentId?: string; } -const PermissionButton: React.FC = ({ +const PermissionButton: React.FC = ({ permission, tooltip = 'Click to perform action', onClick, diff --git a/frontend/src/component/common/ResourceCreationButton/ResourceCreationButton.tsx b/frontend/src/component/common/ResourceCreationButton/ResourceCreationButton.tsx deleted file mode 100644 index 4f49b10eb1..0000000000 --- a/frontend/src/component/common/ResourceCreationButton/ResourceCreationButton.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import PermissionButton from '../PermissionButton/PermissionButton'; - -interface IResourceCreationButtonProps { - ressourceName: string; - permission: string; -} - -export const ResourceCreationButton = ({ - ressourceName, - permission, - ...rest -}: IResourceCreationButtonProps) => { - return ( - - Create {ressourceName} - - ); -}; diff --git a/frontend/src/component/common/SaveChangesButton/SaveChangesButton.tsx b/frontend/src/component/common/SaveChangesButton/SaveChangesButton.tsx deleted file mode 100644 index f314d5a57d..0000000000 --- a/frontend/src/component/common/SaveChangesButton/SaveChangesButton.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import PermissionButton from '../PermissionButton/PermissionButton'; - -interface ISaveChangesButtonProps { - permission: string; -} - -export const SaveChangesButton = ({ - permission, - ...rest -}: ISaveChangesButtonProps) => { - return ( - - Save - - ); -}; diff --git a/frontend/src/component/common/UpdateButton/UpdateButton.tsx b/frontend/src/component/common/UpdateButton/UpdateButton.tsx new file mode 100644 index 0000000000..27c1808241 --- /dev/null +++ b/frontend/src/component/common/UpdateButton/UpdateButton.tsx @@ -0,0 +1,13 @@ +import PermissionButton, { + IPermissionButtonProps, +} from '../PermissionButton/PermissionButton'; + +interface IUpdateButtonProps extends IPermissionButtonProps {} + +export const UpdateButton = ({ permission, ...rest }: IUpdateButtonProps) => { + return ( + + Save + + ); +}; diff --git a/frontend/src/component/context/CreateContext/CreateContext.tsx b/frontend/src/component/context/CreateContext/CreateContext.tsx index 28de67b0d6..3b10300a58 100644 --- a/frontend/src/component/context/CreateContext/CreateContext.tsx +++ b/frontend/src/component/context/CreateContext/CreateContext.tsx @@ -1,7 +1,7 @@ import { useHistory } from 'react-router-dom'; import useContextForm from '../hooks/useContextForm'; import ContextForm from '../ContextForm/ContextForm'; -import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton'; +import { CreateButton } from 'component/common/CreateButton/CreateButton'; import useToast from 'hooks/useToast'; import FormTemplate from 'component/common/FormTemplate/FormTemplate'; import { CREATE_CONTEXT_FIELD } from 'component/providers/AccessProvider/permissions'; @@ -91,9 +91,9 @@ const CreateContext = () => { setErrors={setErrors} clearErrors={clearErrors} > - diff --git a/frontend/src/component/context/EditContext/EditContext.tsx b/frontend/src/component/context/EditContext/EditContext.tsx index 7150dbd5ca..03c3883e49 100644 --- a/frontend/src/component/context/EditContext/EditContext.tsx +++ b/frontend/src/component/context/EditContext/EditContext.tsx @@ -1,5 +1,5 @@ import FormTemplate from 'component/common/FormTemplate/FormTemplate'; -import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton'; +import { UpdateButton } from 'component/common/UpdateButton/UpdateButton'; 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'; @@ -103,7 +103,7 @@ const EditContext = () => { setErrors={setErrors} clearErrors={clearErrors} > - + ); diff --git a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx index ffabb7b9cf..e2f8d7eb4a 100644 --- a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx +++ b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx @@ -4,7 +4,7 @@ import EnvironmentForm from '../EnvironmentForm/EnvironmentForm'; import FormTemplate from '../../common/FormTemplate/FormTemplate'; import { Alert } from '@material-ui/lab'; import { Button } from '@material-ui/core'; -import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton'; +import { CreateButton } from 'component/common/CreateButton/CreateButton'; import useEnvironmentApi from 'hooks/api/actions/useEnvironmentApi/useEnvironmentApi'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import useToast from 'hooks/useToast'; @@ -100,10 +100,7 @@ const CreateEnvironment = () => { mode="Create" clearErrors={clearErrors} > - + } diff --git a/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx b/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx index 431763ec1e..84ce834b3b 100644 --- a/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx +++ b/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx @@ -1,5 +1,5 @@ import FormTemplate from 'component/common/FormTemplate/FormTemplate'; -import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton'; +import { UpdateButton } from 'component/common/UpdateButton/UpdateButton'; import useEnvironmentApi from 'hooks/api/actions/useEnvironmentApi/useEnvironmentApi'; import useEnvironment from 'hooks/api/getters/useEnvironment/useEnvironment'; import useProjectRolePermissions from 'hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions'; @@ -85,7 +85,7 @@ const EditEnvironment = () => { errors={errors} clearErrors={clearErrors} > - + ); diff --git a/frontend/src/component/feature/CreateFeature/CreateFeature.tsx b/frontend/src/component/feature/CreateFeature/CreateFeature.tsx index 5cc637c635..85ecf3ca7a 100644 --- a/frontend/src/component/feature/CreateFeature/CreateFeature.tsx +++ b/frontend/src/component/feature/CreateFeature/CreateFeature.tsx @@ -7,7 +7,7 @@ import useToast from 'hooks/useToast'; import useFeatureApi from 'hooks/api/actions/useFeatureApi/useFeatureApi'; import { CREATE_FEATURE } from 'component/providers/AccessProvider/permissions'; import { useContext } from 'react'; -import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton'; +import { CreateButton } from 'component/common/CreateButton/CreateButton'; import UIContext from 'contexts/UIContext'; import { CF_CREATE_BTN_ID } from 'testIds'; @@ -99,8 +99,8 @@ const CreateFeature = () => { mode="Create" clearErrors={clearErrors} > - { mode="Edit" clearErrors={clearErrors} > - + ); diff --git a/frontend/src/component/project/Project/CreateProject/CreateProject.tsx b/frontend/src/component/project/Project/CreateProject/CreateProject.tsx index d0ab5977be..7dfff9afc8 100644 --- a/frontend/src/component/project/Project/CreateProject/CreateProject.tsx +++ b/frontend/src/component/project/Project/CreateProject/CreateProject.tsx @@ -1,7 +1,7 @@ import { useHistory } from 'react-router-dom'; import ProjectForm from '../ProjectForm/ProjectForm'; import useProjectForm from '../hooks/useProjectForm'; -import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton'; +import { CreateButton } from 'component/common/CreateButton/CreateButton'; import FormTemplate from 'component/common/FormTemplate/FormTemplate'; import { CREATE_PROJECT } from 'component/providers/AccessProvider/permissions'; import useProjectApi from 'hooks/api/actions/useProjectApi/useProjectApi'; @@ -89,10 +89,7 @@ const CreateProject = () => { clearErrors={clearErrors} validateIdUniqueness={validateIdUniqueness} > - + ); diff --git a/frontend/src/component/project/Project/EditProject/EditProject.tsx b/frontend/src/component/project/Project/EditProject/EditProject.tsx index fa372ba814..5f1aae32a4 100644 --- a/frontend/src/component/project/Project/EditProject/EditProject.tsx +++ b/frontend/src/component/project/Project/EditProject/EditProject.tsx @@ -1,7 +1,7 @@ import { useHistory, useParams } from 'react-router-dom'; import ProjectForm from '../ProjectForm/ProjectForm'; import useProjectForm from '../hooks/useProjectForm'; -import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton'; +import { UpdateButton } from 'component/common/UpdateButton/UpdateButton'; import FormTemplate from 'component/common/FormTemplate/FormTemplate'; import { UPDATE_PROJECT } from 'component/providers/AccessProvider/permissions'; import useProjectApi from 'hooks/api/actions/useProjectApi/useProjectApi'; @@ -90,7 +90,7 @@ const EditProject = () => { clearErrors={clearErrors} validateIdUniqueness={validateIdUniqueness} > - + ); diff --git a/frontend/src/component/tags/CreateTagType/CreateTagType.tsx b/frontend/src/component/tags/CreateTagType/CreateTagType.tsx index ff1893eb7f..b29f9b576f 100644 --- a/frontend/src/component/tags/CreateTagType/CreateTagType.tsx +++ b/frontend/src/component/tags/CreateTagType/CreateTagType.tsx @@ -1,7 +1,7 @@ import { useHistory } from 'react-router-dom'; import useTagTypeForm from '../TagTypeForm/useTagTypeForm'; import TagTypeForm from '../TagTypeForm/TagTypeForm'; -import { ResourceCreationButton } from 'component/common/ResourceCreationButton/ResourceCreationButton'; +import { CreateButton } from 'component/common/CreateButton/CreateButton'; import FormTemplate from 'component/common/FormTemplate/FormTemplate'; import { UPDATE_TAG_TYPE } from 'component/providers/AccessProvider/permissions'; import useTagTypesApi from 'hooks/api/actions/useTagTypesApi/useTagTypesApi'; @@ -77,10 +77,7 @@ const CreateTagType = () => { clearErrors={clearErrors} validateNameUniqueness={validateNameUniqueness} > - + ); diff --git a/frontend/src/component/tags/EditTagType/EditTagType.tsx b/frontend/src/component/tags/EditTagType/EditTagType.tsx index f084df76f7..5cac7d6730 100644 --- a/frontend/src/component/tags/EditTagType/EditTagType.tsx +++ b/frontend/src/component/tags/EditTagType/EditTagType.tsx @@ -2,7 +2,7 @@ import { useHistory, useParams } from 'react-router-dom'; import { UPDATE_TAG_TYPE } from '../../providers/AccessProvider/permissions'; import useTagTypeForm from '../TagTypeForm/useTagTypeForm'; import TagForm from '../TagTypeForm/TagTypeForm'; -import { SaveChangesButton } from 'component/common/SaveChangesButton/SaveChangesButton'; +import { UpdateButton } from 'component/common/UpdateButton/UpdateButton'; import useTagTypesApi from 'hooks/api/actions/useTagTypesApi/useTagTypesApi'; import useTagType from 'hooks/api/getters/useTagType/useTagType'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; @@ -74,7 +74,7 @@ const EditTagType = () => { mode="Edit" clearErrors={clearErrors} > - + ); From 96dc6e811a902be83a56231c2e4d14ae0d7cf734 Mon Sep 17 00:00:00 2001 From: Youssef Date: Thu, 24 Feb 2022 10:05:51 +0100 Subject: [PATCH 3/4] refactor: update Create and Update buttons types --- frontend/src/component/common/CreateButton/CreateButton.tsx | 3 +-- frontend/src/component/common/UpdateButton/UpdateButton.tsx | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/frontend/src/component/common/CreateButton/CreateButton.tsx b/frontend/src/component/common/CreateButton/CreateButton.tsx index 87f9f45464..49e351cb25 100644 --- a/frontend/src/component/common/CreateButton/CreateButton.tsx +++ b/frontend/src/component/common/CreateButton/CreateButton.tsx @@ -8,11 +8,10 @@ interface ICreateButtonProps extends IPermissionButtonProps { export const CreateButton = ({ name, - permission, ...rest }: ICreateButtonProps) => { return ( - + Create {name} ); diff --git a/frontend/src/component/common/UpdateButton/UpdateButton.tsx b/frontend/src/component/common/UpdateButton/UpdateButton.tsx index 27c1808241..d0e01f5c27 100644 --- a/frontend/src/component/common/UpdateButton/UpdateButton.tsx +++ b/frontend/src/component/common/UpdateButton/UpdateButton.tsx @@ -2,11 +2,9 @@ import PermissionButton, { IPermissionButtonProps, } from '../PermissionButton/PermissionButton'; -interface IUpdateButtonProps extends IPermissionButtonProps {} - -export const UpdateButton = ({ permission, ...rest }: IUpdateButtonProps) => { +export const UpdateButton = ({ ...rest }: IPermissionButtonProps) => { return ( - + Save ); From 396bb76c9563b56905acf9875d971903eab96ef3 Mon Sep 17 00:00:00 2001 From: Youssef Date: Thu, 24 Feb 2022 10:31:01 +0100 Subject: [PATCH 4/4] style: fix styles in CreateButton --- frontend/src/component/common/CreateButton/CreateButton.tsx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/src/component/common/CreateButton/CreateButton.tsx b/frontend/src/component/common/CreateButton/CreateButton.tsx index 49e351cb25..05d9306af2 100644 --- a/frontend/src/component/common/CreateButton/CreateButton.tsx +++ b/frontend/src/component/common/CreateButton/CreateButton.tsx @@ -6,10 +6,7 @@ interface ICreateButtonProps extends IPermissionButtonProps { name: string; } -export const CreateButton = ({ - name, - ...rest -}: ICreateButtonProps) => { +export const CreateButton = ({ name, ...rest }: ICreateButtonProps) => { return ( Create {name}