From 016633dae907cc218eca2109465acad7989f5abb Mon Sep 17 00:00:00 2001 From: olav Date: Fri, 18 Feb 2022 09:51:10 +0100 Subject: [PATCH] refactor: format files (#719) * refactor: fix deprecated prettier config name * refactor: add fmt scripts * refactor: check fmt during CI * refactor: format files --- frontend/.github/workflows/node.js.yml | 4 +- frontend/.prettierrc | 2 +- frontend/package.json | 2 + frontend/src/__mocks__/svgMock.js | 4 +- .../Reporting/ReportCard/ReportCard.tsx | 20 +++++--- .../ApiTokenList/ApiTokenList.styles.ts | 42 ++++++++--------- .../admin/api-token/ApiTokenList/secret.jsx | 5 +- .../admin/api-token/hooks/useApiTokenForm.ts | 6 +-- frontend/src/component/admin/api/index.js | 5 +- .../ProjectRoles/ProjectRoles.styles.ts | 1 - .../admin/users/CreateUser/CreateUser.tsx | 5 +- .../admin/users/EditUser/EditUser.tsx | 11 +---- .../UserListItem/UserListItem.styles.ts | 6 +-- .../UsersList/UserListItem/UserListItem.tsx | 13 ++++-- .../admin/users/UsersList/UsersList.tsx | 4 +- .../common/BreadcrumbNav/BreadcrumbNav.tsx | 13 ++++-- .../common/FormTemplate/FormTemplate.tsx | 4 +- .../NoItemsStrategies.styles.ts | 2 +- .../component/common/__tests__/util-test.jsx | 36 +++++++++++---- .../src/component/common/common.module.scss | 1 - frontend/src/component/common/util.js | 4 +- .../context/ContextForm/ContextForm.styles.ts | 10 ++-- .../context/ContextForm/ContextForm.tsx | 2 +- .../CreateEnvironment/CreateEnvironment.tsx | 5 +- .../EditEnvironment/EditEnvironment.tsx | 5 +- .../environments/hooks/useEnvironmentForm.ts | 5 +- .../CopyFeature/CopyFeature.module.scss | 3 +- .../FeatureToggleListNewItem/CreatedAt.tsx | 22 +++++---- .../FeatureView/FeatureLog/FeatureLog.tsx | 2 +- .../FeatureEnvironmentMetrics.tsx | 2 +- .../FeatureSeenApplications.styles.ts | 2 +- .../FeatureSeenApplications.tsx | 33 ++++++------- .../FeatureSettingsProject.tsx | 3 +- .../FeatureStrategyAccordionBody.tsx | 13 ++---- .../FlexibleStrategy/FlexibleStrategy.tsx | 2 +- .../FeatureView/FeatureType/FeatureType.tsx | 8 +--- .../useDeleteVariantMarkup.tsx | 8 ++-- .../feature/FeatureView/FeatureView.styles.ts | 4 +- .../history/EventLog/EventCard/EventCard.jsx | 38 +++++++++------ .../EventCard/EventDiff/EventDiff.jsx | 5 +- .../src/component/history/EventLog/index.tsx | 4 +- frontend/src/component/menu/Footer/Footer.jsx | 7 ++- .../project/ProjectCard/ProjectCard.styles.ts | 2 +- .../StrategiesList/StrategiesList.styles.ts | 2 +- .../tags/EditTagType/EditTagType.tsx | 5 +- .../tags/TagTypeForm/useTagTypeForm.ts | 2 +- .../user/UserProfile/UserProfile.tsx | 12 +++-- .../UserProfileContent/UserProfileContent.tsx | 21 +++++---- frontend/src/constants/apiErrors.ts | 3 +- .../useApiTokensApi/useApiTokensApi.ts | 5 +- .../useAuthSettingsApi/useAuthSettingsApi.ts | 4 +- .../actions/useContextsApi/useContextsApi.ts | 2 +- .../actions/useTagTypesApi/useTagTypesApi.ts | 4 +- .../api/getters/useContext/useContext.ts | 9 +++- .../useEnvironment/defaultEnvironment.ts | 4 +- .../getters/useEnvironment/useEnvironment.ts | 9 +--- .../getters/useProject/getProjectFetcher.ts | 4 +- .../api/getters/useTagType/useTagType.ts | 2 +- .../api/getters/useUserInfo/useUserInfo.ts | 8 +++- frontend/src/hooks/useFeaturesFilter.ts | 2 +- frontend/src/hooks/useFeaturesSort.ts | 2 +- frontend/src/interfaces/featureToggle.ts | 4 +- frontend/src/interfaces/uiConfig.ts | 2 +- frontend/src/setupProxy.js | 46 +++++++++---------- frontend/src/setupTests.ts | 2 +- 65 files changed, 282 insertions(+), 247 deletions(-) diff --git a/frontend/.github/workflows/node.js.yml b/frontend/.github/workflows/node.js.yml index aaf78fa263..78764cbb43 100644 --- a/frontend/.github/workflows/node.js.yml +++ b/frontend/.github/workflows/node.js.yml @@ -25,6 +25,4 @@ jobs: node-version: ${{ matrix.node-version }} - run: yarn - run: yarn run test - - - + - run: yarn run fmt:check diff --git a/frontend/.prettierrc b/frontend/.prettierrc index 42de18cd33..552578130e 100644 --- a/frontend/.prettierrc +++ b/frontend/.prettierrc @@ -1,7 +1,7 @@ { "singleQuote": true, "bracketSpacing": true, - "jsxBracketSameLine": false, + "bracketSameLine": false, "arrowParens": "avoid", "printWidth": 80 } diff --git a/frontend/package.json b/frontend/package.json index fc7ecab2c9..15e73ebca2 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -32,6 +32,8 @@ "start:demo": "UNLEASH_API=http://unleash.herokuapp.com yarn run start", "test": "react-scripts test", "prepare": "yarn run build", + "fmt": "prettier src --write --loglevel warn", + "fmt:check": "prettier src --check", "e2e": "yarn run cypress open --config baseUrl='http://localhost:3000' --env PASSWORD_AUTH=true,AUTH_TOKEN=$AUTH_TOKEN", "e2e:heroku": "yarn run cypress open --config baseUrl='http://localhost:3000' --env PASSWORD_AUTH=false,AUTH_TOKEN=$AUTH_TOKEN", "e2e:enterprise": "yarn run cypress open --config baseUrl='http://localhost:3000' --env PASSWORD_AUTH=true,ENTERPRISE=true,AUTH_TOKEN=$AUTH_TOKEN" diff --git a/frontend/src/__mocks__/svgMock.js b/frontend/src/__mocks__/svgMock.js index 13afca51d6..ffe2050a02 100644 --- a/frontend/src/__mocks__/svgMock.js +++ b/frontend/src/__mocks__/svgMock.js @@ -1,2 +1,2 @@ -export default 'SvgrURL' -export const ReactComponent = 'div' +export default 'SvgrURL'; +export const ReactComponent = 'div'; diff --git a/frontend/src/component/Reporting/ReportCard/ReportCard.tsx b/frontend/src/component/Reporting/ReportCard/ReportCard.tsx index 88a446efb3..02c535ca35 100644 --- a/frontend/src/component/Reporting/ReportCard/ReportCard.tsx +++ b/frontend/src/component/Reporting/ReportCard/ReportCard.tsx @@ -5,10 +5,10 @@ import ReportProblemOutlinedIcon from '@material-ui/icons/ReportProblemOutlined' import ConditionallyRender from '../../common/ConditionallyRender/ConditionallyRender'; import styles from './ReportCard.module.scss'; import ReactTimeAgo from 'react-timeago'; -import { IProjectHealthReport } from "../../../interfaces/project"; +import { IProjectHealthReport } from '../../../interfaces/project'; interface IReportCardProps { - healthReport: IProjectHealthReport + healthReport: IProjectHealthReport; } export const ReportCard = ({ healthReport }: IReportCardProps) => { @@ -37,7 +37,9 @@ export const ReportCard = ({ healthReport }: IReportCardProps) => { const renderPotentiallyStaleToggles = () => ( <> - {healthReport.potentiallyStaleCount} potentially stale toggles + + {healthReport.potentiallyStaleCount} potentially stale toggles + ); @@ -51,7 +53,9 @@ export const ReportCard = ({ healthReport }: IReportCardProps) => { condition={healthReport.health > -1} show={
-

{healthReport.health}%

+

+ {healthReport.health}% +

Last updated:{' '} {

Review your feature toggles and delete diff --git a/frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.styles.ts b/frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.styles.ts index 5026f78408..ebcdb37afd 100644 --- a/frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.styles.ts +++ b/frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.styles.ts @@ -18,35 +18,35 @@ export const useStyles = makeStyles(theme => ({ marginBottom: '1rem', }, center: { - textAlign: 'center' + textAlign: 'center', }, actionsContainer: { textAlign: 'center', display: 'flex-inline', - flexWrap: 'nowrap' + flexWrap: 'nowrap', }, - infoBoxContainer:{ - marginBottom:40 + infoBoxContainer: { + marginBottom: 40, }, - hideSM:{ - [theme.breakpoints.down('sm')]: { - display: 'none' - } + hideSM: { + [theme.breakpoints.down('sm')]: { + display: 'none', + }, }, - hideMD:{ - [theme.breakpoints.down('md')]: { - display: 'none' - } + hideMD: { + [theme.breakpoints.down('md')]: { + display: 'none', + }, }, - hideXS:{ - [theme.breakpoints.down('xs')]: { - display: 'none' - } + hideXS: { + [theme.breakpoints.down('xs')]: { + display: 'none', + }, }, - token:{ + token: { textAlign: 'left', - [theme.breakpoints.up('sm')]: { - display: 'none' - } - } + [theme.breakpoints.up('sm')]: { + display: 'none', + }, + }, })); diff --git a/frontend/src/component/admin/api-token/ApiTokenList/secret.jsx b/frontend/src/component/admin/api-token/ApiTokenList/secret.jsx index 03dfabd8e4..ad53de8897 100644 --- a/frontend/src/component/admin/api-token/ApiTokenList/secret.jsx +++ b/frontend/src/component/admin/api-token/ApiTokenList/secret.jsx @@ -1,9 +1,10 @@ import PropTypes from 'prop-types'; function Secret({ value }) { - return (
- ************************************ + + ************************************ +
); } diff --git a/frontend/src/component/admin/api-token/hooks/useApiTokenForm.ts b/frontend/src/component/admin/api-token/hooks/useApiTokenForm.ts index 5057ba7eef..11045cab7a 100644 --- a/frontend/src/component/admin/api-token/hooks/useApiTokenForm.ts +++ b/frontend/src/component/admin/api-token/hooks/useApiTokenForm.ts @@ -20,7 +20,7 @@ const useApiToken = ( setType(initialtype); if (type === 'ADMIN') { setProject('*'); - setEnvironment('*') + setEnvironment('*'); } //eslint-disable-next-line react-hooks/exhaustive-deps }, [initialtype]); @@ -35,11 +35,11 @@ const useApiToken = ( const setTokenType = (value: string) => { if (value === 'ADMIN') { - setType(value) + setType(value); setProject('*'); setEnvironment('*'); } else { - setType(value) + setType(value); setEnvironment(initialEnvironment); } }; diff --git a/frontend/src/component/admin/api/index.js b/frontend/src/component/admin/api/index.js index 5a742e4df0..daeaf24452 100644 --- a/frontend/src/component/admin/api/index.js +++ b/frontend/src/component/admin/api/index.js @@ -9,10 +9,7 @@ const ApiPage = () => { return (
- } - /> + } />
); diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.styles.ts b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.styles.ts index 6bedaa56e3..0e6eea556c 100644 --- a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.styles.ts +++ b/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.styles.ts @@ -7,4 +7,3 @@ export const useStyles = makeStyles(theme => ({ position: 'relative', }, })); - diff --git a/frontend/src/component/admin/users/CreateUser/CreateUser.tsx b/frontend/src/component/admin/users/CreateUser/CreateUser.tsx index 2cc34cda67..f480eb7535 100644 --- a/frontend/src/component/admin/users/CreateUser/CreateUser.tsx +++ b/frontend/src/component/admin/users/CreateUser/CreateUser.tsx @@ -97,10 +97,7 @@ const CreateUser = () => { setRootRole={setRootRole} clearErrors={clearErrors} > - + Create user diff --git a/frontend/src/component/admin/users/EditUser/EditUser.tsx b/frontend/src/component/admin/users/EditUser/EditUser.tsx index e5db03f2b1..07e212bf56 100644 --- a/frontend/src/component/admin/users/EditUser/EditUser.tsx +++ b/frontend/src/component/admin/users/EditUser/EditUser.tsx @@ -35,11 +35,7 @@ const EditUser = () => { validateName, errors, clearErrors, - } = useAddUserForm( - user?.name, - user?.email, - user?.rootRole - ); + } = useAddUserForm(user?.name, user?.email, user?.rootRole); const formatApiCode = () => { return `curl --location --request PUT '${ @@ -98,10 +94,7 @@ const EditUser = () => { clearErrors={clearErrors} mode={EDIT} > - + Edit user diff --git a/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.styles.ts b/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.styles.ts index 1dbbaafeed..f4f0ba9d07 100644 --- a/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.styles.ts +++ b/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.styles.ts @@ -6,7 +6,7 @@ export const useStyles = makeStyles(theme => ({ backgroundColor: theme.palette.grey[200], }, }, - leftTableCell:{ - textAlign: 'left' - } + leftTableCell: { + textAlign: 'left', + }, })); diff --git a/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.tsx b/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.tsx index 3453f89afb..6710630abc 100644 --- a/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.tsx +++ b/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.tsx @@ -14,7 +14,7 @@ import AccessContext from '../../../../../contexts/AccessContext'; import { IUser } from '../../../../../interfaces/user'; import { useStyles } from './UserListItem.styles'; import { useHistory } from 'react-router-dom'; -import { ILocationSettings } from "../../../../../hooks/useLocationSettings"; +import { ILocationSettings } from '../../../../../hooks/useLocationSettings'; interface IUserListItemProps { user: IUser; @@ -34,7 +34,7 @@ const UserListItem = ({ locationSettings, }: IUserListItemProps) => { const { hasAccess } = useContext(AccessContext); - const history = useHistory() + const history = useHistory(); const styles = useStyles(); return ( @@ -51,7 +51,10 @@ const UserListItem = ({ - {formatDateWithLocale(user.createdAt, locationSettings.locale)} + {formatDateWithLocale( + user.createdAt, + locationSettings.locale + )} @@ -77,7 +80,9 @@ const UserListItem = ({ data-loading aria-label="Edit" title="Edit" - onClick={()=> history.push(`/admin/users/${user.id}/edit`)} + onClick={() => + history.push(`/admin/users/${user.id}/edit`) + } > diff --git a/frontend/src/component/admin/users/UsersList/UsersList.tsx b/frontend/src/component/admin/users/UsersList/UsersList.tsx index dabfa32a99..ca4defe92d 100644 --- a/frontend/src/component/admin/users/UsersList/UsersList.tsx +++ b/frontend/src/component/admin/users/UsersList/UsersList.tsx @@ -23,7 +23,7 @@ import PaginateUI from '../../../common/PaginateUI/PaginateUI'; import { IUser } from '../../../../interfaces/user'; import IRole from '../../../../interfaces/role'; import useToast from '../../../../hooks/useToast'; -import { useLocationSettings } from "../../../../hooks/useLocationSettings"; +import { useLocationSettings } from '../../../../hooks/useLocationSettings'; const UsersList = () => { const { users, roles, refetch, loading } = useUsers(); @@ -36,7 +36,7 @@ const UsersList = () => { userApiErrors, } = useAdminUsersApi(); const { hasAccess } = useContext(AccessContext); - const { locationSettings } = useLocationSettings() + const { locationSettings } = useLocationSettings(); const [pwDialog, setPwDialog] = useState<{ open: boolean; user?: IUser }>({ open: false, }); diff --git a/frontend/src/component/common/BreadcrumbNav/BreadcrumbNav.tsx b/frontend/src/component/common/BreadcrumbNav/BreadcrumbNav.tsx index d299010ca6..67630da4b5 100644 --- a/frontend/src/component/common/BreadcrumbNav/BreadcrumbNav.tsx +++ b/frontend/src/component/common/BreadcrumbNav/BreadcrumbNav.tsx @@ -26,9 +26,8 @@ const BreadcrumbNav = () => { item !== 'strategies' && item !== 'features' && item !== 'features2' && - item !== 'create-toggle'&& + item !== 'create-toggle' && item !== 'settings' - ); return ( @@ -52,7 +51,10 @@ const BreadcrumbNav = () => { styles.breadcrumbNavParagraph } > - +

); } @@ -73,7 +75,10 @@ const BreadcrumbNav = () => { className={styles.breadcrumbLink} to={link} > - + ); })} diff --git a/frontend/src/component/common/FormTemplate/FormTemplate.tsx b/frontend/src/component/common/FormTemplate/FormTemplate.tsx index 14adaef1d4..1257dd7fab 100644 --- a/frontend/src/component/common/FormTemplate/FormTemplate.tsx +++ b/frontend/src/component/common/FormTemplate/FormTemplate.tsx @@ -71,9 +71,7 @@ const FormTemplate: React.FC = ({ <>

API Command{' '} - +

diff --git a/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.styles.ts b/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.styles.ts index ee30fda344..442da814c3 100644 --- a/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.styles.ts +++ b/frontend/src/component/common/NoItems/NoItemsStrategies/NoItemsStrategies.styles.ts @@ -11,6 +11,6 @@ export const useStyles = makeStyles(theme => ({ envName: { position: 'relative', top: '6px', - fontWeight: 'bold' + fontWeight: 'bold', }, })); diff --git a/frontend/src/component/common/__tests__/util-test.jsx b/frontend/src/component/common/__tests__/util-test.jsx index b1f7f04e7a..7678c294a8 100644 --- a/frontend/src/component/common/__tests__/util-test.jsx +++ b/frontend/src/component/common/__tests__/util-test.jsx @@ -1,17 +1,35 @@ import { formatFullDateTimeWithLocale } from '../util'; test.skip('formats dates correctly', () => { - expect(formatFullDateTimeWithLocale(1487861809466, 'nb-NO', 'UTC')).toEqual('2017-02-23 14:56:49'); - expect(formatFullDateTimeWithLocale(1487861809466, 'nb-NO', 'Europe/Paris')).toEqual('2017-02-23 15:56:49'); - expect(formatFullDateTimeWithLocale(1487861809466, 'nb-NO', 'Europe/Oslo')).toEqual('2017-02-23 15:56:49'); - expect(formatFullDateTimeWithLocale(1487861809466, 'nb-NO', 'Europe/London')).toEqual('2017-02-23 14:56:49'); - expect(formatFullDateTimeWithLocale(1487861809466, 'en-GB', 'Europe/Paris')).toEqual('02/23/2017, 3:56:49 PM'); - expect(formatFullDateTimeWithLocale(1487861809466, 'en-GB', 'Europe/Oslo')).toEqual('02/23/2017, 3:56:49 PM'); - expect(formatFullDateTimeWithLocale(1487861809466, 'en-GB', 'Europe/London')).toEqual('02/23/2017, 2:56:49 PM'); + expect(formatFullDateTimeWithLocale(1487861809466, 'nb-NO', 'UTC')).toEqual( + '2017-02-23 14:56:49' + ); + expect( + formatFullDateTimeWithLocale(1487861809466, 'nb-NO', 'Europe/Paris') + ).toEqual('2017-02-23 15:56:49'); + expect( + formatFullDateTimeWithLocale(1487861809466, 'nb-NO', 'Europe/Oslo') + ).toEqual('2017-02-23 15:56:49'); + expect( + formatFullDateTimeWithLocale(1487861809466, 'nb-NO', 'Europe/London') + ).toEqual('2017-02-23 14:56:49'); + expect( + formatFullDateTimeWithLocale(1487861809466, 'en-GB', 'Europe/Paris') + ).toEqual('02/23/2017, 3:56:49 PM'); + expect( + formatFullDateTimeWithLocale(1487861809466, 'en-GB', 'Europe/Oslo') + ).toEqual('02/23/2017, 3:56:49 PM'); + expect( + formatFullDateTimeWithLocale(1487861809466, 'en-GB', 'Europe/London') + ).toEqual('02/23/2017, 2:56:49 PM'); expect(formatFullDateTimeWithLocale(1487861809466, 'nb-NO')).toEqual( expect.stringMatching(/(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/) ); - expect(formatFullDateTimeWithLocale(1487861809466, 'en-GB')).toEqual(expect.stringContaining('02/23/2017')); - expect(formatFullDateTimeWithLocale(1487861809466, 'en-US')).toEqual(expect.stringContaining('02/23/2017')); + expect(formatFullDateTimeWithLocale(1487861809466, 'en-GB')).toEqual( + expect.stringContaining('02/23/2017') + ); + expect(formatFullDateTimeWithLocale(1487861809466, 'en-US')).toEqual( + expect.stringContaining('02/23/2017') + ); }); diff --git a/frontend/src/component/common/common.module.scss b/frontend/src/component/common/common.module.scss index 22234bbd9f..bf657f0cb2 100644 --- a/frontend/src/component/common/common.module.scss +++ b/frontend/src/component/common/common.module.scss @@ -46,7 +46,6 @@ } } - .dataTableHeader { display: flex; justify-content: space-between; diff --git a/frontend/src/component/common/util.js b/frontend/src/component/common/util.js index cd22e29be3..c387ed70c0 100644 --- a/frontend/src/component/common/util.js +++ b/frontend/src/component/common/util.js @@ -110,7 +110,7 @@ export const modalStyles = { }, }; -export const showPnpsFeedback = (feedbackList) => { +export const showPnpsFeedback = feedbackList => { if (!feedbackList) return; if (feedbackList.length > 0) { const feedback = feedbackList.find( @@ -135,4 +135,4 @@ export const showPnpsFeedback = (feedbackList) => { return true; }; -export const PNPS_FEEDBACK_ID = 'pnps' +export const PNPS_FEEDBACK_ID = 'pnps'; diff --git a/frontend/src/component/context/ContextForm/ContextForm.styles.ts b/frontend/src/component/context/ContextForm/ContextForm.styles.ts index a9f53f195e..66cc6631aa 100644 --- a/frontend/src/component/context/ContextForm/ContextForm.styles.ts +++ b/frontend/src/component/context/ContextForm/ContextForm.styles.ts @@ -10,8 +10,8 @@ export const useStyles = makeStyles(theme => ({ height: '100%', }, input: { width: '100%', marginBottom: '1rem' }, - inputHeader:{ - marginBottom: '0.3rem' + inputHeader: { + marginBottom: '0.3rem', }, label: { minWidth: '300px', @@ -22,7 +22,7 @@ export const useStyles = makeStyles(theme => ({ tagContainer: { display: 'flex', alignItems: 'flex-start', - marginBottom: '1rem' + marginBottom: '1rem', }, tagInput: { width: '75%', @@ -30,7 +30,7 @@ export const useStyles = makeStyles(theme => ({ }, tagValue: { marginRight: '3px', - marginBottom: '1rem' + marginBottom: '1rem', }, buttonContainer: { marginTop: 'auto', @@ -62,6 +62,6 @@ export const useStyles = makeStyles(theme => ({ switchContainer: { display: 'flex', alignItems: 'center', - marginLeft: '-9px' + marginLeft: '-9px', }, })); diff --git a/frontend/src/component/context/ContextForm/ContextForm.tsx b/frontend/src/component/context/ContextForm/ContextForm.tsx index 8fa0596671..bcff63da93 100644 --- a/frontend/src/component/context/ContextForm/ContextForm.tsx +++ b/frontend/src/component/context/ContextForm/ContextForm.tsx @@ -112,7 +112,7 @@ const ContextForm: React.FC = ({ autoFocus />

- What is this context for? + What is this context for?

{ 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 1cd73af025..ecfc11ec5d 100644 --- a/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx +++ b/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx @@ -85,10 +85,7 @@ const EditEnvironment = () => { errors={errors} clearErrors={clearErrors} > - + Edit environment diff --git a/frontend/src/component/environments/hooks/useEnvironmentForm.ts b/frontend/src/component/environments/hooks/useEnvironmentForm.ts index 71c3b51800..d19cce2fad 100644 --- a/frontend/src/component/environments/hooks/useEnvironmentForm.ts +++ b/frontend/src/component/environments/hooks/useEnvironmentForm.ts @@ -1,10 +1,7 @@ import { useEffect, useState } from 'react'; import useEnvironmentApi from '../../../hooks/api/actions/useEnvironmentApi/useEnvironmentApi'; -const useEnvironmentForm = ( - initialName = '', - initialType = 'development' -) => { +const useEnvironmentForm = (initialName = '', initialType = 'development') => { const NAME_EXISTS_ERROR = 'Error: Environment'; const [name, setName] = useState(initialName); const [type, setType] = useState(initialType); diff --git a/frontend/src/component/feature/CopyFeature/CopyFeature.module.scss b/frontend/src/component/feature/CopyFeature/CopyFeature.module.scss index 4fccdbb2eb..66c823bd5d 100644 --- a/frontend/src/component/feature/CopyFeature/CopyFeature.module.scss +++ b/frontend/src/component/feature/CopyFeature/CopyFeature.module.scss @@ -9,7 +9,6 @@ .content { padding: var(--card-padding); - } .content form { @@ -25,4 +24,4 @@ .text { max-width: 400px; -} \ No newline at end of file +} diff --git a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/CreatedAt.tsx b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/CreatedAt.tsx index 29a6df922c..d20eb7aa44 100644 --- a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/CreatedAt.tsx +++ b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/CreatedAt.tsx @@ -1,21 +1,27 @@ import { Tooltip } from '@material-ui/core'; -import { formatDateWithLocale, formatFullDateTimeWithLocale } from '../../../common/util'; -import { useLocationSettings } from "../../../../hooks/useLocationSettings"; +import { + formatDateWithLocale, + formatFullDateTimeWithLocale, +} from '../../../common/util'; +import { useLocationSettings } from '../../../../hooks/useLocationSettings'; interface CreatedAtProps { time: Date; } -const CreatedAt = ({time}: CreatedAtProps) => { +const CreatedAt = ({ time }: CreatedAtProps) => { const { locationSettings } = useLocationSettings(); return ( - - - {formatDateWithLocale(time, locationSettings.locale)} - + + {formatDateWithLocale(time, locationSettings.locale)} ); -} +}; export default CreatedAt; diff --git a/frontend/src/component/feature/FeatureView/FeatureLog/FeatureLog.tsx b/frontend/src/component/feature/FeatureView/FeatureLog/FeatureLog.tsx index 74f4cab009..5d17a25a4f 100644 --- a/frontend/src/component/feature/FeatureView/FeatureLog/FeatureLog.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureLog/FeatureLog.tsx @@ -10,7 +10,7 @@ const FeatureLog = () => { const { feature } = useFeature(projectId, featureId); if (!feature.name) { - return null + return null; } return ( diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureEnvironmentMetrics/FeatureEnvironmentMetrics.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureEnvironmentMetrics/FeatureEnvironmentMetrics.tsx index 2bb30ba93e..4301b6573a 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureEnvironmentMetrics/FeatureEnvironmentMetrics.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureEnvironmentMetrics/FeatureEnvironmentMetrics.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import PercentageCircle from '../../../../common/PercentageCircle/PercentageCircle'; import { useStyles } from './FeatureEnvironmentMetrics.styles'; -import {FiberManualRecord} from '@material-ui/icons'; +import { FiberManualRecord } from '@material-ui/icons'; import { useMediaQuery } from '@material-ui/core'; import { IFeatureEnvironmentMetrics } from '../../../../../interfaces/featureToggle'; import { parseISO } from 'date-fns'; diff --git a/frontend/src/component/feature/FeatureView/FeatureSeenApplications/FeatureSeenApplications.styles.ts b/frontend/src/component/feature/FeatureView/FeatureSeenApplications/FeatureSeenApplications.styles.ts index 21235e0bac..cce7aee267 100644 --- a/frontend/src/component/feature/FeatureView/FeatureSeenApplications/FeatureSeenApplications.styles.ts +++ b/frontend/src/component/feature/FeatureView/FeatureSeenApplications/FeatureSeenApplications.styles.ts @@ -11,5 +11,5 @@ export const useStyles = makeStyles(theme => ({ whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', - } + }, })); diff --git a/frontend/src/component/feature/FeatureView/FeatureSeenApplications/FeatureSeenApplications.tsx b/frontend/src/component/feature/FeatureView/FeatureSeenApplications/FeatureSeenApplications.tsx index ddd383ddf2..7de121f39e 100644 --- a/frontend/src/component/feature/FeatureView/FeatureSeenApplications/FeatureSeenApplications.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureSeenApplications/FeatureSeenApplications.tsx @@ -12,24 +12,24 @@ const FeatureSeenApplications: React.FC = () => { const styles = useStyles(); const seenApplications = (seenApps: string[]) => { return seenApps.map(appName => { - return ( - - {appName} - - ); + return ( + + + {appName} + + + ); }); }; - const noApplications = ( -
{'Not seen in any applications'}
- ); - + const noApplications = ( + +
{'Not seen in any applications'}
+ + ); return ( @@ -37,7 +37,8 @@ const FeatureSeenApplications: React.FC = () => { 0} show={seenApplications(metrics.seenApplications)} - elseShow={noApplications} /> + elseShow={noApplications} + /> ); }; diff --git a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx index ac6f48517d..b33c203f1c 100644 --- a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx @@ -21,12 +21,11 @@ const FeatureSettingsProject = () => { const [dirty, setDirty] = useState(false); const [showConfirmDialog, setShowConfirmDialog] = useState(false); const editable = hasAccess(MOVE_FEATURE_TOGGLE, projectId); - const { permissions = [] } = useAuthPermissions() + const { permissions = [] } = useAuthPermissions(); const { changeFeatureProject } = useFeatureApi(); const { setToastData, setToastApiError } = useToast(); const history = useHistory(); - useEffect(() => { if (project !== feature.project) { setDirty(true); diff --git a/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx b/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx index d28e4096a6..942772a9cc 100644 --- a/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureStrategies/FeatureStrategyAccordion/FeatureStrategyAccordionBody/FeatureStrategyAccordionBody.tsx @@ -148,16 +148,9 @@ const FeatureStrategyAccordionBody: React.FC< const { parameters } = strategy; const ON = uiConfig.flags[C]; - const editable = hasAccess( - UPDATE_FEATURE_STRATEGY, - projectId, - activeEnvironment.name - ) || - hasAccess( - CREATE_FEATURE_STRATEGY, - projectId, - activeEnvironment.name - ); + const editable = + hasAccess(UPDATE_FEATURE_STRATEGY, projectId, activeEnvironment.name) || + hasAccess(CREATE_FEATURE_STRATEGY, projectId, activeEnvironment.name); return (
diff --git a/frontend/src/component/feature/FeatureView/FeatureStrategies/common/FlexibleStrategy/FlexibleStrategy.tsx b/frontend/src/component/feature/FeatureView/FeatureStrategies/common/FlexibleStrategy/FlexibleStrategy.tsx index d0ffcea5cd..bf559152c2 100644 --- a/frontend/src/component/feature/FeatureView/FeatureStrategies/common/FlexibleStrategy/FlexibleStrategy.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureStrategies/common/FlexibleStrategy/FlexibleStrategy.tsx @@ -29,7 +29,7 @@ const FlexibleStrategy = ({ updateParameter, parameters, context, - editable=true + editable = true, }: IFlexibleStrategyProps) => { const onUpdate = (field: string) => diff --git a/frontend/src/component/feature/FeatureView/FeatureType/FeatureType.tsx b/frontend/src/component/feature/FeatureView/FeatureType/FeatureType.tsx index 2083c605f3..9a4eedcf1b 100644 --- a/frontend/src/component/feature/FeatureView/FeatureType/FeatureType.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureType/FeatureType.tsx @@ -3,14 +3,13 @@ import { Tooltip } from '@material-ui/core'; import { getFeatureTypeIcons } from '../../../../utils/get-feature-type-icons'; import useFeatureTypes from '../../../../hooks/api/getters/useFeatureTypes/useFeatureTypes'; - interface FeatureTypeProps { type: string; } const FeatureStatus = ({ type }: FeatureTypeProps) => { const styles = useStyles(); - const { featureTypes } = useFeatureTypes() + const { featureTypes } = useFeatureTypes(); const IconComponent = getFeatureTypeIcons(type); const typeName = featureTypes.filter(t => t.id === type).map(t => t.name); @@ -19,10 +18,7 @@ const FeatureStatus = ({ type }: FeatureTypeProps) => { return ( - + ); }; diff --git a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsListItem/useDeleteVariantMarkup.tsx b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsListItem/useDeleteVariantMarkup.tsx index bf34927723..0abdf6fda3 100644 --- a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsListItem/useDeleteVariantMarkup.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsListItem/useDeleteVariantMarkup.tsx @@ -8,10 +8,10 @@ interface IUseDeleteVariantMarkupProps { } const useDeleteVariantMarkup = ({ - show, - onClick, - onClose, - }: IUseDeleteVariantMarkupProps) => { + show, + onClick, + onClose, +}: IUseDeleteVariantMarkupProps) => { return ( ({ }, }, featureId: { - wordBreak: 'break-all' - } + wordBreak: 'break-all', + }, })); diff --git a/frontend/src/component/history/EventLog/EventCard/EventCard.jsx b/frontend/src/component/history/EventLog/EventCard/EventCard.jsx index 90ef62577d..c34fb13800 100644 --- a/frontend/src/component/history/EventLog/EventCard/EventCard.jsx +++ b/frontend/src/component/history/EventLog/EventCard/EventCard.jsx @@ -17,26 +17,34 @@ const EventCard = ({ entry, timeFormatted }) => {
{entry.type}
Changed by:
{entry.createdBy}
- -
Project:
-
{entry.project}
- - } /> - -
Feature:
-
{entry.featureName}
- - } /> + +
Project:
+
{entry.project}
+ + } + /> + +
Feature:
+
{entry.featureName}
+ + } + /> - Change - } /> - + } + />
); }; diff --git a/frontend/src/component/history/EventLog/EventCard/EventDiff/EventDiff.jsx b/frontend/src/component/history/EventLog/EventCard/EventDiff/EventDiff.jsx index 0c6d7571c4..3b3f123972 100644 --- a/frontend/src/component/history/EventLog/EventCard/EventDiff/EventDiff.jsx +++ b/frontend/src/component/history/EventLog/EventCard/EventDiff/EventDiff.jsx @@ -20,7 +20,10 @@ const EventDiff = ({ entry }) => { N: styles.positive, // added }; - const diffs = entry.data && entry.preData ? diff(entry.preData, entry.data) : undefined; + const diffs = + entry.data && entry.preData + ? diff(entry.preData, entry.data) + : undefined; const buildItemDiff = (diff, key) => { let change; diff --git a/frontend/src/component/history/EventLog/index.tsx b/frontend/src/component/history/EventLog/index.tsx index 49ae0d4662..4e28a44ea3 100644 --- a/frontend/src/component/history/EventLog/index.tsx +++ b/frontend/src/component/history/EventLog/index.tsx @@ -1,6 +1,6 @@ import EventLog from './EventLog'; -import { useEventSettings } from "../../../hooks/useEventSettings"; -import { useLocationSettings } from "../../../hooks/useLocationSettings"; +import { useEventSettings } from '../../../hooks/useEventSettings'; +import { useLocationSettings } from '../../../hooks/useLocationSettings'; interface IEventLogContainerProps { title: string; diff --git a/frontend/src/component/menu/Footer/Footer.jsx b/frontend/src/component/menu/Footer/Footer.jsx index 3eb2034fcd..9801f5fa7d 100644 --- a/frontend/src/component/menu/Footer/Footer.jsx +++ b/frontend/src/component/menu/Footer/Footer.jsx @@ -11,7 +11,12 @@ export const Footer = () => { return (