From cfc2338e78b73239672db1d77e93032452465d7c Mon Sep 17 00:00:00 2001 From: olav Date: Fri, 25 Mar 2022 12:34:20 +0100 Subject: [PATCH] refactor: use camel case for files and dirs (#817) --- .../fonts/{Roboto-300.ttf => roboto300.ttf} | Bin .../fonts/{Roboto-400.ttf => roboto400.ttf} | Bin .../fonts/{Roboto-500.ttf => roboto500.ttf} | Bin .../fonts/{Roboto-700.ttf => roboto700.ttf} | Bin .../fonts/{Sen-Bold.ttf => senBold.ttf} | Bin .../{Sen-ExtraBold.ttf => senExtraBold.ttf} | Bin .../fonts/{Sen-Regular.ttf => senRegular.ttf} | Bin .../assets/icons/{logo_wbg.svg => logoBg.svg} | 0 ...ash-logo-inverted.svg => logoInverted.svg} | 0 .../icons/{logo-plain.svg => logoPlain.svg} | 0 .../{logo-white-bg.svg => logoWhiteBg.svg} | 0 .../img/{env-splash-2.png => envSplash2.png} | Bin .../img/{logo-dark.svg => logoDark.svg} | 0 ...ark-with-text.svg => logoDarkWithText.svg} | 0 ...svg => logoWhiteTransparentHorizontal.svg} | 0 .../{logo-with-name.svg => logoWithName.svg} | 0 ...e-guidance-bg.svg => mobileGuidanceBg.svg} | 0 .../img/{splash_env1.svg => splashEnv1.svg} | 0 .../img/{splash_env2.svg => splashEnv2.svg} | 0 ...alpha.gif => unleashLogoIconDarkAlpha.gif} | Bin .../ReportToggleListItem.jsx | 2 +- .../sorting-test.js => utils.test.js} | 2 +- .../component/addons/AddonList/AddonList.tsx | 2 +- .../ConfiguredAddons/ConfiguredAddons.tsx | 2 +- frontend/src/component/admin/api/index.js | 2 +- .../ApiTokenForm/ApiTokenForm.styles.ts | 0 .../ApiTokenForm/ApiTokenForm.tsx | 0 .../ApiTokenList/ApiTokenList.styles.ts | 0 .../ApiTokenList/ApiTokenList.tsx | 2 +- .../ApiTokenList/secret.jsx | 0 .../ConfirmToken/ConfirmToken.tsx | 0 .../ConfirmToken/UserToken/UserToken.tsx | 0 .../CreateApiToken/CreateApiToken.tsx | 2 +- .../hooks/useApiTokenForm.ts | 0 .../admin/auth/GoogleAuth/GoogleAuth.tsx | 4 +- .../admin/auth/OidcAuth/OidcAuth.tsx | 4 +- .../admin/auth/PasswordAuth/PasswordAuth.tsx | 2 +- .../admin/auth/SamlAuth/SamlAuth.tsx | 4 +- .../component/admin/invoice/InvoiceList.tsx | 4 +- .../CreateProjectRole/CreateProjectRole.tsx | 2 +- .../EditProjectRole/EditProjectRole.tsx | 2 +- .../EnvironmentPermissionAccordion.styles.ts | 0 .../EnvironmentPermissionAccordion.tsx | 0 .../ProjectRoleForm/ProjectRoleForm.styles.ts | 0 .../ProjectRoleForm/ProjectRoleForm.tsx | 0 .../ProjectRoleDeleteConfirm.styles.ts | 0 .../ProjectRoleDeleteConfirm.tsx | 0 .../ProjectRoleList/ProjectRoleList.tsx | 2 +- .../ProjectRoleListItem.styles.ts | 0 .../ProjectRoleListItem.tsx | 0 .../ProjectRoles/ProjectRoles.styles.ts | 0 .../ProjectRoles/ProjectRoles.tsx | 0 .../hooks/useProjectRoleForm.ts | 0 .../admin/users/CreateUser/CreateUser.tsx | 2 +- .../admin/users/EditUser/EditUser.tsx | 2 +- .../UsersList/UserListItem/UserListItem.tsx | 2 +- .../admin/users/UsersList/UsersList.tsx | 2 +- .../ApplicationEdit.test.jsx} | 4 +- .../ApplicationEdit/ApplicationEdit.tsx | 4 +- .../ApplicationEdit.test.jsx.snap} | 0 .../ApplicationUpdate/ApplicationUpdate.tsx | 4 +- .../ApplicationView/ApplicationView.tsx | 4 +- .../application-edit-component-test.jsx.snap | 64 -------- .../application-edit-component-test.jsx | 155 ------------------ .../{icon-names.ts => iconNames.ts} | 0 .../Constraint/formatConstraintValue.ts | 2 +- .../ConstraintAccordionEdit.tsx | 2 +- .../ConstraintAccordionEditBody.tsx | 2 +- ...alue-test.tsx => DateSingleValue.test.tsx} | 2 +- .../DateSingleValue.test.tsx.snap} | 0 .../useConstraintInput/useConstraintInput.tsx | 2 +- .../ConstraintAccordionEditHeader.tsx | 2 +- .../ConstraintAccordionView.tsx | 2 +- .../ConstraintAccordionViewBody.tsx | 2 +- .../component/common/Feedback/Feedback.tsx | 4 +- .../common/FormTemplate/FormTemplate.tsx | 2 +- ...nput-list-field.jsx => InputListField.jsx} | 0 .../src/component/common/Loader/Loader.tsx | 4 +- .../component/common/NotFound/NotFound.tsx | 2 +- .../context/ContextList/ContextList.jsx | 2 +- .../context/CreateContext/CreateContext.tsx | 2 +- .../context/EditContext/EditContext.tsx | 2 +- .../CreateEnvironment/CreateEnvironment.tsx | 2 +- .../EditEnvironment/EditEnvironment.tsx | 2 +- .../EnvironmentList/EnvironmentList.tsx | 2 +- .../feature/CopyFeature/CopyFeature.jsx | 2 +- .../feature/CreateFeature/CreateFeature.tsx | 2 +- .../feature/EditFeature/EditFeature.tsx | 2 +- .../feature/FeatureForm/FeatureForm.tsx | 2 +- .../FeatureStrategyConstraints2.tsx | 2 +- .../FeatureStrategyCreate.tsx | 4 +- .../FeatureStrategyEdit.tsx | 2 +- .../FeatureStrategyForm.tsx | 2 +- .../FeatureStrategyMenuCard.tsx | 2 +- .../FeatureStrategyProdGuard.tsx | 2 +- .../FeatureStrategyRemove.tsx | 2 +- .../FeatureToggleList/FeatureToggleList.jsx | 2 +- ...nt-test.jsx => FeatureToggleList.test.jsx} | 12 +- .../FeatureToggleListItem.jsx | 2 +- .../FeatureToggleListItem.test.jsx} | 4 +- .../FeatureToggleListItem.test.jsx.snap} | 0 .../FeatureToggleList.test.jsx.snap} | 0 .../FeatureToggleListNewItem/CreatedAt.tsx | 2 +- .../FeatureToggleListNewItem.tsx | 2 +- .../FeatureMetricsChart/createChartData.ts | 2 +- .../FeatureMetricsChart/createChartOptions.ts | 4 +- .../FeatureMetricsContent.tsx | 2 +- .../FeatureMetricsStats.tsx | 2 +- .../FeatureMetricsTable.tsx | 2 +- .../FeatureNotFound/FeatureNotFound.tsx | 2 +- .../AddTagDialog/AddTagDialog.tsx | 2 +- .../FeatureOverviewEnvSwitch.tsx | 2 +- .../FeatureOverviewEnvironment.tsx | 4 +- .../FeatureOverviewEnvironmentMetrics.tsx | 2 +- .../FeatureOverviewEnvironmentStrategy.tsx | 2 +- .../FeatureOverviewMetaData.tsx | 2 +- .../FeatureOverviewTags.tsx | 4 +- .../StaleDialog/StaleDialog.tsx | 2 +- .../FeatureSettingsMetadata.tsx | 2 +- .../FeatureSettingsProject.tsx | 2 +- .../FeatureView/FeatureType/FeatureType.tsx | 2 +- .../AddFeatureVariant/AddFeatureVariant.tsx | 2 +- .../OverrideConfig/OverrideConfig.jsx | 2 +- .../FeatureVariantsList.tsx | 2 +- .../feature/FeatureView/FeatureView.tsx | 2 +- .../RedirectFeatureView.tsx | 2 +- .../StrategyConstraintInputField.jsx | 2 +- .../component/history/EventLog/EventLog.jsx | 2 +- frontend/src/component/menu/Header/Header.tsx | 2 +- ...test.tsx.snap => apiDetails.test.tsx.snap} | 0 ...-test.jsx.snap => breadcrumbTest.jsx.snap} | 0 ...oter-test.jsx.snap => footerTest.jsx.snap} | 0 ...utes-test.jsx.snap => routesTest.jsx.snap} | 0 ...pidetails.test.tsx => apiDetails.test.tsx} | 0 ...breadcrumb-test.jsx => breadcrumbTest.jsx} | 0 .../{footer-test.jsx => footerTest.jsx} | 2 +- .../{routes-test.jsx => routesTest.jsx} | 0 frontend/src/component/menu/drawer.jsx | 4 +- frontend/src/component/menu/routes.js | 8 +- .../Project/CreateProject/CreateProject.tsx | 2 +- .../Project/EditProject/EditProject.tsx | 2 +- .../ProjectFeatureToggles.tsx | 2 +- .../project/ProjectCard/ProjectCard.tsx | 4 +- .../providers/SWRProvider/SWRProvider.tsx | 2 +- .../{scroll-to-top.jsx => scrollToTop.jsx} | 0 .../segments/SegmentList/SegmentList.tsx | 2 +- .../SplashPageEnvironments.tsx | 4 +- .../CreateStrategy/CreateStrategy.tsx | 2 +- .../strategies/EditStrategy/EditStrategy.tsx | 2 +- .../StrategiesList.test.jsx} | 4 +- .../StrategiesList/StrategiesList.tsx | 4 +- .../StrategiesList.test.jsx.snap} | 0 .../StrategyView.test.jsx} | 4 +- .../__snapshots__/StrategyView.test.jsx.snap} | 0 .../tags/CreateTagType/CreateTagType.tsx | 2 +- .../tags/EditTagType/EditTagType.tsx | 2 +- .../tags/TagTypeForm/useTagTypeForm.ts | 2 +- .../tags/TagTypeList/TagTypeList.jsx | 2 +- .../TagTypeList/__tests__/TagTypeList.test.js | 2 +- .../user/Authentication/Authentication.tsx | 2 +- ....jsx => AuthenticationCustomComponent.jsx} | 0 .../src/component/user/DemoAuth/DemoAuth.jsx | 2 +- .../ForgottenPassword/ForgottenPassword.tsx | 2 +- .../component/user/SimpleAuth/SimpleAuth.jsx | 2 +- .../StandaloneBanner/StandaloneBanner.tsx | 4 +- .../UserProfile/EditProfile/EditProfile.tsx | 4 +- .../UserProfileContent/UserProfileContent.tsx | 2 +- .../PasswordChecker/PasswordChecker.tsx | 2 +- .../ResetPasswordForm/ResetPasswordForm.tsx | 2 +- .../actions/useAdminUsersApi/errorHandlers.ts | 2 +- .../src/hooks/api/actions/useApi/useApi.ts | 4 +- .../api/actions/useAuthApi/useAuthApi.tsx | 2 +- .../hooks/api/getters/useAddons/useAddons.ts | 2 +- .../api/getters/useApiTokens/useApiTokens.ts | 2 +- .../getters/useApplication/useApplication.ts | 2 +- .../useApplications/useApplications.ts | 2 +- .../api/getters/useAuth/useAuthEndpoint.ts | 2 +- .../useAuthSettings/useAuthSettings.ts | 2 +- .../api/getters/useContext/useContext.ts | 2 +- .../getters/useEnvironment/useEnvironment.ts | 2 +- .../useEnvironments/useEnvironments.ts | 2 +- .../hooks/api/getters/useEvents/useEvents.ts | 2 +- .../api/getters/useFeature/useFeature.ts | 2 +- .../useFeatureEvents/useFeatureEvents.ts | 2 +- .../useFeatureMetrics/useFeatureMetrics.ts | 2 +- .../useFeatureMetricsRaw.ts | 2 +- .../useFeatureTypes/useFeatureTypes.ts | 2 +- .../api/getters/useFeatures/useFeatures.ts | 2 +- .../useFeaturesArchive/useFeaturesArchive.ts | 2 +- .../useHealthReport/useHealthReport.ts | 2 +- .../api/getters/useInvoices/useInvoices.ts | 2 +- .../getters/useProject/getProjectFetcher.ts | 2 +- .../useProjectAccess/useProjectAccess.ts | 2 +- .../getters/useProjectRole/useProjectRole.ts | 2 +- .../useProjectRolePermissions.ts | 2 +- .../useProjectRoles/useProjectRoles.ts | 2 +- .../api/getters/useProjects/useProjects.ts | 2 +- .../useResetPassword/useResetPassword.ts | 2 +- .../api/getters/useSegments/useSegments.ts | 2 +- .../getters/useStrategies/useStrategies.ts | 2 +- .../api/getters/useStrategy/useStrategy.ts | 2 +- .../api/getters/useTagType/useTagType.ts | 2 +- .../api/getters/useTagTypes/useTagTypes.ts | 2 +- .../src/hooks/api/getters/useTags/useTags.ts | 2 +- .../getters/useUiBootstrap/useUiBootstrap.ts | 2 +- .../api/getters/useUiConfig/useUiConfig.ts | 2 +- .../useUnleashContext/useUnleashContext.ts | 2 +- .../api/getters/useUserInfo/useUserInfo.ts | 2 +- .../hooks/api/getters/useUsers/useUsers.ts | 2 +- frontend/src/hooks/useEventSettings.ts | 2 +- frontend/src/hooks/useFeaturesSort.ts | 2 +- frontend/src/hooks/useLocationSettings.ts | 2 +- frontend/src/index.tsx | 6 +- .../{security-logger.js => securityLogger.js} | 0 .../themes/{main-theme.ts => mainTheme.ts} | 0 .../src/utils/{api-utils.ts => apiUtils.ts} | 0 ...e-percentage.ts => calculatePercentage.ts} | 0 frontend/src/utils/cleanConstraint.ts | 2 +- .../utils/{format-date.ts => formatDate.ts} | 0 .../utils/{format-path.ts => formatPath.ts} | 0 ...ror.test.ts => formatUnknownError.test.ts} | 2 +- ...unknown-error.ts => formatUnknownError.ts} | 0 ...eature-metrics.ts => getFeatureMetrics.ts} | 0 ...e-type-icons.ts => getFeatureTypeIcons.ts} | 0 ...trategy-object.ts => getStrategyObject.ts} | 2 +- .../{object-id.test.ts => objectId.test.ts} | 2 +- .../src/utils/{object-id.ts => objectId.ts} | 0 frontend/src/utils/{one-of.ts => oneOf.ts} | 0 ...generator.ts => projectFilterGenerator.ts} | 0 ...est.ts => removeEmptyStringFields.test.ts} | 2 +- ...g-fields.ts => removeEmptyStringFields.ts} | 0 ...m-value.ts => resolveDefaultParamValue.ts} | 0 ...te-path-helpers.ts => routePathHelpers.ts} | 0 .../{strategy-names.ts => strategyNames.ts} | 0 234 files changed, 195 insertions(+), 414 deletions(-) rename frontend/src/assets/fonts/{Roboto-300.ttf => roboto300.ttf} (100%) rename frontend/src/assets/fonts/{Roboto-400.ttf => roboto400.ttf} (100%) rename frontend/src/assets/fonts/{Roboto-500.ttf => roboto500.ttf} (100%) rename frontend/src/assets/fonts/{Roboto-700.ttf => roboto700.ttf} (100%) rename frontend/src/assets/fonts/{Sen-Bold.ttf => senBold.ttf} (100%) rename frontend/src/assets/fonts/{Sen-ExtraBold.ttf => senExtraBold.ttf} (100%) rename frontend/src/assets/fonts/{Sen-Regular.ttf => senRegular.ttf} (100%) rename frontend/src/assets/icons/{logo_wbg.svg => logoBg.svg} (100%) rename frontend/src/assets/icons/{unleash-logo-inverted.svg => logoInverted.svg} (100%) rename frontend/src/assets/icons/{logo-plain.svg => logoPlain.svg} (100%) rename frontend/src/assets/icons/{logo-white-bg.svg => logoWhiteBg.svg} (100%) rename frontend/src/assets/img/{env-splash-2.png => envSplash2.png} (100%) rename frontend/src/assets/img/{logo-dark.svg => logoDark.svg} (100%) rename frontend/src/assets/img/{logo-dark-with-text.svg => logoDarkWithText.svg} (100%) rename frontend/src/assets/img/{Logo_White_Transparent_Horizontal.svg => logoWhiteTransparentHorizontal.svg} (100%) rename frontend/src/assets/img/{logo-with-name.svg => logoWithName.svg} (100%) rename frontend/src/assets/img/{mobile-guidance-bg.svg => mobileGuidanceBg.svg} (100%) rename frontend/src/assets/img/{splash_env1.svg => splashEnv1.svg} (100%) rename frontend/src/assets/img/{splash_env2.svg => splashEnv2.svg} (100%) rename frontend/src/assets/img/{unleash_logo_icon_dark _ alpha.gif => unleashLogoIconDarkAlpha.gif} (100%) rename frontend/src/component/Reporting/{__tests__/sorting-test.js => utils.test.js} (99%) rename frontend/src/component/admin/{api-token => apiToken}/ApiTokenForm/ApiTokenForm.styles.ts (100%) rename frontend/src/component/admin/{api-token => apiToken}/ApiTokenForm/ApiTokenForm.tsx (100%) rename frontend/src/component/admin/{api-token => apiToken}/ApiTokenList/ApiTokenList.styles.ts (100%) rename frontend/src/component/admin/{api-token => apiToken}/ApiTokenList/ApiTokenList.tsx (99%) rename frontend/src/component/admin/{api-token => apiToken}/ApiTokenList/secret.jsx (100%) rename frontend/src/component/admin/{api-token => apiToken}/ConfirmToken/ConfirmToken.tsx (100%) rename frontend/src/component/admin/{api-token => apiToken}/ConfirmToken/UserToken/UserToken.tsx (100%) rename frontend/src/component/admin/{api-token => apiToken}/CreateApiToken/CreateApiToken.tsx (97%) rename frontend/src/component/admin/{api-token => apiToken}/hooks/useApiTokenForm.ts (100%) rename frontend/src/component/admin/{project-roles => projectRoles}/CreateProjectRole/CreateProjectRole.tsx (98%) rename frontend/src/component/admin/{project-roles => projectRoles}/EditProjectRole/EditProjectRole.tsx (98%) rename frontend/src/component/admin/{project-roles => projectRoles}/ProjectRoleForm/EnvironmentPermissionAccordion/EnvironmentPermissionAccordion.styles.ts (100%) rename frontend/src/component/admin/{project-roles => projectRoles}/ProjectRoleForm/EnvironmentPermissionAccordion/EnvironmentPermissionAccordion.tsx (100%) rename frontend/src/component/admin/{project-roles => projectRoles}/ProjectRoleForm/ProjectRoleForm.styles.ts (100%) rename frontend/src/component/admin/{project-roles => projectRoles}/ProjectRoleForm/ProjectRoleForm.tsx (100%) rename frontend/src/component/admin/{project-roles => projectRoles}/ProjectRoles/ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm.styles.ts (100%) rename frontend/src/component/admin/{project-roles => projectRoles}/ProjectRoles/ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm.tsx (100%) rename frontend/src/component/admin/{project-roles => projectRoles}/ProjectRoles/ProjectRoleList/ProjectRoleList.tsx (98%) rename frontend/src/component/admin/{project-roles => projectRoles}/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.styles.ts (100%) rename frontend/src/component/admin/{project-roles => projectRoles}/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx (100%) rename frontend/src/component/admin/{project-roles => projectRoles}/ProjectRoles/ProjectRoles.styles.ts (100%) rename frontend/src/component/admin/{project-roles => projectRoles}/ProjectRoles/ProjectRoles.tsx (100%) rename frontend/src/component/admin/{project-roles => projectRoles}/hooks/useProjectRoleForm.ts (100%) rename frontend/src/component/application/{__tests__/application-edit-component-test.js => ApplicationEdit/ApplicationEdit.test.jsx} (98%) rename frontend/src/component/application/{__tests__/__snapshots__/application-edit-component-test.js.snap => ApplicationEdit/__snapshots__/ApplicationEdit.test.jsx.snap} (100%) delete mode 100644 frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.jsx.snap delete mode 100644 frontend/src/component/application/__tests__/application-edit-component-test.jsx rename frontend/src/component/application/{icon-names.ts => iconNames.ts} (100%) rename frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/{__tests__/date-single-value-test.tsx => DateSingleValue.test.tsx} (77%) rename frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/{__tests__/__snapshots__/date-single-value-test.tsx.snap => __snapshots__/DateSingleValue.test.tsx.snap} (100%) rename frontend/src/component/common/{input-list-field.jsx => InputListField.jsx} (100%) rename frontend/src/component/feature/FeatureToggleList/{__tests__/list-component-test.jsx => FeatureToggleList.test.jsx} (83%) rename frontend/src/component/feature/FeatureToggleList/{__tests__/feature-list-item-component-test.jsx => FeatureToggleListItem/FeatureToggleListItem.test.jsx} (94%) rename frontend/src/component/feature/FeatureToggleList/{__tests__/__snapshots__/feature-list-item-component-test.jsx.snap => FeatureToggleListItem/__snapshots__/FeatureToggleListItem.test.jsx.snap} (100%) rename frontend/src/component/feature/FeatureToggleList/{__tests__/__snapshots__/list-component-test.jsx.snap => __snapshots__/FeatureToggleList.test.jsx.snap} (100%) rename frontend/src/component/menu/__tests__/__snapshots__/{apidetails.test.tsx.snap => apiDetails.test.tsx.snap} (100%) rename frontend/src/component/menu/__tests__/__snapshots__/{breadcrumb-test.jsx.snap => breadcrumbTest.jsx.snap} (100%) rename frontend/src/component/menu/__tests__/__snapshots__/{footer-test.jsx.snap => footerTest.jsx.snap} (100%) rename frontend/src/component/menu/__tests__/__snapshots__/{routes-test.jsx.snap => routesTest.jsx.snap} (100%) rename frontend/src/component/menu/__tests__/{apidetails.test.tsx => apiDetails.test.tsx} (100%) rename frontend/src/component/menu/__tests__/{breadcrumb-test.jsx => breadcrumbTest.jsx} (100%) rename frontend/src/component/menu/__tests__/{footer-test.jsx => footerTest.jsx} (94%) rename frontend/src/component/menu/__tests__/{routes-test.jsx => routesTest.jsx} (100%) rename frontend/src/component/{scroll-to-top.jsx => scrollToTop.jsx} (100%) rename frontend/src/component/strategies/{__tests__/list-component-test.jsx => StrategiesList/StrategiesList.test.jsx} (94%) rename frontend/src/component/strategies/{__tests__/__snapshots__/list-component-test.jsx.snap => StrategiesList/__snapshots__/StrategiesList.test.jsx.snap} (100%) rename frontend/src/component/strategies/{__tests__/strategy-details-component-test.jsx => StrategyView/StrategyView.test.jsx} (93%) rename frontend/src/component/strategies/{__tests__/__snapshots__/strategy-details-component-test.jsx.snap => StrategyView/__snapshots__/StrategyView.test.jsx.snap} (100%) rename frontend/src/component/user/{authentication-custom-component.jsx => AuthenticationCustomComponent.jsx} (100%) rename frontend/src/{security-logger.js => securityLogger.js} (100%) rename frontend/src/themes/{main-theme.ts => mainTheme.ts} (100%) rename frontend/src/utils/{api-utils.ts => apiUtils.ts} (100%) rename frontend/src/utils/{calculate-percentage.ts => calculatePercentage.ts} (100%) rename frontend/src/utils/{format-date.ts => formatDate.ts} (100%) rename frontend/src/utils/{format-path.ts => formatPath.ts} (100%) rename frontend/src/utils/{format-unknown-error.test.ts => formatUnknownError.test.ts} (81%) rename frontend/src/utils/{format-unknown-error.ts => formatUnknownError.ts} (100%) rename frontend/src/utils/{get-feature-metrics.ts => getFeatureMetrics.ts} (100%) rename frontend/src/utils/{get-feature-type-icons.ts => getFeatureTypeIcons.ts} (100%) rename frontend/src/utils/{get-strategy-object.ts => getStrategyObject.ts} (87%) rename frontend/src/utils/{object-id.test.ts => objectId.test.ts} (88%) rename frontend/src/utils/{object-id.ts => objectId.ts} (100%) rename frontend/src/utils/{one-of.ts => oneOf.ts} (100%) rename frontend/src/utils/{project-filter-generator.ts => projectFilterGenerator.ts} (100%) rename frontend/src/utils/{remove-empty-string-fields.test.ts => removeEmptyStringFields.test.ts} (87%) rename frontend/src/utils/{remove-empty-string-fields.ts => removeEmptyStringFields.ts} (100%) rename frontend/src/utils/{resolve-default-param-value.ts => resolveDefaultParamValue.ts} (100%) rename frontend/src/utils/{route-path-helpers.ts => routePathHelpers.ts} (100%) rename frontend/src/utils/{strategy-names.ts => strategyNames.ts} (100%) diff --git a/frontend/src/assets/fonts/Roboto-300.ttf b/frontend/src/assets/fonts/roboto300.ttf similarity index 100% rename from frontend/src/assets/fonts/Roboto-300.ttf rename to frontend/src/assets/fonts/roboto300.ttf diff --git a/frontend/src/assets/fonts/Roboto-400.ttf b/frontend/src/assets/fonts/roboto400.ttf similarity index 100% rename from frontend/src/assets/fonts/Roboto-400.ttf rename to frontend/src/assets/fonts/roboto400.ttf diff --git a/frontend/src/assets/fonts/Roboto-500.ttf b/frontend/src/assets/fonts/roboto500.ttf similarity index 100% rename from frontend/src/assets/fonts/Roboto-500.ttf rename to frontend/src/assets/fonts/roboto500.ttf diff --git a/frontend/src/assets/fonts/Roboto-700.ttf b/frontend/src/assets/fonts/roboto700.ttf similarity index 100% rename from frontend/src/assets/fonts/Roboto-700.ttf rename to frontend/src/assets/fonts/roboto700.ttf diff --git a/frontend/src/assets/fonts/Sen-Bold.ttf b/frontend/src/assets/fonts/senBold.ttf similarity index 100% rename from frontend/src/assets/fonts/Sen-Bold.ttf rename to frontend/src/assets/fonts/senBold.ttf diff --git a/frontend/src/assets/fonts/Sen-ExtraBold.ttf b/frontend/src/assets/fonts/senExtraBold.ttf similarity index 100% rename from frontend/src/assets/fonts/Sen-ExtraBold.ttf rename to frontend/src/assets/fonts/senExtraBold.ttf diff --git a/frontend/src/assets/fonts/Sen-Regular.ttf b/frontend/src/assets/fonts/senRegular.ttf similarity index 100% rename from frontend/src/assets/fonts/Sen-Regular.ttf rename to frontend/src/assets/fonts/senRegular.ttf diff --git a/frontend/src/assets/icons/logo_wbg.svg b/frontend/src/assets/icons/logoBg.svg similarity index 100% rename from frontend/src/assets/icons/logo_wbg.svg rename to frontend/src/assets/icons/logoBg.svg diff --git a/frontend/src/assets/icons/unleash-logo-inverted.svg b/frontend/src/assets/icons/logoInverted.svg similarity index 100% rename from frontend/src/assets/icons/unleash-logo-inverted.svg rename to frontend/src/assets/icons/logoInverted.svg diff --git a/frontend/src/assets/icons/logo-plain.svg b/frontend/src/assets/icons/logoPlain.svg similarity index 100% rename from frontend/src/assets/icons/logo-plain.svg rename to frontend/src/assets/icons/logoPlain.svg diff --git a/frontend/src/assets/icons/logo-white-bg.svg b/frontend/src/assets/icons/logoWhiteBg.svg similarity index 100% rename from frontend/src/assets/icons/logo-white-bg.svg rename to frontend/src/assets/icons/logoWhiteBg.svg diff --git a/frontend/src/assets/img/env-splash-2.png b/frontend/src/assets/img/envSplash2.png similarity index 100% rename from frontend/src/assets/img/env-splash-2.png rename to frontend/src/assets/img/envSplash2.png diff --git a/frontend/src/assets/img/logo-dark.svg b/frontend/src/assets/img/logoDark.svg similarity index 100% rename from frontend/src/assets/img/logo-dark.svg rename to frontend/src/assets/img/logoDark.svg diff --git a/frontend/src/assets/img/logo-dark-with-text.svg b/frontend/src/assets/img/logoDarkWithText.svg similarity index 100% rename from frontend/src/assets/img/logo-dark-with-text.svg rename to frontend/src/assets/img/logoDarkWithText.svg diff --git a/frontend/src/assets/img/Logo_White_Transparent_Horizontal.svg b/frontend/src/assets/img/logoWhiteTransparentHorizontal.svg similarity index 100% rename from frontend/src/assets/img/Logo_White_Transparent_Horizontal.svg rename to frontend/src/assets/img/logoWhiteTransparentHorizontal.svg diff --git a/frontend/src/assets/img/logo-with-name.svg b/frontend/src/assets/img/logoWithName.svg similarity index 100% rename from frontend/src/assets/img/logo-with-name.svg rename to frontend/src/assets/img/logoWithName.svg diff --git a/frontend/src/assets/img/mobile-guidance-bg.svg b/frontend/src/assets/img/mobileGuidanceBg.svg similarity index 100% rename from frontend/src/assets/img/mobile-guidance-bg.svg rename to frontend/src/assets/img/mobileGuidanceBg.svg diff --git a/frontend/src/assets/img/splash_env1.svg b/frontend/src/assets/img/splashEnv1.svg similarity index 100% rename from frontend/src/assets/img/splash_env1.svg rename to frontend/src/assets/img/splashEnv1.svg diff --git a/frontend/src/assets/img/splash_env2.svg b/frontend/src/assets/img/splashEnv2.svg similarity index 100% rename from frontend/src/assets/img/splash_env2.svg rename to frontend/src/assets/img/splashEnv2.svg diff --git a/frontend/src/assets/img/unleash_logo_icon_dark _ alpha.gif b/frontend/src/assets/img/unleashLogoIconDarkAlpha.gif similarity index 100% rename from frontend/src/assets/img/unleash_logo_icon_dark _ alpha.gif rename to frontend/src/assets/img/unleashLogoIconDarkAlpha.gif diff --git a/frontend/src/component/Reporting/ReportToggleList/ReportToggleListItem/ReportToggleListItem.jsx b/frontend/src/component/Reporting/ReportToggleList/ReportToggleListItem/ReportToggleListItem.jsx index c298d67bf7..9737fe163c 100644 --- a/frontend/src/component/Reporting/ReportToggleList/ReportToggleListItem/ReportToggleListItem.jsx +++ b/frontend/src/component/Reporting/ReportToggleList/ReportToggleListItem/ReportToggleListItem.jsx @@ -22,7 +22,7 @@ import { } from '../../../../constants/featureToggleTypes'; import styles from '../ReportToggleList.module.scss'; -import { getTogglePath } from '../../../../utils/route-path-helpers'; +import { getTogglePath } from '../../../../utils/routePathHelpers'; const ReportToggleListItem = ({ name, diff --git a/frontend/src/component/Reporting/__tests__/sorting-test.js b/frontend/src/component/Reporting/utils.test.js similarity index 99% rename from frontend/src/component/Reporting/__tests__/sorting-test.js rename to frontend/src/component/Reporting/utils.test.js index 76f98f83d4..b6b3698a00 100644 --- a/frontend/src/component/Reporting/__tests__/sorting-test.js +++ b/frontend/src/component/Reporting/utils.test.js @@ -9,7 +9,7 @@ import { sortFeaturesByExpiredAtDescending, sortFeaturesByStatusAscending, sortFeaturesByStatusDescending, -} from '../utils'; +} from './utils'; const getTestData = () => [ { diff --git a/frontend/src/component/addons/AddonList/AddonList.tsx b/frontend/src/component/addons/AddonList/AddonList.tsx index a5a43b0812..2fa8e28135 100644 --- a/frontend/src/component/addons/AddonList/AddonList.tsx +++ b/frontend/src/component/addons/AddonList/AddonList.tsx @@ -9,7 +9,7 @@ import jiraIcon from '../../../assets/icons/jira.svg'; import webhooksIcon from '../../../assets/icons/webhooks.svg'; import teamsIcon from '../../../assets/icons/teams.svg'; import dataDogIcon from '../../../assets/icons/datadog.svg'; -import { formatAssetPath } from '../../../utils/format-path'; +import { formatAssetPath } from 'utils/formatPath'; import useAddons from '../../../hooks/api/getters/useAddons/useAddons'; const style: React.CSSProperties = { diff --git a/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx b/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx index 64a33df5dc..f617f8018f 100644 --- a/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx +++ b/frontend/src/component/addons/AddonList/ConfiguredAddons/ConfiguredAddons.tsx @@ -21,7 +21,7 @@ import AccessContext from '../../../../contexts/AccessContext'; import { IAddon } from '../../../../interfaces/addons'; import PermissionIconButton from '../../../common/PermissionIconButton/PermissionIconButton'; import Dialogue from '../../../common/Dialogue'; -import { formatUnknownError } from '../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; interface IConfigureAddonsProps { getAddonIcon: (name: string) => ReactElement; diff --git a/frontend/src/component/admin/api/index.js b/frontend/src/component/admin/api/index.js index daeaf24452..54d75c0286 100644 --- a/frontend/src/component/admin/api/index.js +++ b/frontend/src/component/admin/api/index.js @@ -1,4 +1,4 @@ -import { ApiTokenList } from '../api-token/ApiTokenList/ApiTokenList'; +import { ApiTokenList } from '../apiToken/ApiTokenList/ApiTokenList'; import AdminMenu from '../menu/AdminMenu'; import ConditionallyRender from '../../common/ConditionallyRender'; import AccessContext from '../../../contexts/AccessContext'; diff --git a/frontend/src/component/admin/api-token/ApiTokenForm/ApiTokenForm.styles.ts b/frontend/src/component/admin/apiToken/ApiTokenForm/ApiTokenForm.styles.ts similarity index 100% rename from frontend/src/component/admin/api-token/ApiTokenForm/ApiTokenForm.styles.ts rename to frontend/src/component/admin/apiToken/ApiTokenForm/ApiTokenForm.styles.ts diff --git a/frontend/src/component/admin/api-token/ApiTokenForm/ApiTokenForm.tsx b/frontend/src/component/admin/apiToken/ApiTokenForm/ApiTokenForm.tsx similarity index 100% rename from frontend/src/component/admin/api-token/ApiTokenForm/ApiTokenForm.tsx rename to frontend/src/component/admin/apiToken/ApiTokenForm/ApiTokenForm.tsx diff --git a/frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.styles.ts b/frontend/src/component/admin/apiToken/ApiTokenList/ApiTokenList.styles.ts similarity index 100% rename from frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.styles.ts rename to frontend/src/component/admin/apiToken/ApiTokenList/ApiTokenList.styles.ts diff --git a/frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.tsx b/frontend/src/component/admin/apiToken/ApiTokenList/ApiTokenList.tsx similarity index 99% rename from frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.tsx rename to frontend/src/component/admin/apiToken/ApiTokenList/ApiTokenList.tsx index 1961237f53..a958c7e50d 100644 --- a/frontend/src/component/admin/api-token/ApiTokenList/ApiTokenList.tsx +++ b/frontend/src/component/admin/apiToken/ApiTokenList/ApiTokenList.tsx @@ -31,7 +31,7 @@ import { CREATE_API_TOKEN_BUTTON } from '../../../../testIds'; import { Alert } from '@material-ui/lab'; import copy from 'copy-to-clipboard'; import { useLocationSettings } from '../../../../hooks/useLocationSettings'; -import { formatDateYMD } from '../../../../utils/format-date'; +import { formatDateYMD } from 'utils/formatDate'; interface IApiToken { createdAt: Date; diff --git a/frontend/src/component/admin/api-token/ApiTokenList/secret.jsx b/frontend/src/component/admin/apiToken/ApiTokenList/secret.jsx similarity index 100% rename from frontend/src/component/admin/api-token/ApiTokenList/secret.jsx rename to frontend/src/component/admin/apiToken/ApiTokenList/secret.jsx diff --git a/frontend/src/component/admin/api-token/ConfirmToken/ConfirmToken.tsx b/frontend/src/component/admin/apiToken/ConfirmToken/ConfirmToken.tsx similarity index 100% rename from frontend/src/component/admin/api-token/ConfirmToken/ConfirmToken.tsx rename to frontend/src/component/admin/apiToken/ConfirmToken/ConfirmToken.tsx diff --git a/frontend/src/component/admin/api-token/ConfirmToken/UserToken/UserToken.tsx b/frontend/src/component/admin/apiToken/ConfirmToken/UserToken/UserToken.tsx similarity index 100% rename from frontend/src/component/admin/api-token/ConfirmToken/UserToken/UserToken.tsx rename to frontend/src/component/admin/apiToken/ConfirmToken/UserToken/UserToken.tsx diff --git a/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx b/frontend/src/component/admin/apiToken/CreateApiToken/CreateApiToken.tsx similarity index 97% rename from frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx rename to frontend/src/component/admin/apiToken/CreateApiToken/CreateApiToken.tsx index 18d27d5903..c1bd011f94 100644 --- a/frontend/src/component/admin/api-token/CreateApiToken/CreateApiToken.tsx +++ b/frontend/src/component/admin/apiToken/CreateApiToken/CreateApiToken.tsx @@ -10,7 +10,7 @@ import { ADMIN } from 'component/providers/AccessProvider/permissions'; import { ConfirmToken } from '../ConfirmToken/ConfirmToken'; import { useState } from 'react'; import { scrollToTop } from '../../../common/util'; -import { formatUnknownError } from '../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; export const CreateApiToken = () => { const { setToastApiError } = useToast(); diff --git a/frontend/src/component/admin/api-token/hooks/useApiTokenForm.ts b/frontend/src/component/admin/apiToken/hooks/useApiTokenForm.ts similarity index 100% rename from frontend/src/component/admin/api-token/hooks/useApiTokenForm.ts rename to frontend/src/component/admin/apiToken/hooks/useApiTokenForm.ts diff --git a/frontend/src/component/admin/auth/GoogleAuth/GoogleAuth.tsx b/frontend/src/component/admin/auth/GoogleAuth/GoogleAuth.tsx index 43c9712e6b..0631739d5b 100644 --- a/frontend/src/component/admin/auth/GoogleAuth/GoogleAuth.tsx +++ b/frontend/src/component/admin/auth/GoogleAuth/GoogleAuth.tsx @@ -14,8 +14,8 @@ import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import useAuthSettings from '../../../../hooks/api/getters/useAuthSettings/useAuthSettings'; import useAuthSettingsApi from '../../../../hooks/api/actions/useAuthSettingsApi/useAuthSettingsApi'; import useToast from '../../../../hooks/useToast'; -import { formatUnknownError } from '../../../../utils/format-unknown-error'; -import { removeEmptyStringFields } from '../../../../utils/remove-empty-string-fields'; +import { formatUnknownError } from 'utils/formatUnknownError'; +import { removeEmptyStringFields } from 'utils/removeEmptyStringFields'; const initialState = { enabled: false, diff --git a/frontend/src/component/admin/auth/OidcAuth/OidcAuth.tsx b/frontend/src/component/admin/auth/OidcAuth/OidcAuth.tsx index 9fa252e6d9..6d1af9f229 100644 --- a/frontend/src/component/admin/auth/OidcAuth/OidcAuth.tsx +++ b/frontend/src/component/admin/auth/OidcAuth/OidcAuth.tsx @@ -15,8 +15,8 @@ import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import useAuthSettingsApi from '../../../../hooks/api/actions/useAuthSettingsApi/useAuthSettingsApi'; import useAuthSettings from '../../../../hooks/api/getters/useAuthSettings/useAuthSettings'; import useToast from '../../../../hooks/useToast'; -import { formatUnknownError } from '../../../../utils/format-unknown-error'; -import { removeEmptyStringFields } from '../../../../utils/remove-empty-string-fields'; +import { formatUnknownError } from 'utils/formatUnknownError'; +import { removeEmptyStringFields } from 'utils/removeEmptyStringFields'; const initialState = { enabled: false, diff --git a/frontend/src/component/admin/auth/PasswordAuth/PasswordAuth.tsx b/frontend/src/component/admin/auth/PasswordAuth/PasswordAuth.tsx index cef119c529..4bae9c6251 100644 --- a/frontend/src/component/admin/auth/PasswordAuth/PasswordAuth.tsx +++ b/frontend/src/component/admin/auth/PasswordAuth/PasswordAuth.tsx @@ -9,7 +9,7 @@ import useAuthSettingsApi, { ISimpleAuthSettings, } from '../../../../hooks/api/actions/useAuthSettingsApi/useAuthSettingsApi'; import useToast from '../../../../hooks/useToast'; -import { formatUnknownError } from '../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; export const PasswordAuth = () => { const { setToastData, setToastApiError } = useToast(); diff --git a/frontend/src/component/admin/auth/SamlAuth/SamlAuth.tsx b/frontend/src/component/admin/auth/SamlAuth/SamlAuth.tsx index 5120ddaa57..5a1c317bdb 100644 --- a/frontend/src/component/admin/auth/SamlAuth/SamlAuth.tsx +++ b/frontend/src/component/admin/auth/SamlAuth/SamlAuth.tsx @@ -15,8 +15,8 @@ import useToast from '../../../../hooks/useToast'; import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import useAuthSettings from '../../../../hooks/api/getters/useAuthSettings/useAuthSettings'; import useAuthSettingsApi from '../../../../hooks/api/actions/useAuthSettingsApi/useAuthSettingsApi'; -import { formatUnknownError } from '../../../../utils/format-unknown-error'; -import { removeEmptyStringFields } from '../../../../utils/remove-empty-string-fields'; +import { formatUnknownError } from 'utils/formatUnknownError'; +import { removeEmptyStringFields } from 'utils/removeEmptyStringFields'; const initialState = { enabled: false, diff --git a/frontend/src/component/admin/invoice/InvoiceList.tsx b/frontend/src/component/admin/invoice/InvoiceList.tsx index 8e766ef5ea..83ab3bc63b 100644 --- a/frontend/src/component/admin/invoice/InvoiceList.tsx +++ b/frontend/src/component/admin/invoice/InvoiceList.tsx @@ -11,11 +11,11 @@ import OpenInNew from '@material-ui/icons/OpenInNew'; import PageContent from '../../common/PageContent'; import HeaderTitle from '../../common/HeaderTitle'; import ConditionallyRender from '../../common/ConditionallyRender'; -import { formatApiPath } from '../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import useInvoices from '../../../hooks/api/getters/useInvoices/useInvoices'; import { IInvoice } from '../../../interfaces/invoice'; import { useLocationSettings } from '../../../hooks/useLocationSettings'; -import { formatDateYMD } from '../../../utils/format-date'; +import { formatDateYMD } from 'utils/formatDate'; const PORTAL_URL = formatApiPath('api/admin/invoices/portal'); diff --git a/frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx b/frontend/src/component/admin/projectRoles/CreateProjectRole/CreateProjectRole.tsx similarity index 98% rename from frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx rename to frontend/src/component/admin/projectRoles/CreateProjectRole/CreateProjectRole.tsx index a8df1952d2..265c2c3e85 100644 --- a/frontend/src/component/admin/project-roles/CreateProjectRole/CreateProjectRole.tsx +++ b/frontend/src/component/admin/projectRoles/CreateProjectRole/CreateProjectRole.tsx @@ -7,7 +7,7 @@ import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import useToast from 'hooks/useToast'; import { CreateButton } from 'component/common/CreateButton/CreateButton'; import { ADMIN } from 'component/providers/AccessProvider/permissions'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const CreateProjectRole = () => { const { setToastData, setToastApiError } = useToast(); diff --git a/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx b/frontend/src/component/admin/projectRoles/EditProjectRole/EditProjectRole.tsx similarity index 98% rename from frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx rename to frontend/src/component/admin/projectRoles/EditProjectRole/EditProjectRole.tsx index dff08acfc6..0ac5757d63 100644 --- a/frontend/src/component/admin/project-roles/EditProjectRole/EditProjectRole.tsx +++ b/frontend/src/component/admin/projectRoles/EditProjectRole/EditProjectRole.tsx @@ -10,7 +10,7 @@ import { IPermission } from 'interfaces/user'; import { useParams, useHistory } from 'react-router-dom'; import useProjectRoleForm from '../hooks/useProjectRoleForm'; import ProjectRoleForm from '../ProjectRoleForm/ProjectRoleForm'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const EditProjectRole = () => { const { uiConfig } = useUiConfig(); diff --git a/frontend/src/component/admin/project-roles/ProjectRoleForm/EnvironmentPermissionAccordion/EnvironmentPermissionAccordion.styles.ts b/frontend/src/component/admin/projectRoles/ProjectRoleForm/EnvironmentPermissionAccordion/EnvironmentPermissionAccordion.styles.ts similarity index 100% rename from frontend/src/component/admin/project-roles/ProjectRoleForm/EnvironmentPermissionAccordion/EnvironmentPermissionAccordion.styles.ts rename to frontend/src/component/admin/projectRoles/ProjectRoleForm/EnvironmentPermissionAccordion/EnvironmentPermissionAccordion.styles.ts diff --git a/frontend/src/component/admin/project-roles/ProjectRoleForm/EnvironmentPermissionAccordion/EnvironmentPermissionAccordion.tsx b/frontend/src/component/admin/projectRoles/ProjectRoleForm/EnvironmentPermissionAccordion/EnvironmentPermissionAccordion.tsx similarity index 100% rename from frontend/src/component/admin/project-roles/ProjectRoleForm/EnvironmentPermissionAccordion/EnvironmentPermissionAccordion.tsx rename to frontend/src/component/admin/projectRoles/ProjectRoleForm/EnvironmentPermissionAccordion/EnvironmentPermissionAccordion.tsx diff --git a/frontend/src/component/admin/project-roles/ProjectRoleForm/ProjectRoleForm.styles.ts b/frontend/src/component/admin/projectRoles/ProjectRoleForm/ProjectRoleForm.styles.ts similarity index 100% rename from frontend/src/component/admin/project-roles/ProjectRoleForm/ProjectRoleForm.styles.ts rename to frontend/src/component/admin/projectRoles/ProjectRoleForm/ProjectRoleForm.styles.ts diff --git a/frontend/src/component/admin/project-roles/ProjectRoleForm/ProjectRoleForm.tsx b/frontend/src/component/admin/projectRoles/ProjectRoleForm/ProjectRoleForm.tsx similarity index 100% rename from frontend/src/component/admin/project-roles/ProjectRoleForm/ProjectRoleForm.tsx rename to frontend/src/component/admin/projectRoles/ProjectRoleForm/ProjectRoleForm.tsx diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm.styles.ts b/frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm.styles.ts similarity index 100% rename from frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm.styles.ts rename to frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm.styles.ts diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm.tsx b/frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm.tsx similarity index 100% rename from frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm.tsx rename to frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm.tsx diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleList.tsx b/frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoleList/ProjectRoleList.tsx similarity index 98% rename from frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleList.tsx rename to frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoleList/ProjectRoleList.tsx index e42652588d..d3a5a2faaf 100644 --- a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleList.tsx +++ b/frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoleList/ProjectRoleList.tsx @@ -16,7 +16,7 @@ import IRole, { IProjectRole } from '../../../../../interfaces/role'; import useProjectRolesApi from '../../../../../hooks/api/actions/useProjectRolesApi/useProjectRolesApi'; import useToast from '../../../../../hooks/useToast'; import ProjectRoleDeleteConfirm from '../ProjectRoleDeleteConfirm/ProjectRoleDeleteConfirm'; -import { formatUnknownError } from '../../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import { useStyles } from './ProjectRoleListItem/ProjectRoleListItem.styles'; const ROOTROLE = 'root'; diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.styles.ts b/frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.styles.ts similarity index 100% rename from frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.styles.ts rename to frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.styles.ts diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx b/frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx similarity index 100% rename from frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx rename to frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoleList/ProjectRoleListItem/ProjectRoleListItem.tsx diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.styles.ts b/frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoles.styles.ts similarity index 100% rename from frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.styles.ts rename to frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoles.styles.ts diff --git a/frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.tsx b/frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoles.tsx similarity index 100% rename from frontend/src/component/admin/project-roles/ProjectRoles/ProjectRoles.tsx rename to frontend/src/component/admin/projectRoles/ProjectRoles/ProjectRoles.tsx diff --git a/frontend/src/component/admin/project-roles/hooks/useProjectRoleForm.ts b/frontend/src/component/admin/projectRoles/hooks/useProjectRoleForm.ts similarity index 100% rename from frontend/src/component/admin/project-roles/hooks/useProjectRoleForm.ts rename to frontend/src/component/admin/projectRoles/hooks/useProjectRoleForm.ts diff --git a/frontend/src/component/admin/users/CreateUser/CreateUser.tsx b/frontend/src/component/admin/users/CreateUser/CreateUser.tsx index d6c4b63c79..fda1fb0b5f 100644 --- a/frontend/src/component/admin/users/CreateUser/CreateUser.tsx +++ b/frontend/src/component/admin/users/CreateUser/CreateUser.tsx @@ -10,7 +10,7 @@ import { useState } from 'react'; import { scrollToTop } from '../../../common/util'; import { CreateButton } from 'component/common/CreateButton/CreateButton'; import { ADMIN } from 'component/providers/AccessProvider/permissions'; -import { formatUnknownError } from '../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const CreateUser = () => { const { setToastApiError } = useToast(); diff --git a/frontend/src/component/admin/users/EditUser/EditUser.tsx b/frontend/src/component/admin/users/EditUser/EditUser.tsx index 0e8a4ba65e..7f8c32301e 100644 --- a/frontend/src/component/admin/users/EditUser/EditUser.tsx +++ b/frontend/src/component/admin/users/EditUser/EditUser.tsx @@ -11,7 +11,7 @@ import useAdminUsersApi from 'hooks/api/actions/useAdminUsersApi/useAdminUsersAp import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import useUserInfo from 'hooks/api/getters/useUserInfo/useUserInfo'; import useToast from 'hooks/useToast'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const EditUser = () => { useEffect(() => { diff --git a/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.tsx b/frontend/src/component/admin/users/UsersList/UserListItem/UserListItem.tsx index 4ccd1e89eb..1ca7b03871 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 { IUser } from '../../../../../interfaces/user'; import { useStyles } from './UserListItem.styles'; import { useHistory } from 'react-router-dom'; import { ILocationSettings } from '../../../../../hooks/useLocationSettings'; -import { formatDateYMD } from '../../../../../utils/format-date'; +import { formatDateYMD } from 'utils/formatDate'; interface IUserListItemProps { user: IUser; diff --git a/frontend/src/component/admin/users/UsersList/UsersList.tsx b/frontend/src/component/admin/users/UsersList/UsersList.tsx index 4e651eb3a4..f1a1abd3e6 100644 --- a/frontend/src/component/admin/users/UsersList/UsersList.tsx +++ b/frontend/src/component/admin/users/UsersList/UsersList.tsx @@ -24,7 +24,7 @@ import { IUser } from '../../../../interfaces/user'; import IRole from '../../../../interfaces/role'; import useToast from '../../../../hooks/useToast'; import { useLocationSettings } from '../../../../hooks/useLocationSettings'; -import { formatUnknownError } from '../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import { useStyles } from './UserListItem/UserListItem.styles'; const UsersList = () => { diff --git a/frontend/src/component/application/__tests__/application-edit-component-test.js b/frontend/src/component/application/ApplicationEdit/ApplicationEdit.test.jsx similarity index 98% rename from frontend/src/component/application/__tests__/application-edit-component-test.js rename to frontend/src/component/application/ApplicationEdit/ApplicationEdit.test.jsx index df423f2bd5..a020f8d258 100644 --- a/frontend/src/component/application/__tests__/application-edit-component-test.js +++ b/frontend/src/component/application/ApplicationEdit/ApplicationEdit.test.jsx @@ -1,9 +1,9 @@ import { ThemeProvider } from '@material-ui/core'; -import { ApplicationEdit } from '../ApplicationEdit/ApplicationEdit'; +import { ApplicationEdit } from './ApplicationEdit'; import renderer from 'react-test-renderer'; import { MemoryRouter } from 'react-router-dom'; import { ADMIN } from '../../providers/AccessProvider/permissions'; -import theme from '../../../themes/main-theme'; +import theme from '../../../themes/mainTheme'; import AccessProvider from '../../providers/AccessProvider/AccessProvider'; import UIProvider from '../../providers/UIProvider/UIProvider'; diff --git a/frontend/src/component/application/ApplicationEdit/ApplicationEdit.tsx b/frontend/src/component/application/ApplicationEdit/ApplicationEdit.tsx index 9d2bf78bbe..80a6657d1d 100644 --- a/frontend/src/component/application/ApplicationEdit/ApplicationEdit.tsx +++ b/frontend/src/component/application/ApplicationEdit/ApplicationEdit.tsx @@ -24,8 +24,8 @@ import { useHistory, useParams } from 'react-router-dom'; import { useLocationSettings } from '../../../hooks/useLocationSettings'; import useToast from '../../../hooks/useToast'; import PermissionButton from '../../common/PermissionButton/PermissionButton'; -import { formatDateYMD } from '../../../utils/format-date'; -import { formatUnknownError } from '../../../utils/format-unknown-error'; +import { formatDateYMD } from 'utils/formatDate'; +import { formatUnknownError } from 'utils/formatUnknownError'; export const ApplicationEdit = () => { const history = useHistory(); diff --git a/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.js.snap b/frontend/src/component/application/ApplicationEdit/__snapshots__/ApplicationEdit.test.jsx.snap similarity index 100% rename from frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.js.snap rename to frontend/src/component/application/ApplicationEdit/__snapshots__/ApplicationEdit.test.jsx.snap diff --git a/frontend/src/component/application/ApplicationUpdate/ApplicationUpdate.tsx b/frontend/src/component/application/ApplicationUpdate/ApplicationUpdate.tsx index 5885f0785c..be9d285d08 100644 --- a/frontend/src/component/application/ApplicationUpdate/ApplicationUpdate.tsx +++ b/frontend/src/component/application/ApplicationUpdate/ApplicationUpdate.tsx @@ -1,13 +1,13 @@ import { ChangeEvent, useState } from 'react'; import { Grid, TextField } from '@material-ui/core'; import { useCommonStyles } from '../../../common.styles'; -import icons from '../icon-names'; +import icons from 'component/application/iconNames'; import GeneralSelect from '../../common/GeneralSelect/GeneralSelect'; import useApplicationsApi from '../../../hooks/api/actions/useApplicationsApi/useApplicationsApi'; import useToast from '../../../hooks/useToast'; import { IApplication } from '../../../interfaces/application'; import useApplication from '../../../hooks/api/getters/useApplication/useApplication'; -import { formatUnknownError } from '../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; interface IApplicationUpdateProps { application: IApplication; diff --git a/frontend/src/component/application/ApplicationView/ApplicationView.tsx b/frontend/src/component/application/ApplicationView/ApplicationView.tsx index e720fe2471..be34424325 100644 --- a/frontend/src/component/application/ApplicationView/ApplicationView.tsx +++ b/frontend/src/component/application/ApplicationView/ApplicationView.tsx @@ -20,10 +20,10 @@ import { CREATE_STRATEGY, } from '../../providers/AccessProvider/permissions'; import ConditionallyRender from '../../common/ConditionallyRender/ConditionallyRender'; -import { getTogglePath } from '../../../utils/route-path-helpers'; +import { getTogglePath } from 'utils/routePathHelpers'; import useApplication from '../../../hooks/api/getters/useApplication/useApplication'; import AccessContext from '../../../contexts/AccessContext'; -import { formatDateYMDHMS } from '../../../utils/format-date'; +import { formatDateYMDHMS } from 'utils/formatDate'; import { useLocationSettings } from '../../../hooks/useLocationSettings'; export const ApplicationView = () => { diff --git a/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.jsx.snap b/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.jsx.snap deleted file mode 100644 index 55a4015dff..0000000000 --- a/frontend/src/component/application/__tests__/__snapshots__/application-edit-component-test.jsx.snap +++ /dev/null @@ -1,64 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`renders correctly if no application 1`] = ` -
-

- Loading... -

-
-
-
-
-
-`; - -exports[`renders correctly with permissions 1`] = ` -
-

- Loading... -

-
-
-
-
-
-`; - -exports[`renders correctly without permission 1`] = ` -
-

- Loading... -

-
-
-
-
-
-`; diff --git a/frontend/src/component/application/__tests__/application-edit-component-test.jsx b/frontend/src/component/application/__tests__/application-edit-component-test.jsx deleted file mode 100644 index df423f2bd5..0000000000 --- a/frontend/src/component/application/__tests__/application-edit-component-test.jsx +++ /dev/null @@ -1,155 +0,0 @@ -import { ThemeProvider } from '@material-ui/core'; -import { ApplicationEdit } from '../ApplicationEdit/ApplicationEdit'; -import renderer from 'react-test-renderer'; -import { MemoryRouter } from 'react-router-dom'; -import { ADMIN } from '../../providers/AccessProvider/permissions'; -import theme from '../../../themes/main-theme'; -import AccessProvider from '../../providers/AccessProvider/AccessProvider'; -import UIProvider from '../../providers/UIProvider/UIProvider'; - -test('renders correctly if no application', () => { - const tree = renderer - .create( - - - - - Promise.resolve({})} - storeApplicationMetaData={jest.fn()} - deleteApplication={jest.fn()} - locationSettings={{ locale: 'en-GB' }} - /> - - - - - ) - .toJSON(); - - expect(tree).toMatchSnapshot(); -}); - -test('renders correctly without permission', () => { - const tree = renderer - .create( - - - - - Promise.resolve({})} - storeApplicationMetaData={jest.fn()} - deleteApplication={jest.fn()} - application={{ - appName: 'test-app', - instances: [ - { - instanceId: 'instance-1', - clientIp: '123.123.123.123', - lastSeen: '2017-02-23T15:56:49', - sdkVersion: '4.0', - }, - ], - strategies: [ - { - name: 'StrategyA', - description: 'A description', - }, - { - name: 'StrategyB', - description: 'B description', - notFound: true, - }, - ], - seenToggles: [ - { - name: 'ToggleA', - description: 'this is A toggle', - enabled: true, - project: 'default', - }, - { - name: 'ToggleB', - description: 'this is B toggle', - enabled: false, - notFound: true, - project: 'default', - }, - ], - url: 'http://example.org', - description: 'app description', - }} - locationSettings={{ locale: 'en-GB' }} - /> - - - - - ) - .toJSON(); - - expect(tree).toMatchSnapshot(); -}); - -test('renders correctly with permissions', () => { - const tree = renderer - .create( - - - - - Promise.resolve({})} - storeApplicationMetaData={jest.fn()} - deleteApplication={jest.fn()} - application={{ - appName: 'test-app', - instances: [ - { - instanceId: 'instance-1', - clientIp: '123.123.123.123', - lastSeen: '2017-02-23T15:56:49', - sdkVersion: '4.0', - }, - ], - strategies: [ - { - name: 'StrategyA', - description: 'A description', - }, - { - name: 'StrategyB', - description: 'B description', - notFound: true, - }, - ], - seenToggles: [ - { - name: 'ToggleA', - description: 'this is A toggle', - enabled: true, - project: 'default', - }, - { - name: 'ToggleB', - description: 'this is B toggle', - enabled: false, - notFound: true, - project: 'default', - }, - ], - url: 'http://example.org', - description: 'app description', - }} - locationSettings={{ locale: 'en-GB' }} - /> - - - - - ) - .toJSON(); - - expect(tree).toMatchSnapshot(); -}); diff --git a/frontend/src/component/application/icon-names.ts b/frontend/src/component/application/iconNames.ts similarity index 100% rename from frontend/src/component/application/icon-names.ts rename to frontend/src/component/application/iconNames.ts diff --git a/frontend/src/component/common/Constraint/formatConstraintValue.ts b/frontend/src/component/common/Constraint/formatConstraintValue.ts index c7ec4b5020..8cef3e9bc3 100644 --- a/frontend/src/component/common/Constraint/formatConstraintValue.ts +++ b/frontend/src/component/common/Constraint/formatConstraintValue.ts @@ -1,6 +1,6 @@ import { IConstraint } from 'interfaces/strategy'; import { CURRENT_TIME_CONTEXT_FIELD } from 'component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditHeader/ConstraintAccordionEditHeader'; -import { formatDateYMDHMS } from 'utils/format-date'; +import { formatDateYMDHMS } from 'utils/formatDate'; import { ILocationSettings } from 'hooks/useLocationSettings'; export const formatConstraintValuesOrValue = ( diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEdit.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEdit.tsx index 3ba09e9f32..68d1e3ccab 100644 --- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEdit.tsx +++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEdit.tsx @@ -12,7 +12,7 @@ import { import { cleanConstraint } from 'utils/cleanConstraint'; import useFeatureApi from 'hooks/api/actions/useFeatureApi/useFeatureApi'; import useUnleashContext from 'hooks/api/getters/useUnleashContext/useUnleashContext'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import { useParams } from 'react-router-dom'; import { IFeatureViewParams } from 'interfaces/params'; import { IUnleashContextDefinition } from 'interfaces/context'; diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ConstraintAccordionEditBody.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ConstraintAccordionEditBody.tsx index 5882a4aff7..d33be2ef9b 100644 --- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ConstraintAccordionEditBody.tsx +++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ConstraintAccordionEditBody.tsx @@ -7,7 +7,7 @@ import { useStyles } from './ConstraintAccordionEditBody.styles'; import React from 'react'; import { newOperators } from 'constants/operators'; import ConditionallyRender from 'component/common/ConditionallyRender/ConditionallyRender'; -import { oneOf } from 'utils/one-of'; +import { oneOf } from 'utils/oneOf'; import { OperatorUpgradeAlert } from 'component/common/OperatorUpgradeAlert/OperatorUpgradeAlert'; interface IConstraintAccordionBody { diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/__tests__/date-single-value-test.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue.test.tsx similarity index 77% rename from frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/__tests__/date-single-value-test.tsx rename to frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue.test.tsx index 245a65d915..29d46117e2 100644 --- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/__tests__/date-single-value-test.tsx +++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue.test.tsx @@ -1,4 +1,4 @@ -import { parseDateValue } from '../DateSingleValue'; +import { parseDateValue } from 'component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/DateSingleValue'; test(`Date component is able to parse midnight when it's 00`, () => { let f = parseDateValue('2022-03-15T12:27'); diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/__tests__/__snapshots__/date-single-value-test.tsx.snap b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/__snapshots__/DateSingleValue.test.tsx.snap similarity index 100% rename from frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/__tests__/__snapshots__/date-single-value-test.tsx.snap rename to frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/DateSingleValue/__snapshots__/DateSingleValue.test.tsx.snap diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/useConstraintInput/useConstraintInput.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/useConstraintInput/useConstraintInput.tsx index bc24f1dab1..52ac9a23ed 100644 --- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/useConstraintInput/useConstraintInput.tsx +++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/useConstraintInput/useConstraintInput.tsx @@ -9,7 +9,7 @@ import { IUnleashContextDefinition } from 'interfaces/context'; import { IConstraint } from 'interfaces/strategy'; import React, { useCallback, useEffect, useState } from 'react'; import { exists } from 'utils/exists'; -import { oneOf } from 'utils/one-of'; +import { oneOf } from 'utils/oneOf'; import { numberValidatorGenerator, diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditHeader/ConstraintAccordionEditHeader.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditHeader/ConstraintAccordionEditHeader.tsx index 9810f5f27f..eca43dca45 100644 --- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditHeader/ConstraintAccordionEditHeader.tsx +++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditHeader/ConstraintAccordionEditHeader.tsx @@ -14,7 +14,7 @@ import { } from '../../../../../constants/operators'; import { SAVE } from '../ConstraintAccordionEdit'; import { resolveText } from './helpers'; -import { oneOf } from 'utils/one-of'; +import { oneOf } from 'utils/oneOf'; import { useEffect } from 'react'; import { Operator } from 'constants/operators'; diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx index 07de2209f4..2134772754 100644 --- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx +++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx @@ -8,7 +8,7 @@ import { IConstraint } from '../../../../interfaces/strategy'; import { ConstraintAccordionViewBody } from './ConstraintAccordionViewBody/ConstraintAccordionViewBody'; import { ConstraintAccordionViewHeader } from './ConstraintAccordionViewHeader/ConstraintAccordionViewHeader'; -import { oneOf } from '../../../../utils/one-of'; +import { oneOf } from 'utils/oneOf'; import { dateOperators, numOperators, diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewBody/ConstraintAccordionViewBody.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewBody/ConstraintAccordionViewBody.tsx index ad0cfab863..63fa2b22b8 100644 --- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewBody/ConstraintAccordionViewBody.tsx +++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewBody/ConstraintAccordionViewBody.tsx @@ -4,7 +4,7 @@ import StringTruncator from 'component/common/StringTruncator/StringTruncator'; import { useState } from 'react'; import { stringOperators } from '../../../../../constants/operators'; import { IConstraint } from '../../../../../interfaces/strategy'; -import { oneOf } from '../../../../../utils/one-of'; +import { oneOf } from 'utils/oneOf'; import ConditionallyRender from '../../../ConditionallyRender'; import { useStyles } from '../../ConstraintAccordion.styles'; import { ConstraintValueSearch } from '../../ConstraintValueSearch/ConstraintValueSearch'; diff --git a/frontend/src/component/common/Feedback/Feedback.tsx b/frontend/src/component/common/Feedback/Feedback.tsx index 070002f84d..928ede3e8c 100644 --- a/frontend/src/component/common/Feedback/Feedback.tsx +++ b/frontend/src/component/common/Feedback/Feedback.tsx @@ -2,12 +2,12 @@ import { useContext, useState } from 'react'; import { Button, IconButton } from '@material-ui/core'; import classnames from 'classnames'; import CloseIcon from '@material-ui/icons/Close'; -import { ReactComponent as Logo } from '../../../assets/icons/logo-plain.svg'; +import { ReactComponent as Logo } from 'assets/icons/logoPlain.svg'; import { useCommonStyles } from '../../../common.styles'; import { useStyles } from './Feedback.styles'; import AnimateOnMount from '../AnimateOnMount/AnimateOnMount'; import ConditionallyRender from '../ConditionallyRender'; -import { formatApiPath } from '../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import UIContext from '../../../contexts/UIContext'; import { PNPS_FEEDBACK_ID, showPnpsFeedback } from '../util'; import { useAuthFeedback } from '../../../hooks/api/getters/useAuth/useAuthFeedback'; diff --git a/frontend/src/component/common/FormTemplate/FormTemplate.tsx b/frontend/src/component/common/FormTemplate/FormTemplate.tsx index dad1035223..3bec14be6b 100644 --- a/frontend/src/component/common/FormTemplate/FormTemplate.tsx +++ b/frontend/src/component/common/FormTemplate/FormTemplate.tsx @@ -9,7 +9,7 @@ import copy from 'copy-to-clipboard'; import useToast from '../../../hooks/useToast'; import React, { useState } from 'react'; import classNames from 'classnames'; -import { ReactComponent as MobileGuidanceBG } from '../../../assets/img/mobile-guidance-bg.svg'; +import { ReactComponent as MobileGuidanceBG } from 'assets/img/mobileGuidanceBg.svg'; import { useCommonStyles } from 'common.styles'; interface ICreateProps { diff --git a/frontend/src/component/common/input-list-field.jsx b/frontend/src/component/common/InputListField.jsx similarity index 100% rename from frontend/src/component/common/input-list-field.jsx rename to frontend/src/component/common/InputListField.jsx diff --git a/frontend/src/component/common/Loader/Loader.tsx b/frontend/src/component/common/Loader/Loader.tsx index 27888c9e2a..3ee1adb24e 100644 --- a/frontend/src/component/common/Loader/Loader.tsx +++ b/frontend/src/component/common/Loader/Loader.tsx @@ -1,5 +1,5 @@ -import logo from '../../../assets/img/unleash_logo_icon_dark _ alpha.gif'; -import { formatAssetPath } from '../../../utils/format-path'; +import logo from 'assets/img/unleashLogoIconDarkAlpha.gif'; +import { formatAssetPath } from 'utils/formatPath'; import { useStyles } from './Loader.styles'; const Loader = () => { diff --git a/frontend/src/component/common/NotFound/NotFound.tsx b/frontend/src/component/common/NotFound/NotFound.tsx index f63393ac87..f37ef9550c 100644 --- a/frontend/src/component/common/NotFound/NotFound.tsx +++ b/frontend/src/component/common/NotFound/NotFound.tsx @@ -1,7 +1,7 @@ import { Button, Typography } from '@material-ui/core'; import { useHistory } from 'react-router'; -import { ReactComponent as LogoIcon } from '../../../assets/icons/logo_wbg.svg'; +import { ReactComponent as LogoIcon } from 'assets/icons/logoBg.svg'; import { useStyles } from './NotFound.styles'; diff --git a/frontend/src/component/context/ContextList/ContextList.jsx b/frontend/src/component/context/ContextList/ContextList.jsx index 6df484cf3a..097d94c0f5 100644 --- a/frontend/src/component/context/ContextList/ContextList.jsx +++ b/frontend/src/component/context/ContextList/ContextList.jsx @@ -25,7 +25,7 @@ import AccessContext from '../../../contexts/AccessContext'; import useUnleashContext from '../../../hooks/api/getters/useUnleashContext/useUnleashContext'; import useContextsApi from '../../../hooks/api/actions/useContextsApi/useContextsApi'; import useToast from '../../../hooks/useToast'; -import { formatUnknownError } from '../../../utils/format-unknown-error'; +import { formatUnknownError } from '../../../utils/formatUnknownError'; const ContextList = () => { const { hasAccess } = useContext(AccessContext); diff --git a/frontend/src/component/context/CreateContext/CreateContext.tsx b/frontend/src/component/context/CreateContext/CreateContext.tsx index a4a9ab8b79..4cb470b4ce 100644 --- a/frontend/src/component/context/CreateContext/CreateContext.tsx +++ b/frontend/src/component/context/CreateContext/CreateContext.tsx @@ -8,7 +8,7 @@ import useContextsApi from 'hooks/api/actions/useContextsApi/useContextsApi'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import useUnleashContext from 'hooks/api/getters/useUnleashContext/useUnleashContext'; import useToast from 'hooks/useToast'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; export const CreateContext = () => { const { setToastData, setToastApiError } = useToast(); diff --git a/frontend/src/component/context/EditContext/EditContext.tsx b/frontend/src/component/context/EditContext/EditContext.tsx index 02ddbcaf25..891d280678 100644 --- a/frontend/src/component/context/EditContext/EditContext.tsx +++ b/frontend/src/component/context/EditContext/EditContext.tsx @@ -8,7 +8,7 @@ import useToast from 'hooks/useToast'; import { useEffect } from 'react'; import { useHistory, useParams } from 'react-router-dom'; import { scrollToTop } from '../../common/util'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import { ContextForm } from '../ContextForm/ContextForm'; import { useContextForm } from '../hooks/useContextForm'; diff --git a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx index d2d77cd764..965043d5cd 100644 --- a/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx +++ b/frontend/src/component/environments/CreateEnvironment/CreateEnvironment.tsx @@ -14,7 +14,7 @@ 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'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const CreateEnvironment = () => { const { setToastApiError, setToastData } = useToast(); diff --git a/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx b/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx index 42ba955039..2371cac304 100644 --- a/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx +++ b/frontend/src/component/environments/EditEnvironment/EditEnvironment.tsx @@ -9,7 +9,7 @@ import { useHistory, useParams } from 'react-router-dom'; import { ADMIN } from '../../providers/AccessProvider/permissions'; import EnvironmentForm from '../EnvironmentForm/EnvironmentForm'; import useEnvironmentForm from '../hooks/useEnvironmentForm'; -import { formatUnknownError } from '../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const EditEnvironment = () => { const { uiConfig } = useUiConfig(); diff --git a/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx b/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx index 38934205c7..e0d78a68c3 100644 --- a/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx +++ b/frontend/src/component/environments/EnvironmentList/EnvironmentList.tsx @@ -18,7 +18,7 @@ import EnvironmentToggleConfirm from './EnvironmentToggleConfirm/EnvironmentTogg import useProjectRolePermissions from '../../../hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions'; import { ADMIN } from 'component/providers/AccessProvider/permissions'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; -import { formatUnknownError } from '../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const EnvironmentList = () => { const defaultEnv = { diff --git a/frontend/src/component/feature/CopyFeature/CopyFeature.jsx b/frontend/src/component/feature/CopyFeature/CopyFeature.jsx index 1e946935aa..695c812ba3 100644 --- a/frontend/src/component/feature/CopyFeature/CopyFeature.jsx +++ b/frontend/src/component/feature/CopyFeature/CopyFeature.jsx @@ -17,7 +17,7 @@ import styles from './CopyFeature.module.scss'; import { trim } from '../../common/util'; import ConditionallyRender from '../../common/ConditionallyRender'; import { Alert } from '@material-ui/lab'; -import { getTogglePath } from '../../../utils/route-path-helpers'; +import { getTogglePath } from '../../../utils/routePathHelpers'; import useFeatureApi from '../../../hooks/api/actions/useFeatureApi/useFeatureApi'; import { useFeature } from '../../../hooks/api/getters/useFeature/useFeature'; import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig'; diff --git a/frontend/src/component/feature/CreateFeature/CreateFeature.tsx b/frontend/src/component/feature/CreateFeature/CreateFeature.tsx index ab169f4a21..d34e45ae52 100644 --- a/frontend/src/component/feature/CreateFeature/CreateFeature.tsx +++ b/frontend/src/component/feature/CreateFeature/CreateFeature.tsx @@ -10,7 +10,7 @@ import { useContext } from 'react'; import { CreateButton } from 'component/common/CreateButton/CreateButton'; import UIContext from 'contexts/UIContext'; import { CF_CREATE_BTN_ID } from 'testIds'; -import { formatUnknownError } from '../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const CreateFeature = () => { const { setToastData, setToastApiError } = useToast(); diff --git a/frontend/src/component/feature/EditFeature/EditFeature.tsx b/frontend/src/component/feature/EditFeature/EditFeature.tsx index b4ed8f024e..9d01af101e 100644 --- a/frontend/src/component/feature/EditFeature/EditFeature.tsx +++ b/frontend/src/component/feature/EditFeature/EditFeature.tsx @@ -10,7 +10,7 @@ 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'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const EditFeature = () => { const { setToastData, setToastApiError } = useToast(); diff --git a/frontend/src/component/feature/FeatureForm/FeatureForm.tsx b/frontend/src/component/feature/FeatureForm/FeatureForm.tsx index fb573f2f8f..f0fd5c69db 100644 --- a/frontend/src/component/feature/FeatureForm/FeatureForm.tsx +++ b/frontend/src/component/feature/FeatureForm/FeatureForm.tsx @@ -10,7 +10,7 @@ import FeatureTypeSelect from '../FeatureView/FeatureSettings/FeatureSettingsMet import { CF_DESC_ID, CF_NAME_ID, CF_TYPE_ID } from '../../../testIds'; import useFeatureTypes from '../../../hooks/api/getters/useFeatureTypes/useFeatureTypes'; import { KeyboardArrowDownOutlined } from '@material-ui/icons'; -import { projectFilterGenerator } from '../../../utils/project-filter-generator'; +import { projectFilterGenerator } from 'utils/projectFilterGenerator'; import FeatureProjectSelect from '../FeatureView/FeatureSettings/FeatureSettingsProject/FeatureProjectSelect/FeatureProjectSelect'; import ConditionallyRender from '../../common/ConditionallyRender'; import { trim } from '../../common/util'; diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints2/FeatureStrategyConstraints2.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints2/FeatureStrategyConstraints2.tsx index a8bef4e159..f4d46fea5e 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints2/FeatureStrategyConstraints2.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints2/FeatureStrategyConstraints2.tsx @@ -10,7 +10,7 @@ import { } from 'component/providers/AccessProvider/permissions'; import { createEmptyConstraint } from 'component/feature/FeatureStrategy/FeatureStrategyConstraints2/createEmptyConstraint'; import { useWeakMap } from 'hooks/useWeakMap'; -import { objectId } from 'utils/object-id'; +import { objectId } from 'utils/objectId'; import { useStyles } from 'component/feature/FeatureStrategy/FeatureStrategyConstraints2/FeatureStrategyConstraints2.styles'; interface IFeatureStrategyConstraints2Props { diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx index 75be0ac218..577dc57e1b 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx @@ -6,7 +6,7 @@ import { FeatureStrategyForm } from 'component/feature/FeatureStrategy/FeatureSt import FormTemplate from '../../../common/FormTemplate/FormTemplate'; import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import useFeatureStrategyApi from '../../../../hooks/api/actions/useFeatureStrategyApi/useFeatureStrategyApi'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import { useHistory } from 'react-router-dom'; import useToast from '../../../../hooks/useToast'; import { IFeatureStrategy } from 'interfaces/strategy'; @@ -16,7 +16,7 @@ import { formatFeaturePath, createStrategyPayload, } from '../FeatureStrategyEdit/FeatureStrategyEdit'; -import { getStrategyObject } from 'utils/get-strategy-object'; +import { getStrategyObject } from 'utils/getStrategyObject'; import { useStrategies } from 'hooks/api/getters/useStrategies/useStrategies'; import { CREATE_FEATURE_STRATEGY } from 'component/providers/AccessProvider/permissions'; diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEdit/FeatureStrategyEdit.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEdit/FeatureStrategyEdit.tsx index 705b2d4679..ae4504875d 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEdit/FeatureStrategyEdit.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyEdit/FeatureStrategyEdit.tsx @@ -6,7 +6,7 @@ import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import { useRequiredQueryParam } from 'hooks/useRequiredQueryParam'; import { useRequiredPathParam } from 'hooks/useRequiredPathParam'; import useFeatureStrategyApi from '../../../../hooks/api/actions/useFeatureStrategyApi/useFeatureStrategyApi'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import { useHistory } from 'react-router-dom'; import useToast from '../../../../hooks/useToast'; import { IFeatureStrategy, IStrategyPayload } from 'interfaces/strategy'; diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyForm/FeatureStrategyForm.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyForm/FeatureStrategyForm.tsx index 265cb7b180..e6fce2e570 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyForm/FeatureStrategyForm.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyForm/FeatureStrategyForm.tsx @@ -3,7 +3,7 @@ import { IFeatureStrategy } from 'interfaces/strategy'; import { getFeatureStrategyIcon, formatStrategyName, -} from 'utils/strategy-names'; +} from 'utils/strategyNames'; import { FeatureStrategyType } from '../FeatureStrategyType/FeatureStrategyType'; import { FeatureStrategyEnabled } from '../FeatureStrategyEnabled/FeatureStrategyEnabled'; import { FeatureStrategyConstraints } from '../FeatureStrategyConstraints/FeatureStrategyConstraints'; diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenuCard/FeatureStrategyMenuCard.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenuCard/FeatureStrategyMenuCard.tsx index 73b2902268..9f26298b97 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenuCard/FeatureStrategyMenuCard.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyMenu/FeatureStrategyMenuCard/FeatureStrategyMenuCard.tsx @@ -4,7 +4,7 @@ import { useStyles } from './FeatureStrategyMenuCard.styles'; import { getFeatureStrategyIcon, formatStrategyName, -} from 'utils/strategy-names'; +} from 'utils/strategyNames'; import { formatCreateStrategyPath } from '../../FeatureStrategyCreate/FeatureStrategyCreate'; import StringTruncator from 'component/common/StringTruncator/StringTruncator'; diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyProdGuard/FeatureStrategyProdGuard.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyProdGuard/FeatureStrategyProdGuard.tsx index 546d18b96c..1cf4d17a29 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyProdGuard/FeatureStrategyProdGuard.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyProdGuard/FeatureStrategyProdGuard.tsx @@ -1,4 +1,4 @@ -import { getBasePath } from 'utils/format-path'; +import { getBasePath } from 'utils/formatPath'; import Dialogue from '../../../common/Dialogue'; import { Alert } from '@material-ui/lab'; import { Checkbox, FormControlLabel } from '@material-ui/core'; diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyRemove/FeatureStrategyRemove.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyRemove/FeatureStrategyRemove.tsx index c5ad228391..bf8a7d09c6 100644 --- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyRemove/FeatureStrategyRemove.tsx +++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyRemove/FeatureStrategyRemove.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import useFeatureStrategyApi from 'hooks/api/actions/useFeatureStrategyApi/useFeatureStrategyApi'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import { useHistory } from 'react-router-dom'; import useToast from 'hooks/useToast'; import { formatFeaturePath } from '../FeatureStrategyEdit/FeatureStrategyEdit'; diff --git a/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx b/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx index a4c55d08df..43d2e9046c 100644 --- a/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx +++ b/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.jsx @@ -16,7 +16,7 @@ import { CREATE_FEATURE } from '../../providers/AccessProvider/permissions'; import AccessContext from '../../../contexts/AccessContext'; import { useStyles } from './styles'; import ListPlaceholder from '../../common/ListPlaceholder/ListPlaceholder'; -import { getCreateTogglePath } from '../../../utils/route-path-helpers'; +import { getCreateTogglePath } from '../../../utils/routePathHelpers'; import { NAVIGATE_TO_CREATE_FEATURE } from '../../../testIds'; import { resolveFilteredProjectId } from '../../../hooks/useFeaturesFilter'; diff --git a/frontend/src/component/feature/FeatureToggleList/__tests__/list-component-test.jsx b/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.test.jsx similarity index 83% rename from frontend/src/component/feature/FeatureToggleList/__tests__/list-component-test.jsx rename to frontend/src/component/feature/FeatureToggleList/FeatureToggleList.test.jsx index 36fda8fee7..f2d2c20d50 100644 --- a/frontend/src/component/feature/FeatureToggleList/__tests__/list-component-test.jsx +++ b/frontend/src/component/feature/FeatureToggleList/FeatureToggleList.test.jsx @@ -1,18 +1,18 @@ import React from 'react'; import { MemoryRouter } from 'react-router-dom'; import { ThemeProvider } from '@material-ui/core'; -import FeatureToggleList from '../FeatureToggleList'; +import FeatureToggleList from './FeatureToggleList'; import renderer from 'react-test-renderer'; -import theme from '../../../../themes/main-theme'; -import { CREATE_FEATURE } from '../../../providers/AccessProvider/permissions'; -import AccessProvider from '../../../providers/AccessProvider/AccessProvider'; +import theme from '../../../themes/mainTheme'; +import { CREATE_FEATURE } from '../../providers/AccessProvider/permissions'; +import AccessProvider from '../../providers/AccessProvider/AccessProvider'; -jest.mock('../FeatureToggleListItem', () => ({ +jest.mock('./FeatureToggleListItem/FeatureToggleListItem', () => ({ __esModule: true, default: 'ListItem', })); -jest.mock('../../../common/ProjectSelect/ProjectSelect'); +jest.mock('../../common/ProjectSelect/ProjectSelect'); test('renders correctly with one feature', () => { const features = [ diff --git a/frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/FeatureToggleListItem.jsx b/frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/FeatureToggleListItem.jsx index e85a05da02..1f6a42b77f 100644 --- a/frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/FeatureToggleListItem.jsx +++ b/frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/FeatureToggleListItem.jsx @@ -14,7 +14,7 @@ import { UPDATE_FEATURE } from '../../../providers/AccessProvider/permissions'; import { styles as commonStyles } from '../../../common'; import { useStyles } from './styles'; -import { getTogglePath } from '../../../../utils/route-path-helpers'; +import { getTogglePath } from '../../../../utils/routePathHelpers'; import FeatureStatus from '../../FeatureView/FeatureStatus/FeatureStatus'; import FeatureType from '../../FeatureView/FeatureType/FeatureType'; import useProjects from '../../../../hooks/api/getters/useProjects/useProjects'; diff --git a/frontend/src/component/feature/FeatureToggleList/__tests__/feature-list-item-component-test.jsx b/frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/FeatureToggleListItem.test.jsx similarity index 94% rename from frontend/src/component/feature/FeatureToggleList/__tests__/feature-list-item-component-test.jsx rename to frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/FeatureToggleListItem.test.jsx index e3af2247ca..18cd7ef7b2 100644 --- a/frontend/src/component/feature/FeatureToggleList/__tests__/feature-list-item-component-test.jsx +++ b/frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/FeatureToggleListItem.test.jsx @@ -2,10 +2,10 @@ import React from 'react'; import { MemoryRouter } from 'react-router-dom'; import { ThemeProvider } from '@material-ui/core'; -import FeatureToggleListItem from '../FeatureToggleListItem'; +import FeatureToggleListItem from './index'; import renderer from 'react-test-renderer'; -import theme from '../../../../themes/main-theme'; +import theme from '../../../../themes/mainTheme'; test('renders correctly with one feature', () => { const feature = { diff --git a/frontend/src/component/feature/FeatureToggleList/__tests__/__snapshots__/feature-list-item-component-test.jsx.snap b/frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/__snapshots__/FeatureToggleListItem.test.jsx.snap similarity index 100% rename from frontend/src/component/feature/FeatureToggleList/__tests__/__snapshots__/feature-list-item-component-test.jsx.snap rename to frontend/src/component/feature/FeatureToggleList/FeatureToggleListItem/__snapshots__/FeatureToggleListItem.test.jsx.snap diff --git a/frontend/src/component/feature/FeatureToggleList/__tests__/__snapshots__/list-component-test.jsx.snap b/frontend/src/component/feature/FeatureToggleList/__snapshots__/FeatureToggleList.test.jsx.snap similarity index 100% rename from frontend/src/component/feature/FeatureToggleList/__tests__/__snapshots__/list-component-test.jsx.snap rename to frontend/src/component/feature/FeatureToggleList/__snapshots__/FeatureToggleList.test.jsx.snap diff --git a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/CreatedAt.tsx b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/CreatedAt.tsx index ca243ca46a..34d37d7d1b 100644 --- a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/CreatedAt.tsx +++ b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/CreatedAt.tsx @@ -1,6 +1,6 @@ import { Tooltip } from '@material-ui/core'; import { useLocationSettings } from '../../../../hooks/useLocationSettings'; -import { formatDateYMD, formatDateYMDHMS } from '../../../../utils/format-date'; +import { formatDateYMD, formatDateYMDHMS } from 'utils/formatDate'; interface CreatedAtProps { time: string; diff --git a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx index 24f6912a29..3d7402b612 100644 --- a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx +++ b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx @@ -5,7 +5,7 @@ import { useStyles } from '../FeatureToggleListNew.styles'; import useToggleFeatureByEnv from '../../../../hooks/api/actions/useToggleFeatureByEnv/useToggleFeatureByEnv'; import { IEnvironments } from '../../../../interfaces/featureToggle'; import useToast from '../../../../hooks/useToast'; -import { getTogglePath } from '../../../../utils/route-path-helpers'; +import { getTogglePath } from 'utils/routePathHelpers'; import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import FeatureStatus from '../../FeatureView/FeatureStatus/FeatureStatus'; import FeatureType from '../../FeatureView/FeatureType/FeatureType'; diff --git a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsChart/createChartData.ts b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsChart/createChartData.ts index c5af93fdfb..c58a0cd669 100644 --- a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsChart/createChartData.ts +++ b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsChart/createChartData.ts @@ -1,7 +1,7 @@ import { IFeatureMetricsRaw } from '../../../../../interfaces/featureToggle'; import { ChartData } from 'chart.js'; import { ILocationSettings } from '../../../../../hooks/useLocationSettings'; -import theme from '../../../../../themes/main-theme'; +import theme from 'themes/mainTheme'; import 'chartjs-adapter-date-fns'; interface IPoint { diff --git a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsChart/createChartOptions.ts b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsChart/createChartOptions.ts index 4f0f46a68f..7ae6fda9e1 100644 --- a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsChart/createChartOptions.ts +++ b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsChart/createChartOptions.ts @@ -2,8 +2,8 @@ import { ILocationSettings } from '../../../../../hooks/useLocationSettings'; import 'chartjs-adapter-date-fns'; import { ChartOptions, defaults } from 'chart.js'; import { IFeatureMetricsRaw } from '../../../../../interfaces/featureToggle'; -import theme from '../../../../../themes/main-theme'; -import { formatDateHM } from '../../../../../utils/format-date'; +import theme from 'themes/mainTheme'; +import { formatDateHM } from 'utils/formatDate'; export const createChartOptions = ( metrics: IFeatureMetricsRaw[], diff --git a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsContent/FeatureMetricsContent.tsx b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsContent/FeatureMetricsContent.tsx index a163b88e38..80e2a04fdf 100644 --- a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsContent/FeatureMetricsContent.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsContent/FeatureMetricsContent.tsx @@ -4,7 +4,7 @@ import { FeatureMetricsStatsRaw } from '../FeatureMetricsStats/FeatureMetricsSta import { FeatureMetricsChart } from '../FeatureMetricsChart/FeatureMetricsChart'; import { FeatureMetricsEmpty } from '../FeatureMetricsEmpty/FeatureMetricsEmpty'; import { Box } from '@material-ui/core'; -import theme from '../../../../../themes/main-theme'; +import theme from 'themes/mainTheme'; interface IFeatureMetricsContentProps { metrics: IFeatureMetricsRaw[]; diff --git a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsStats/FeatureMetricsStats.tsx b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsStats/FeatureMetricsStats.tsx index 146d4605f4..b674d141ad 100644 --- a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsStats/FeatureMetricsStats.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsStats/FeatureMetricsStats.tsx @@ -1,4 +1,4 @@ -import { calculatePercentage } from '../../../../../utils/calculate-percentage'; +import { calculatePercentage } from 'utils/calculatePercentage'; import { useStyles } from './FeatureMetricsStats.styles'; import { Grid } from '@material-ui/core'; diff --git a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsTable/FeatureMetricsTable.tsx b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsTable/FeatureMetricsTable.tsx index d877d1fc25..800073496f 100644 --- a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsTable/FeatureMetricsTable.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsTable/FeatureMetricsTable.tsx @@ -10,7 +10,7 @@ import { } from '@material-ui/core'; import { useLocationSettings } from '../../../../../hooks/useLocationSettings'; import { useMemo } from 'react'; -import { formatDateYMDHMS } from 'utils/format-date'; +import { formatDateYMDHMS } from 'utils/formatDate'; export const FEATURE_METRICS_TABLE_ID = 'feature-metrics-table-id'; diff --git a/frontend/src/component/feature/FeatureView/FeatureNotFound/FeatureNotFound.tsx b/frontend/src/component/feature/FeatureView/FeatureNotFound/FeatureNotFound.tsx index d1b13c4748..0fb06592d9 100644 --- a/frontend/src/component/feature/FeatureView/FeatureNotFound/FeatureNotFound.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureNotFound/FeatureNotFound.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { Link, useParams } from 'react-router-dom'; -import { getCreateTogglePath } from 'utils/route-path-helpers'; +import { getCreateTogglePath } from 'utils/routePathHelpers'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; import { useStyles } from 'component/feature/FeatureView/FeatureNotFound/FeatureNotFound.styles'; import { IFeatureViewParams } from 'interfaces/params'; diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/AddTagDialog/AddTagDialog.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/AddTagDialog/AddTagDialog.tsx index e68a459fbc..a0ee98defb 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/AddTagDialog/AddTagDialog.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/AddTagDialog/AddTagDialog.tsx @@ -10,7 +10,7 @@ import TagSelect from '../../../../common/TagSelect/TagSelect'; import useFeatureApi from '../../../../../hooks/api/actions/useFeatureApi/useFeatureApi'; import useTags from '../../../../../hooks/api/getters/useTags/useTags'; import useToast from '../../../../../hooks/useToast'; -import { formatUnknownError } from '../../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; interface IAddTagDialogProps { open: boolean; diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvSwitches/FeatureOverviewEnvSwitch/FeatureOverviewEnvSwitch.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvSwitches/FeatureOverviewEnvSwitch/FeatureOverviewEnvSwitch.tsx index 9a088f61c7..9a54543263 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvSwitches/FeatureOverviewEnvSwitch/FeatureOverviewEnvSwitch.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvSwitches/FeatureOverviewEnvSwitch/FeatureOverviewEnvSwitch.tsx @@ -9,7 +9,7 @@ import PermissionSwitch from '../../../../../common/PermissionSwitch/PermissionS import StringTruncator from '../../../../../common/StringTruncator/StringTruncator'; import { UPDATE_FEATURE_ENVIRONMENT } from '../../../../../providers/AccessProvider/permissions'; import React from 'react'; -import { formatUnknownError } from '../../../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; interface IFeatureOverviewEnvSwitchProps { env: IFeatureEnvironment; diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironment.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironment.tsx index 7a8b83fadd..d95dc1957a 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironment.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironment.tsx @@ -11,11 +11,11 @@ import { useFeature } from '../../../../../../hooks/api/getters/useFeature/useFe import useFeatureMetrics from '../../../../../../hooks/api/getters/useFeatureMetrics/useFeatureMetrics'; import { IFeatureEnvironment } from '../../../../../../interfaces/featureToggle'; import { IFeatureViewParams } from '../../../../../../interfaces/params'; -import { getFeatureMetrics } from '../../../../../../utils/get-feature-metrics'; +import { getFeatureMetrics } from 'utils/getFeatureMetrics'; import { getFeatureStrategyIcon, formatStrategyName, -} from '../../../../../../utils/strategy-names'; +} from 'utils/strategyNames'; import ConditionallyRender from '../../../../../common/ConditionallyRender'; import DisabledIndicator from '../../../../../common/DisabledIndicator/DisabledIndicator'; import EnvironmentIcon from '../../../../../common/EnvironmentIcon/EnvironmentIcon'; diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.tsx index e3742b815b..f766104bf1 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentMetrics/FeatureOverviewEnvironmentMetrics.tsx @@ -1,6 +1,6 @@ import { FiberManualRecord } from '@material-ui/icons'; import { IFeatureEnvironmentMetrics } from '../../../../../../../interfaces/featureToggle'; -import { calculatePercentage } from '../../../../../../../utils/calculate-percentage'; +import { calculatePercentage } from 'utils/calculatePercentage'; import PercentageCircle from '../../../../../../common/PercentageCircle/PercentageCircle'; import { useStyles } from './FeatureOverviewEnvironmentMetrics.styles'; diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentStrategies/FeatureOverviewEnvironmentStrategy/FeatureOverviewEnvironmentStrategy.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentStrategies/FeatureOverviewEnvironmentStrategy/FeatureOverviewEnvironmentStrategy.tsx index c08e0d3877..4782071a6e 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentStrategies/FeatureOverviewEnvironmentStrategy/FeatureOverviewEnvironmentStrategy.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewEnvironments/FeatureOverviewEnvironment/FeatureOverviewEnvironmentStrategies/FeatureOverviewEnvironmentStrategy/FeatureOverviewEnvironmentStrategy.tsx @@ -6,7 +6,7 @@ import { IFeatureStrategy } from '../../../../../../../../interfaces/strategy'; import { getFeatureStrategyIcon, formatStrategyName, -} from '../../../../../../../../utils/strategy-names'; +} from 'utils/strategyNames'; import PermissionIconButton from '../../../../../../../common/PermissionIconButton/PermissionIconButton'; import { UPDATE_FEATURE_STRATEGY } from '../../../../../../../providers/AccessProvider/permissions'; import FeatureOverviewExecution from '../../../../FeatureOverviewExecution/FeatureOverviewExecution'; diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewMetaData.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewMetaData.tsx index c805571a3a..d20066033a 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewMetaData.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewMetaData.tsx @@ -3,7 +3,7 @@ import classnames from 'classnames'; import { useParams } from 'react-router-dom'; import { Link } from 'react-router-dom'; import { useFeature } from '../../../../../hooks/api/getters/useFeature/useFeature'; -import { getFeatureTypeIcons } from '../../../../../utils/get-feature-type-icons'; +import { getFeatureTypeIcons } from 'utils/getFeatureTypeIcons'; import ConditionallyRender from '../../../../common/ConditionallyRender'; import { useStyles } from './FeatureOverviewMetadata.styles'; diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewTags/FeatureOverviewTags.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewTags/FeatureOverviewTags.tsx index 85f05aec6b..121e888979 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewTags/FeatureOverviewTags.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewTags/FeatureOverviewTags.tsx @@ -8,7 +8,7 @@ import { useStyles } from './FeatureOverviewTags.styles'; import slackIcon from '../../../../../../assets/icons/slack.svg'; import jiraIcon from '../../../../../../assets/icons/jira.svg'; import webhookIcon from '../../../../../../assets/icons/webhooks.svg'; -import { formatAssetPath } from '../../../../../../utils/format-path'; +import { formatAssetPath } from 'utils/formatPath'; import useTagTypes from '../../../../../../hooks/api/getters/useTagTypes/useTagTypes'; import useFeatureApi from '../../../../../../hooks/api/actions/useFeatureApi/useFeatureApi'; import Dialogue from '../../../../../common/Dialogue'; @@ -17,7 +17,7 @@ import useToast from '../../../../../../hooks/useToast'; import { UPDATE_FEATURE } from '../../../../../providers/AccessProvider/permissions'; import ConditionallyRender from '../../../../../common/ConditionallyRender'; import AccessContext from '../../../../../../contexts/AccessContext'; -import { formatUnknownError } from '../../../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; interface IFeatureOverviewTagsProps extends React.HTMLProps { projectId: string; diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/StaleDialog/StaleDialog.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/StaleDialog/StaleDialog.tsx index 8adac266e1..764a985ef6 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/StaleDialog/StaleDialog.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/StaleDialog/StaleDialog.tsx @@ -7,7 +7,7 @@ import Dialogue from '../../../../common/Dialogue'; import { useFeature } from '../../../../../hooks/api/getters/useFeature/useFeature'; import React from 'react'; import useToast from '../../../../../hooks/useToast'; -import { formatUnknownError } from '../../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; interface IStaleDialogProps { open: boolean; diff --git a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsMetadata/FeatureSettingsMetadata.tsx b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsMetadata/FeatureSettingsMetadata.tsx index a43cf9036c..4041300fad 100644 --- a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsMetadata/FeatureSettingsMetadata.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsMetadata/FeatureSettingsMetadata.tsx @@ -11,7 +11,7 @@ import { IFeatureViewParams } from '../../../../../interfaces/params'; import useToast from '../../../../../hooks/useToast'; import useFeatureApi from '../../../../../hooks/api/actions/useFeatureApi/useFeatureApi'; import ConditionallyRender from '../../../../common/ConditionallyRender'; -import { formatUnknownError } from '../../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const FeatureSettingsMetadata = () => { const { hasAccess } = useContext(AccessContext); diff --git a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx index de55215e2c..8c51566aba 100644 --- a/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureSettings/FeatureSettingsProject/FeatureSettingsProject.tsx @@ -12,7 +12,7 @@ import FeatureProjectSelect from './FeatureProjectSelect/FeatureProjectSelect'; import FeatureSettingsProjectConfirm from './FeatureSettingsProjectConfirm/FeatureSettingsProjectConfirm'; import { IPermission } from '../../../../../interfaces/user'; import { useAuthPermissions } from '../../../../../hooks/api/getters/useAuth/useAuthPermissions'; -import { formatUnknownError } from '../../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const FeatureSettingsProject = () => { const { hasAccess } = useContext(AccessContext); diff --git a/frontend/src/component/feature/FeatureView/FeatureType/FeatureType.tsx b/frontend/src/component/feature/FeatureView/FeatureType/FeatureType.tsx index 9a4eedcf1b..c5d632591e 100644 --- a/frontend/src/component/feature/FeatureView/FeatureType/FeatureType.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureType/FeatureType.tsx @@ -1,6 +1,6 @@ import { useStyles } from './FeatureType.styles'; import { Tooltip } from '@material-ui/core'; -import { getFeatureTypeIcons } from '../../../../utils/get-feature-type-icons'; +import { getFeatureTypeIcons } from 'utils/getFeatureTypeIcons'; import useFeatureTypes from '../../../../hooks/api/getters/useFeatureTypes/useFeatureTypes'; interface FeatureTypeProps { diff --git a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/AddFeatureVariant/AddFeatureVariant.tsx b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/AddFeatureVariant/AddFeatureVariant.tsx index 9683f64f91..79e30e70b8 100644 --- a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/AddFeatureVariant/AddFeatureVariant.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/AddFeatureVariant/AddFeatureVariant.tsx @@ -24,7 +24,7 @@ import cloneDeep from 'lodash.clonedeep'; import GeneralSelect from 'component/common/GeneralSelect/GeneralSelect'; import { useStyles } from './AddFeatureVariant.styles'; import Input from 'component/common/Input/Input'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const payloadOptions = [ { key: 'string', label: 'string' }, diff --git a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/AddFeatureVariant/OverrideConfig/OverrideConfig.jsx b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/AddFeatureVariant/OverrideConfig/OverrideConfig.jsx index 87e2bc8475..b5f752cdba 100644 --- a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/AddFeatureVariant/OverrideConfig/OverrideConfig.jsx +++ b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/AddFeatureVariant/OverrideConfig/OverrideConfig.jsx @@ -7,7 +7,7 @@ import { Autocomplete } from '@material-ui/lab'; import GeneralSelect from '../../../../../../common/GeneralSelect/GeneralSelect'; import { useCommonStyles } from '../../../../../../../common.styles'; import ConditionallyRender from '../../../../../../common/ConditionallyRender'; -import InputListField from '../../../../../../common/input-list-field.jsx'; +import InputListField from '../../../../../../common/InputListField.jsx'; import useUnleashContext from '../../../../../../../hooks/api/getters/useUnleashContext/useUnleashContext'; export const OverrideConfig = ({ diff --git a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsList.tsx b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsList.tsx index 21f528f5bd..3f4493528f 100644 --- a/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsList.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureVariants/FeatureVariantsList/FeatureVariantsList.tsx @@ -29,7 +29,7 @@ import { updateWeight } from '../../../../common/util'; import cloneDeep from 'lodash.clonedeep'; import useDeleteVariantMarkup from './FeatureVariantsListItem/useDeleteVariantMarkup'; import PermissionButton from '../../../../common/PermissionButton/PermissionButton'; -import { formatUnknownError } from '../../../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const FeatureOverviewVariants = () => { const { hasAccess } = useContext(AccessContext); diff --git a/frontend/src/component/feature/FeatureView/FeatureView.tsx b/frontend/src/component/feature/FeatureView/FeatureView.tsx index 67e730d645..9cf263e4f9 100644 --- a/frontend/src/component/feature/FeatureView/FeatureView.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureView.tsx @@ -26,7 +26,7 @@ import ConditionallyRender from '../../common/ConditionallyRender'; import StaleDialog from './FeatureOverview/StaleDialog/StaleDialog'; import AddTagDialog from './FeatureOverview/AddTagDialog/AddTagDialog'; import StatusChip from '../../common/StatusChip/StatusChip'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import { FeatureNotFound } from 'component/feature/FeatureView/FeatureNotFound/FeatureNotFound'; export const FeatureView = () => { diff --git a/frontend/src/component/feature/RedirectFeatureView/RedirectFeatureView.tsx b/frontend/src/component/feature/RedirectFeatureView/RedirectFeatureView.tsx index f6cae72203..b8c786e00a 100644 --- a/frontend/src/component/feature/RedirectFeatureView/RedirectFeatureView.tsx +++ b/frontend/src/component/feature/RedirectFeatureView/RedirectFeatureView.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'; import { Redirect, useParams } from 'react-router-dom'; import { useFeatures } from '../../../hooks/api/getters/useFeatures/useFeatures'; import { IFeatureToggle } from '../../../interfaces/featureToggle'; -import { getTogglePath } from '../../../utils/route-path-helpers'; +import { getTogglePath } from 'utils/routePathHelpers'; interface IRedirectParams { name: string; diff --git a/frontend/src/component/feature/StrategyConstraints/StrategyConstraintInputField/StrategyConstraintInputField.jsx b/frontend/src/component/feature/StrategyConstraints/StrategyConstraintInputField/StrategyConstraintInputField.jsx index 5de533d19a..7ee554755d 100644 --- a/frontend/src/component/feature/StrategyConstraints/StrategyConstraintInputField/StrategyConstraintInputField.jsx +++ b/frontend/src/component/feature/StrategyConstraints/StrategyConstraintInputField/StrategyConstraintInputField.jsx @@ -4,7 +4,7 @@ import { IconButton, TextField } from '@material-ui/core'; import { Autocomplete } from '@material-ui/lab'; import { Delete } from '@material-ui/icons'; -import InputListField from '../../../common/input-list-field'; +import InputListField from '../../../common/InputListField'; import ConditionallyRender from '../../../common/ConditionallyRender/ConditionallyRender'; import { useCommonStyles } from '../../../../common.styles'; import { useStyles } from './StrategyConstraintInputField.styles'; diff --git a/frontend/src/component/history/EventLog/EventLog.jsx b/frontend/src/component/history/EventLog/EventLog.jsx index 79189697d4..ea22aa9d43 100644 --- a/frontend/src/component/history/EventLog/EventLog.jsx +++ b/frontend/src/component/history/EventLog/EventLog.jsx @@ -5,7 +5,7 @@ import PageContent from '../../common/PageContent/PageContent'; import HeaderTitle from '../../common/HeaderTitle'; import EventCard from './EventCard/EventCard'; import { useStyles } from './EventLog.styles.js'; -import { formatDateYMDHMS } from '../../../utils/format-date'; +import { formatDateYMDHMS } from '../../../utils/formatDate'; const EventLog = ({ title, diff --git a/frontend/src/component/menu/Header/Header.tsx b/frontend/src/component/menu/Header/Header.tsx index 7e53dfca08..e169ffa229 100644 --- a/frontend/src/component/menu/Header/Header.tsx +++ b/frontend/src/component/menu/Header/Header.tsx @@ -9,7 +9,7 @@ import SettingsIcon from '@material-ui/icons/Settings'; import UserProfile from '../../user/UserProfile'; import ConditionallyRender from '../../common/ConditionallyRender/ConditionallyRender'; import MenuBookIcon from '@material-ui/icons/MenuBook'; -import { ReactComponent as UnleashLogo } from '../../../assets/img/logo-dark-with-text.svg'; +import { ReactComponent as UnleashLogo } from 'assets/img/logoDarkWithText.svg'; import { useStyles } from './Header.styles'; import useUiConfig from '../../../hooks/api/getters/useUiConfig/useUiConfig'; diff --git a/frontend/src/component/menu/__tests__/__snapshots__/apidetails.test.tsx.snap b/frontend/src/component/menu/__tests__/__snapshots__/apiDetails.test.tsx.snap similarity index 100% rename from frontend/src/component/menu/__tests__/__snapshots__/apidetails.test.tsx.snap rename to frontend/src/component/menu/__tests__/__snapshots__/apiDetails.test.tsx.snap diff --git a/frontend/src/component/menu/__tests__/__snapshots__/breadcrumb-test.jsx.snap b/frontend/src/component/menu/__tests__/__snapshots__/breadcrumbTest.jsx.snap similarity index 100% rename from frontend/src/component/menu/__tests__/__snapshots__/breadcrumb-test.jsx.snap rename to frontend/src/component/menu/__tests__/__snapshots__/breadcrumbTest.jsx.snap diff --git a/frontend/src/component/menu/__tests__/__snapshots__/footer-test.jsx.snap b/frontend/src/component/menu/__tests__/__snapshots__/footerTest.jsx.snap similarity index 100% rename from frontend/src/component/menu/__tests__/__snapshots__/footer-test.jsx.snap rename to frontend/src/component/menu/__tests__/__snapshots__/footerTest.jsx.snap diff --git a/frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap b/frontend/src/component/menu/__tests__/__snapshots__/routesTest.jsx.snap similarity index 100% rename from frontend/src/component/menu/__tests__/__snapshots__/routes-test.jsx.snap rename to frontend/src/component/menu/__tests__/__snapshots__/routesTest.jsx.snap diff --git a/frontend/src/component/menu/__tests__/apidetails.test.tsx b/frontend/src/component/menu/__tests__/apiDetails.test.tsx similarity index 100% rename from frontend/src/component/menu/__tests__/apidetails.test.tsx rename to frontend/src/component/menu/__tests__/apiDetails.test.tsx diff --git a/frontend/src/component/menu/__tests__/breadcrumb-test.jsx b/frontend/src/component/menu/__tests__/breadcrumbTest.jsx similarity index 100% rename from frontend/src/component/menu/__tests__/breadcrumb-test.jsx rename to frontend/src/component/menu/__tests__/breadcrumbTest.jsx diff --git a/frontend/src/component/menu/__tests__/footer-test.jsx b/frontend/src/component/menu/__tests__/footerTest.jsx similarity index 94% rename from frontend/src/component/menu/__tests__/footer-test.jsx rename to frontend/src/component/menu/__tests__/footerTest.jsx index fc378b2821..5e359a6b9b 100644 --- a/frontend/src/component/menu/__tests__/footer-test.jsx +++ b/frontend/src/component/menu/__tests__/footerTest.jsx @@ -4,7 +4,7 @@ import { MemoryRouter } from 'react-router-dom'; import { ThemeProvider } from '@material-ui/core'; import Footer from '../Footer/Footer'; -import theme from '../../../themes/main-theme'; +import theme from '../../../themes/mainTheme'; test('should render DrawerMenu', () => { const tree = renderer.create( diff --git a/frontend/src/component/menu/__tests__/routes-test.jsx b/frontend/src/component/menu/__tests__/routesTest.jsx similarity index 100% rename from frontend/src/component/menu/__tests__/routes-test.jsx rename to frontend/src/component/menu/__tests__/routesTest.jsx diff --git a/frontend/src/component/menu/drawer.jsx b/frontend/src/component/menu/drawer.jsx index 81d6e4bb7b..74baa83a12 100644 --- a/frontend/src/component/menu/drawer.jsx +++ b/frontend/src/component/menu/drawer.jsx @@ -7,10 +7,10 @@ import ExitToApp from '@material-ui/icons/ExitToApp'; import styles from './drawer.module.scss'; -import { ReactComponent as LogoIcon } from '../../assets/icons/logo_wbg.svg'; +import { ReactComponent as LogoIcon } from '../../assets/icons/logoBg.svg'; import NavigationLink from './Header/NavigationLink/NavigationLink'; import ConditionallyRender from '../common/ConditionallyRender'; -import { getBasePath } from '../../utils/format-path'; +import { getBasePath } from '../../utils/formatPath'; export const DrawerMenu = ({ links = [], diff --git a/frontend/src/component/menu/routes.js b/frontend/src/component/menu/routes.js index a3406f36c1..eb6d13d55f 100644 --- a/frontend/src/component/menu/routes.js +++ b/frontend/src/component/menu/routes.js @@ -19,12 +19,12 @@ import Project from '../project/Project/Project'; import RedirectArchive from '../archive/RedirectArchive'; import EnvironmentList from '../environments/EnvironmentList/EnvironmentList'; import { FeatureView } from '../feature/FeatureView/FeatureView'; -import ProjectRoles from '../admin/project-roles/ProjectRoles/ProjectRoles'; -import CreateProjectRole from '../admin/project-roles/CreateProjectRole/CreateProjectRole'; -import EditProjectRole from '../admin/project-roles/EditProjectRole/EditProjectRole'; +import ProjectRoles from '../admin/projectRoles/ProjectRoles/ProjectRoles'; +import CreateProjectRole from '../admin/projectRoles/CreateProjectRole/CreateProjectRole'; +import EditProjectRole from '../admin/projectRoles/EditProjectRole/EditProjectRole'; import CreateUser from '../admin/users/CreateUser/CreateUser'; import EditUser from '../admin/users/EditUser/EditUser'; -import { CreateApiToken } from '../admin/api-token/CreateApiToken/CreateApiToken'; +import { CreateApiToken } from '../admin/apiToken/CreateApiToken/CreateApiToken'; import CreateEnvironment from '../environments/CreateEnvironment/CreateEnvironment'; import EditEnvironment from '../environments/EditEnvironment/EditEnvironment'; import { CreateContext } from '../context/CreateContext/CreateContext'; diff --git a/frontend/src/component/project/Project/CreateProject/CreateProject.tsx b/frontend/src/component/project/Project/CreateProject/CreateProject.tsx index b815f8dcc3..cd1b9978cd 100644 --- a/frontend/src/component/project/Project/CreateProject/CreateProject.tsx +++ b/frontend/src/component/project/Project/CreateProject/CreateProject.tsx @@ -8,7 +8,7 @@ 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'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const CreateProject = () => { const { setToastData, setToastApiError } = useToast(); diff --git a/frontend/src/component/project/Project/EditProject/EditProject.tsx b/frontend/src/component/project/Project/EditProject/EditProject.tsx index 822ae91627..d5e74b3c6f 100644 --- a/frontend/src/component/project/Project/EditProject/EditProject.tsx +++ b/frontend/src/component/project/Project/EditProject/EditProject.tsx @@ -8,7 +8,7 @@ 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'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const EditProject = () => { const { uiConfig } = useUiConfig(); diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx index 31e1029a13..5bc6622865 100644 --- a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx +++ b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx @@ -13,7 +13,7 @@ import PageContent from 'component/common/PageContent'; import ResponsiveButton from 'component/common/ResponsiveButton/ResponsiveButton'; import FeatureToggleListNew from 'component/feature/FeatureToggleListNew/FeatureToggleListNew'; import { IFeatureToggleListItem } from 'interfaces/featureToggle'; -import { getCreateTogglePath } from 'utils/route-path-helpers'; +import { getCreateTogglePath } from 'utils/routePathHelpers'; import { useStyles } from './ProjectFeatureToggles.styles'; import { CREATE_FEATURE } from 'component/providers/AccessProvider/permissions'; import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig'; diff --git a/frontend/src/component/project/ProjectCard/ProjectCard.tsx b/frontend/src/component/project/ProjectCard/ProjectCard.tsx index ed625a0277..8c677bbda1 100644 --- a/frontend/src/component/project/ProjectCard/ProjectCard.tsx +++ b/frontend/src/component/project/ProjectCard/ProjectCard.tsx @@ -8,11 +8,11 @@ import Dialogue from 'component/common/Dialogue'; import useProjectApi from 'hooks/api/actions/useProjectApi/useProjectApi'; import useProjects from 'hooks/api/getters/useProjects/useProjects'; import { Delete, Edit } from '@material-ui/icons'; -import { getProjectEditPath } from 'utils/route-path-helpers'; +import { getProjectEditPath } from 'utils/routePathHelpers'; import PermissionIconButton from 'component/common/PermissionIconButton/PermissionIconButton'; import useToast from 'hooks/useToast'; import { UPDATE_PROJECT } from 'component/providers/AccessProvider/permissions'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; interface IProjectCardProps { name: string; diff --git a/frontend/src/component/providers/SWRProvider/SWRProvider.tsx b/frontend/src/component/providers/SWRProvider/SWRProvider.tsx index f7fb820a17..ffb5b85c79 100644 --- a/frontend/src/component/providers/SWRProvider/SWRProvider.tsx +++ b/frontend/src/component/providers/SWRProvider/SWRProvider.tsx @@ -1,7 +1,7 @@ import { mutate, SWRConfig, useSWRConfig } from 'swr'; import { useHistory } from 'react-router'; import useToast from '../../../hooks/useToast'; -import { formatApiPath } from '../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import React from 'react'; import { USER_ENDPOINT_PATH } from '../../../hooks/api/getters/useAuth/useAuthEndpoint'; diff --git a/frontend/src/component/scroll-to-top.jsx b/frontend/src/component/scrollToTop.jsx similarity index 100% rename from frontend/src/component/scroll-to-top.jsx rename to frontend/src/component/scrollToTop.jsx diff --git a/frontend/src/component/segments/SegmentList/SegmentList.tsx b/frontend/src/component/segments/SegmentList/SegmentList.tsx index 5a67dab74a..32cd92f9ef 100644 --- a/frontend/src/component/segments/SegmentList/SegmentList.tsx +++ b/frontend/src/component/segments/SegmentList/SegmentList.tsx @@ -21,7 +21,7 @@ import { useSegments } from 'hooks/api/getters/useSegments/useSegments'; import { SegmentDeleteConfirm } from '../SegmentDeleteConfirm/SegmentDeleteConfirm'; import { useSegmentsApi } from 'hooks/api/actions/useSegmentsApi/useSegmentsApi'; import useToast from 'hooks/useToast'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import { Link, useHistory } from 'react-router-dom'; import ConditionallyRender from 'component/common/ConditionallyRender'; import HeaderTitle from 'component/common/HeaderTitle'; diff --git a/frontend/src/component/splash/SplashPageEnvironments/SplashPageEnvironments.tsx b/frontend/src/component/splash/SplashPageEnvironments/SplashPageEnvironments.tsx index 5bb5ae304e..552cbdaff3 100644 --- a/frontend/src/component/splash/SplashPageEnvironments/SplashPageEnvironments.tsx +++ b/frontend/src/component/splash/SplashPageEnvironments/SplashPageEnvironments.tsx @@ -2,8 +2,8 @@ import { SplashPageEnvironmentsContent } from 'component/splash/SplashPageEnviro import { SplashPageEnvironmentsContainer } from 'component/splash/SplashPageEnvironments/SplashPageEnvironmentsContainer/SplashPageEnvironmentsContainer'; import { VpnKey, CloudCircle } from '@material-ui/icons'; import { useStyles } from 'component/splash/SplashPageEnvironments/SplashPageEnvironments.styles'; -import { ReactComponent as Logo1 } from 'assets/img/splash_env1.svg'; -import { ReactComponent as Logo2 } from 'assets/img/splash_env2.svg'; +import { ReactComponent as Logo1 } from 'assets/img/splashEnv1.svg'; +import { ReactComponent as Logo2 } from 'assets/img/splashEnv2.svg'; import { useHistory } from 'react-router-dom'; export const SplashPageEnvironments = () => { diff --git a/frontend/src/component/strategies/CreateStrategy/CreateStrategy.tsx b/frontend/src/component/strategies/CreateStrategy/CreateStrategy.tsx index cd6d67404d..328089ae3f 100644 --- a/frontend/src/component/strategies/CreateStrategy/CreateStrategy.tsx +++ b/frontend/src/component/strategies/CreateStrategy/CreateStrategy.tsx @@ -7,7 +7,7 @@ import { StrategyForm } from '../StrategyForm/StrategyForm'; import { CREATE_STRATEGY } from 'component/providers/AccessProvider/permissions'; import useStrategiesApi from 'hooks/api/actions/useStrategiesApi/useStrategiesApi'; import { useStrategies } from 'hooks/api/getters/useStrategies/useStrategies'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import { CreateButton } from 'component/common/CreateButton/CreateButton'; export const CreateStrategy = () => { diff --git a/frontend/src/component/strategies/EditStrategy/EditStrategy.tsx b/frontend/src/component/strategies/EditStrategy/EditStrategy.tsx index e2b998b911..0017a16fa4 100644 --- a/frontend/src/component/strategies/EditStrategy/EditStrategy.tsx +++ b/frontend/src/component/strategies/EditStrategy/EditStrategy.tsx @@ -7,7 +7,7 @@ import { StrategyForm } from '../StrategyForm/StrategyForm'; import { UPDATE_STRATEGY } from 'component/providers/AccessProvider/permissions'; import useStrategiesApi from 'hooks/api/actions/useStrategiesApi/useStrategiesApi'; import { useStrategies } from 'hooks/api/getters/useStrategies/useStrategies'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import useStrategy from 'hooks/api/getters/useStrategy/useStrategy'; import { UpdateButton } from 'component/common/UpdateButton/UpdateButton'; diff --git a/frontend/src/component/strategies/__tests__/list-component-test.jsx b/frontend/src/component/strategies/StrategiesList/StrategiesList.test.jsx similarity index 94% rename from frontend/src/component/strategies/__tests__/list-component-test.jsx rename to frontend/src/component/strategies/StrategiesList/StrategiesList.test.jsx index 1c5274cc63..c6f5a439d4 100644 --- a/frontend/src/component/strategies/__tests__/list-component-test.jsx +++ b/frontend/src/component/strategies/StrategiesList/StrategiesList.test.jsx @@ -1,8 +1,8 @@ import { MemoryRouter } from 'react-router-dom'; import { ThemeProvider } from '@material-ui/core'; -import { StrategiesList } from '../StrategiesList/StrategiesList'; +import { StrategiesList } from './StrategiesList'; import renderer from 'react-test-renderer'; -import theme from '../../../themes/main-theme'; +import theme from '../../../themes/mainTheme'; import AccessProvider from '../../providers/AccessProvider/AccessProvider'; import { ADMIN } from '../../providers/AccessProvider/permissions'; import UIProvider from '../../providers/UIProvider/UIProvider'; diff --git a/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx b/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx index 21e8920f8c..37aa1cc1b8 100644 --- a/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx +++ b/frontend/src/component/strategies/StrategiesList/StrategiesList.tsx @@ -31,11 +31,11 @@ import Dialogue from 'component/common/Dialogue'; import { ADD_NEW_STRATEGY_ID } from 'testIds'; import PermissionIconButton from 'component/common/PermissionIconButton/PermissionIconButton'; import PermissionButton from 'component/common/PermissionButton/PermissionButton'; -import { formatStrategyName } from 'utils/strategy-names'; +import { formatStrategyName } from 'utils/strategyNames'; import { useStrategies } from 'hooks/api/getters/useStrategies/useStrategies'; import useStrategiesApi from 'hooks/api/actions/useStrategiesApi/useStrategiesApi'; import useToast from 'hooks/useToast'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; import { ICustomStrategy } from 'interfaces/strategy'; interface IDialogueMetaData { diff --git a/frontend/src/component/strategies/__tests__/__snapshots__/list-component-test.jsx.snap b/frontend/src/component/strategies/StrategiesList/__snapshots__/StrategiesList.test.jsx.snap similarity index 100% rename from frontend/src/component/strategies/__tests__/__snapshots__/list-component-test.jsx.snap rename to frontend/src/component/strategies/StrategiesList/__snapshots__/StrategiesList.test.jsx.snap diff --git a/frontend/src/component/strategies/__tests__/strategy-details-component-test.jsx b/frontend/src/component/strategies/StrategyView/StrategyView.test.jsx similarity index 93% rename from frontend/src/component/strategies/__tests__/strategy-details-component-test.jsx rename to frontend/src/component/strategies/StrategyView/StrategyView.test.jsx index e8e8071ca4..63163d82ea 100644 --- a/frontend/src/component/strategies/__tests__/strategy-details-component-test.jsx +++ b/frontend/src/component/strategies/StrategyView/StrategyView.test.jsx @@ -1,9 +1,9 @@ import React from 'react'; import { ThemeProvider } from '@material-ui/core'; -import { StrategyView } from '../StrategyView/StrategyView'; +import { StrategyView } from './StrategyView'; import renderer from 'react-test-renderer'; import { MemoryRouter } from 'react-router-dom'; -import theme from '../../../themes/main-theme'; +import theme from '../../../themes/mainTheme'; import AccessProvider from '../../providers/AccessProvider/AccessProvider'; test('renders correctly with one strategy', () => { diff --git a/frontend/src/component/strategies/__tests__/__snapshots__/strategy-details-component-test.jsx.snap b/frontend/src/component/strategies/StrategyView/__snapshots__/StrategyView.test.jsx.snap similarity index 100% rename from frontend/src/component/strategies/__tests__/__snapshots__/strategy-details-component-test.jsx.snap rename to frontend/src/component/strategies/StrategyView/__snapshots__/StrategyView.test.jsx.snap diff --git a/frontend/src/component/tags/CreateTagType/CreateTagType.tsx b/frontend/src/component/tags/CreateTagType/CreateTagType.tsx index a70af81a1f..e0b39fd705 100644 --- a/frontend/src/component/tags/CreateTagType/CreateTagType.tsx +++ b/frontend/src/component/tags/CreateTagType/CreateTagType.tsx @@ -7,7 +7,7 @@ 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'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const CreateTagType = () => { const { setToastData, setToastApiError } = useToast(); diff --git a/frontend/src/component/tags/EditTagType/EditTagType.tsx b/frontend/src/component/tags/EditTagType/EditTagType.tsx index 0b7d67b397..54343ef2a5 100644 --- a/frontend/src/component/tags/EditTagType/EditTagType.tsx +++ b/frontend/src/component/tags/EditTagType/EditTagType.tsx @@ -8,7 +8,7 @@ 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'; -import { formatUnknownError } from 'utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const EditTagType = () => { const { setToastData, setToastApiError } = useToast(); const { uiConfig } = useUiConfig(); diff --git a/frontend/src/component/tags/TagTypeForm/useTagTypeForm.ts b/frontend/src/component/tags/TagTypeForm/useTagTypeForm.ts index 3fa9b5d671..6140004ecf 100644 --- a/frontend/src/component/tags/TagTypeForm/useTagTypeForm.ts +++ b/frontend/src/component/tags/TagTypeForm/useTagTypeForm.ts @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; import useTagTypesApi from '../../../hooks/api/actions/useTagTypesApi/useTagTypesApi'; -import { formatUnknownError } from '../../../utils/format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; const useTagTypeForm = (initialTagName = '', initialTagDesc = '') => { const [tagName, setTagName] = useState(initialTagName); diff --git a/frontend/src/component/tags/TagTypeList/TagTypeList.jsx b/frontend/src/component/tags/TagTypeList/TagTypeList.jsx index ea0a9844e3..1b6ac7c37f 100644 --- a/frontend/src/component/tags/TagTypeList/TagTypeList.jsx +++ b/frontend/src/component/tags/TagTypeList/TagTypeList.jsx @@ -26,7 +26,7 @@ import useTagTypesApi from '../../../hooks/api/actions/useTagTypesApi/useTagType import useTagTypes from '../../../hooks/api/getters/useTagTypes/useTagTypes'; import useToast from '../../../hooks/useToast'; import PermissionIconButton from '../../common/PermissionIconButton/PermissionIconButton'; -import { formatUnknownError } from '../../../utils/format-unknown-error'; +import { formatUnknownError } from '../../../utils/formatUnknownError'; export const TagTypeList = () => { const { hasAccess } = useContext(AccessContext); diff --git a/frontend/src/component/tags/TagTypeList/__tests__/TagTypeList.test.js b/frontend/src/component/tags/TagTypeList/__tests__/TagTypeList.test.js index a2b713fbb1..00ca1e9f3b 100644 --- a/frontend/src/component/tags/TagTypeList/__tests__/TagTypeList.test.js +++ b/frontend/src/component/tags/TagTypeList/__tests__/TagTypeList.test.js @@ -3,7 +3,7 @@ import { TagTypeList } from '../TagTypeList'; import renderer from 'react-test-renderer'; import { MemoryRouter } from 'react-router-dom'; import { ThemeProvider } from '@material-ui/styles'; -import theme from '../../../../themes/main-theme'; +import theme from '../../../../themes/mainTheme'; import AccessProvider from '../../../providers/AccessProvider/AccessProvider'; import { ADMIN, diff --git a/frontend/src/component/user/Authentication/Authentication.tsx b/frontend/src/component/user/Authentication/Authentication.tsx index 0e72bb345c..fa62b62438 100644 --- a/frontend/src/component/user/Authentication/Authentication.tsx +++ b/frontend/src/component/user/Authentication/Authentication.tsx @@ -1,5 +1,5 @@ import SimpleAuth from '../SimpleAuth/SimpleAuth'; -import AuthenticationCustomComponent from '../authentication-custom-component'; +import AuthenticationCustomComponent from 'component/user/AuthenticationCustomComponent'; import PasswordAuth from '../PasswordAuth/PasswordAuth'; import HostedAuth from '../HostedAuth/HostedAuth'; import DemoAuth from '../DemoAuth/DemoAuth'; diff --git a/frontend/src/component/user/authentication-custom-component.jsx b/frontend/src/component/user/AuthenticationCustomComponent.jsx similarity index 100% rename from frontend/src/component/user/authentication-custom-component.jsx rename to frontend/src/component/user/AuthenticationCustomComponent.jsx diff --git a/frontend/src/component/user/DemoAuth/DemoAuth.jsx b/frontend/src/component/user/DemoAuth/DemoAuth.jsx index ffd4badd1a..4de9d56890 100644 --- a/frontend/src/component/user/DemoAuth/DemoAuth.jsx +++ b/frontend/src/component/user/DemoAuth/DemoAuth.jsx @@ -8,7 +8,7 @@ import { useHistory } from 'react-router-dom'; import { useAuthApi } from '../../../hooks/api/actions/useAuthApi/useAuthApi'; import { useAuthUser } from '../../../hooks/api/getters/useAuth/useAuthUser'; import useToast from '../../../hooks/useToast'; -import { formatUnknownError } from '../../../utils/format-unknown-error'; +import { formatUnknownError } from '../../../utils/formatUnknownError'; const DemoAuth = ({ authDetails, redirect }) => { const [email, setEmail] = useState(''); diff --git a/frontend/src/component/user/ForgottenPassword/ForgottenPassword.tsx b/frontend/src/component/user/ForgottenPassword/ForgottenPassword.tsx index 9249511d1a..a653202312 100644 --- a/frontend/src/component/user/ForgottenPassword/ForgottenPassword.tsx +++ b/frontend/src/component/user/ForgottenPassword/ForgottenPassword.tsx @@ -6,7 +6,7 @@ import { Link } from 'react-router-dom'; import { useCommonStyles } from '../../../common.styles'; import useLoading from '../../../hooks/useLoading'; import { FORGOTTEN_PASSWORD_FIELD } from '../../../testIds'; -import { formatApiPath } from '../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import ConditionallyRender from '../../common/ConditionallyRender'; import DividerText from '../../common/DividerText/DividerText'; import StandaloneLayout from '../common/StandaloneLayout/StandaloneLayout'; diff --git a/frontend/src/component/user/SimpleAuth/SimpleAuth.jsx b/frontend/src/component/user/SimpleAuth/SimpleAuth.jsx index c08835ee7c..a423390137 100644 --- a/frontend/src/component/user/SimpleAuth/SimpleAuth.jsx +++ b/frontend/src/component/user/SimpleAuth/SimpleAuth.jsx @@ -7,7 +7,7 @@ import { useAuthApi } from '../../../hooks/api/actions/useAuthApi/useAuthApi'; import { useAuthUser } from '../../../hooks/api/getters/useAuth/useAuthUser'; import { LOGIN_BUTTON, LOGIN_EMAIL_ID } from '../../../testIds'; import useToast from '../../../hooks/useToast'; -import { formatUnknownError } from '../../../utils/format-unknown-error'; +import { formatUnknownError } from '../../../utils/formatUnknownError'; const SimpleAuth = ({ authDetails, redirect }) => { const [email, setEmail] = useState(''); diff --git a/frontend/src/component/user/StandaloneBanner/StandaloneBanner.tsx b/frontend/src/component/user/StandaloneBanner/StandaloneBanner.tsx index 2fd9c266fc..4f2227c0c5 100644 --- a/frontend/src/component/user/StandaloneBanner/StandaloneBanner.tsx +++ b/frontend/src/component/user/StandaloneBanner/StandaloneBanner.tsx @@ -1,8 +1,8 @@ import { FC } from 'react'; import { Typography, useTheme, useMediaQuery } from '@material-ui/core'; import Gradient from '../../common/Gradient/Gradient'; -import { ReactComponent as Logo } from '../../../assets/icons/logo-white-bg.svg'; -import { ReactComponent as LogoWithText } from '../../../assets/img/Logo_White_Transparent_Horizontal.svg'; +import { ReactComponent as Logo } from 'assets/icons/logoWhiteBg.svg'; +import { ReactComponent as LogoWithText } from 'assets/img/logoWhiteTransparentHorizontal.svg'; import { useStyles } from './StandaloneBanner.styles'; import ConditionallyRender from '../../common/ConditionallyRender'; diff --git a/frontend/src/component/user/UserProfile/EditProfile/EditProfile.tsx b/frontend/src/component/user/UserProfile/EditProfile/EditProfile.tsx index fd0b52c337..0c5a66d332 100644 --- a/frontend/src/component/user/UserProfile/EditProfile/EditProfile.tsx +++ b/frontend/src/component/user/UserProfile/EditProfile/EditProfile.tsx @@ -14,9 +14,9 @@ import { OK, UNAUTHORIZED, } from '../../../../constants/statusCodes'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import PasswordField from '../../../common/PasswordField/PasswordField'; -import { headers } from '../../../../utils/api-utils'; +import { headers } from 'utils/apiUtils'; interface IEditProfileProps { setEditingProfile: React.Dispatch>; diff --git a/frontend/src/component/user/UserProfile/UserProfileContent/UserProfileContent.tsx b/frontend/src/component/user/UserProfile/UserProfileContent/UserProfileContent.tsx index e7708962c8..4afdbc0f19 100644 --- a/frontend/src/component/user/UserProfile/UserProfileContent/UserProfileContent.tsx +++ b/frontend/src/component/user/UserProfile/UserProfileContent/UserProfileContent.tsx @@ -15,7 +15,7 @@ import { useCommonStyles } from '../../../../common.styles'; import { Alert } from '@material-ui/lab'; import EditProfile from '../EditProfile/EditProfile'; import legacyStyles from '../../user.module.scss'; -import { getBasePath } from '../../../../utils/format-path'; +import { getBasePath } from 'utils/formatPath'; import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig'; import { IUser } from '../../../../interfaces/user'; import { ILocationSettings } from '../../../../hooks/useLocationSettings'; diff --git a/frontend/src/component/user/common/ResetPasswordForm/PasswordChecker/PasswordChecker.tsx b/frontend/src/component/user/common/ResetPasswordForm/PasswordChecker/PasswordChecker.tsx index 3b34b56ad9..5f69393d89 100644 --- a/frontend/src/component/user/common/ResetPasswordForm/PasswordChecker/PasswordChecker.tsx +++ b/frontend/src/component/user/common/ResetPasswordForm/PasswordChecker/PasswordChecker.tsx @@ -5,7 +5,7 @@ import { BAD_REQUEST, OK } from '../../../../../constants/statusCodes'; import { useStyles } from './PasswordChecker.styles'; import HelpIcon from '@material-ui/icons/Help'; import { useCallback } from 'react'; -import { formatApiPath } from '../../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { Alert } from '@material-ui/lab'; import ConditionallyRender from '../../../../common/ConditionallyRender'; diff --git a/frontend/src/component/user/common/ResetPasswordForm/ResetPasswordForm.tsx b/frontend/src/component/user/common/ResetPasswordForm/ResetPasswordForm.tsx index c08c8e984b..61a6a0dad8 100644 --- a/frontend/src/component/user/common/ResetPasswordForm/ResetPasswordForm.tsx +++ b/frontend/src/component/user/common/ResetPasswordForm/ResetPasswordForm.tsx @@ -16,7 +16,7 @@ import ResetPasswordError from '../ResetPasswordError/ResetPasswordError'; import PasswordChecker from './PasswordChecker/PasswordChecker'; import PasswordMatcher from './PasswordMatcher/PasswordMatcher'; import { useStyles } from './ResetPasswordForm.styles'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import PasswordField from '../../../common/PasswordField/PasswordField'; interface IResetPasswordProps { diff --git a/frontend/src/hooks/api/actions/useAdminUsersApi/errorHandlers.ts b/frontend/src/hooks/api/actions/useAdminUsersApi/errorHandlers.ts index 4f51e2d289..610b334993 100644 --- a/frontend/src/hooks/api/actions/useAdminUsersApi/errorHandlers.ts +++ b/frontend/src/hooks/api/actions/useAdminUsersApi/errorHandlers.ts @@ -4,7 +4,7 @@ import { AuthenticationError, ForbiddenError, NotFoundError, -} from '../../../../utils/api-utils'; +} from 'utils/apiUtils'; export const handleBadRequest = async ( setErrors: Dispatch>, diff --git a/frontend/src/hooks/api/actions/useApi/useApi.ts b/frontend/src/hooks/api/actions/useApi/useApi.ts index 8360e4fcb2..2453aa3134 100644 --- a/frontend/src/hooks/api/actions/useApi/useApi.ts +++ b/frontend/src/hooks/api/actions/useApi/useApi.ts @@ -12,8 +12,8 @@ import { ForbiddenError, headers, NotFoundError, -} from '../../../../utils/api-utils'; -import { formatApiPath } from '../../../../utils/format-path'; +} from 'utils/apiUtils'; +import { formatApiPath } from 'utils/formatPath'; type ApiErrorHandler = ( setErrors: Dispatch>, diff --git a/frontend/src/hooks/api/actions/useAuthApi/useAuthApi.tsx b/frontend/src/hooks/api/actions/useAuthApi/useAuthApi.tsx index 544b055b31..7ecc6fc59c 100644 --- a/frontend/src/hooks/api/actions/useAuthApi/useAuthApi.tsx +++ b/frontend/src/hooks/api/actions/useAuthApi/useAuthApi.tsx @@ -1,4 +1,4 @@ -import { headers } from '../../../../utils/api-utils'; +import { headers } from 'utils/apiUtils'; import useAPI from '../useApi/useApi'; type PasswordLogin = ( diff --git a/frontend/src/hooks/api/getters/useAddons/useAddons.ts b/frontend/src/hooks/api/getters/useAddons/useAddons.ts index 24c29c22aa..619794e004 100644 --- a/frontend/src/hooks/api/getters/useAddons/useAddons.ts +++ b/frontend/src/hooks/api/getters/useAddons/useAddons.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; const useAddons = (options: SWRConfiguration = {}) => { diff --git a/frontend/src/hooks/api/getters/useApiTokens/useApiTokens.ts b/frontend/src/hooks/api/getters/useApiTokens/useApiTokens.ts index a434533d37..3cd5fbc5a3 100644 --- a/frontend/src/hooks/api/getters/useApiTokens/useApiTokens.ts +++ b/frontend/src/hooks/api/getters/useApiTokens/useApiTokens.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; const useApiTokens = (options: SWRConfiguration = {}) => { diff --git a/frontend/src/hooks/api/getters/useApplication/useApplication.ts b/frontend/src/hooks/api/getters/useApplication/useApplication.ts index 7453b35a0d..d969d29d52 100644 --- a/frontend/src/hooks/api/getters/useApplication/useApplication.ts +++ b/frontend/src/hooks/api/getters/useApplication/useApplication.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { IApplication } from '../../../../interfaces/application'; diff --git a/frontend/src/hooks/api/getters/useApplications/useApplications.ts b/frontend/src/hooks/api/getters/useApplications/useApplications.ts index 8be4aae85e..897487a76d 100644 --- a/frontend/src/hooks/api/getters/useApplications/useApplications.ts +++ b/frontend/src/hooks/api/getters/useApplications/useApplications.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { IApplication } from '../../../../interfaces/application'; diff --git a/frontend/src/hooks/api/getters/useAuth/useAuthEndpoint.ts b/frontend/src/hooks/api/getters/useAuth/useAuthEndpoint.ts index 37eeb86932..70bd32862c 100644 --- a/frontend/src/hooks/api/getters/useAuth/useAuthEndpoint.ts +++ b/frontend/src/hooks/api/getters/useAuth/useAuthEndpoint.ts @@ -1,6 +1,6 @@ import useSWR, { mutate } from 'swr'; import { useCallback } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { IPermission, IUser } from '../../../../interfaces/user'; // The auth endpoint returns different things depending on the auth status. diff --git a/frontend/src/hooks/api/getters/useAuthSettings/useAuthSettings.ts b/frontend/src/hooks/api/getters/useAuthSettings/useAuthSettings.ts index 49adf03b4c..685d5d0c44 100644 --- a/frontend/src/hooks/api/getters/useAuthSettings/useAuthSettings.ts +++ b/frontend/src/hooks/api/getters/useAuthSettings/useAuthSettings.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; const useAuthSettings = (id: string, options: SWRConfiguration = {}) => { diff --git a/frontend/src/hooks/api/getters/useContext/useContext.ts b/frontend/src/hooks/api/getters/useContext/useContext.ts index fd178cd524..a80e2d9805 100644 --- a/frontend/src/hooks/api/getters/useContext/useContext.ts +++ b/frontend/src/hooks/api/getters/useContext/useContext.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; const useContext = (name: string, options: SWRConfiguration = {}) => { diff --git a/frontend/src/hooks/api/getters/useEnvironment/useEnvironment.ts b/frontend/src/hooks/api/getters/useEnvironment/useEnvironment.ts index 9a81fa38df..9160098cd6 100644 --- a/frontend/src/hooks/api/getters/useEnvironment/useEnvironment.ts +++ b/frontend/src/hooks/api/getters/useEnvironment/useEnvironment.ts @@ -1,7 +1,7 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { IEnvironment } from '../../../../interfaces/environments'; import handleErrorResponses from '../httpErrorResponseHandler'; import { defaultEnvironment } from './defaultEnvironment'; diff --git a/frontend/src/hooks/api/getters/useEnvironments/useEnvironments.ts b/frontend/src/hooks/api/getters/useEnvironments/useEnvironments.ts index ca6c296bb3..a49fa6aeac 100644 --- a/frontend/src/hooks/api/getters/useEnvironments/useEnvironments.ts +++ b/frontend/src/hooks/api/getters/useEnvironments/useEnvironments.ts @@ -1,7 +1,7 @@ import useSWR, { mutate } from 'swr'; import { useCallback, useMemo } from 'react'; import { IEnvironmentResponse } from 'interfaces/environments'; -import { formatApiPath } from 'utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; const PATH = formatApiPath(`api/admin/environments`); diff --git a/frontend/src/hooks/api/getters/useEvents/useEvents.ts b/frontend/src/hooks/api/getters/useEvents/useEvents.ts index 7c64b21271..d23c92a890 100644 --- a/frontend/src/hooks/api/getters/useEvents/useEvents.ts +++ b/frontend/src/hooks/api/getters/useEvents/useEvents.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useCallback } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { IEvent } from '../../../../interfaces/event'; diff --git a/frontend/src/hooks/api/getters/useFeature/useFeature.ts b/frontend/src/hooks/api/getters/useFeature/useFeature.ts index 37aa26fd9d..ef23eacce5 100644 --- a/frontend/src/hooks/api/getters/useFeature/useFeature.ts +++ b/frontend/src/hooks/api/getters/useFeature/useFeature.ts @@ -2,7 +2,7 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useCallback } from 'react'; import { emptyFeature } from './emptyFeature'; import handleErrorResponses from '../httpErrorResponseHandler'; -import { formatApiPath } from 'utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { IFeatureToggle } from 'interfaces/featureToggle'; interface IUseFeatureOutput { diff --git a/frontend/src/hooks/api/getters/useFeatureEvents/useFeatureEvents.ts b/frontend/src/hooks/api/getters/useFeatureEvents/useFeatureEvents.ts index 3aa76433ec..a5fe63c861 100644 --- a/frontend/src/hooks/api/getters/useFeatureEvents/useFeatureEvents.ts +++ b/frontend/src/hooks/api/getters/useFeatureEvents/useFeatureEvents.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useCallback } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { IEvent } from '../../../../interfaces/event'; diff --git a/frontend/src/hooks/api/getters/useFeatureMetrics/useFeatureMetrics.ts b/frontend/src/hooks/api/getters/useFeatureMetrics/useFeatureMetrics.ts index 252016e8ba..2eeb101b2e 100644 --- a/frontend/src/hooks/api/getters/useFeatureMetrics/useFeatureMetrics.ts +++ b/frontend/src/hooks/api/getters/useFeatureMetrics/useFeatureMetrics.ts @@ -1,4 +1,4 @@ -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { useEffect, useState } from 'react'; import useSWR, { mutate, SWRConfiguration } from 'swr'; import { IFeatureMetrics } from '../../../../interfaces/featureToggle'; diff --git a/frontend/src/hooks/api/getters/useFeatureMetricsRaw/useFeatureMetricsRaw.ts b/frontend/src/hooks/api/getters/useFeatureMetricsRaw/useFeatureMetricsRaw.ts index c668bef460..347b86879c 100644 --- a/frontend/src/hooks/api/getters/useFeatureMetricsRaw/useFeatureMetricsRaw.ts +++ b/frontend/src/hooks/api/getters/useFeatureMetricsRaw/useFeatureMetricsRaw.ts @@ -1,6 +1,6 @@ import useSWR, { mutate } from 'swr'; import { useCallback } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { IFeatureMetricsRaw } from '../../../../interfaces/featureToggle'; diff --git a/frontend/src/hooks/api/getters/useFeatureTypes/useFeatureTypes.ts b/frontend/src/hooks/api/getters/useFeatureTypes/useFeatureTypes.ts index 5b4595fa17..5b96627113 100644 --- a/frontend/src/hooks/api/getters/useFeatureTypes/useFeatureTypes.ts +++ b/frontend/src/hooks/api/getters/useFeatureTypes/useFeatureTypes.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { IFeatureType } from '../../../../interfaces/featureTypes'; import handleErrorResponses from '../httpErrorResponseHandler'; diff --git a/frontend/src/hooks/api/getters/useFeatures/useFeatures.ts b/frontend/src/hooks/api/getters/useFeatures/useFeatures.ts index 532a31e84d..06f008b6e4 100644 --- a/frontend/src/hooks/api/getters/useFeatures/useFeatures.ts +++ b/frontend/src/hooks/api/getters/useFeatures/useFeatures.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useCallback } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { IFeatureToggle } from '../../../../interfaces/featureToggle'; diff --git a/frontend/src/hooks/api/getters/useFeaturesArchive/useFeaturesArchive.ts b/frontend/src/hooks/api/getters/useFeaturesArchive/useFeaturesArchive.ts index 7645813380..3a06811063 100644 --- a/frontend/src/hooks/api/getters/useFeaturesArchive/useFeaturesArchive.ts +++ b/frontend/src/hooks/api/getters/useFeaturesArchive/useFeaturesArchive.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useCallback } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { IFeatureToggle } from '../../../../interfaces/featureToggle'; diff --git a/frontend/src/hooks/api/getters/useHealthReport/useHealthReport.ts b/frontend/src/hooks/api/getters/useHealthReport/useHealthReport.ts index 75c5229bbb..651cf46953 100644 --- a/frontend/src/hooks/api/getters/useHealthReport/useHealthReport.ts +++ b/frontend/src/hooks/api/getters/useHealthReport/useHealthReport.ts @@ -1,7 +1,7 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useCallback } from 'react'; import { IProjectHealthReport } from '../../../../interfaces/project'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; interface IUseHealthReportOutput { diff --git a/frontend/src/hooks/api/getters/useInvoices/useInvoices.ts b/frontend/src/hooks/api/getters/useInvoices/useInvoices.ts index 4f12c5a850..aae91e7d1a 100644 --- a/frontend/src/hooks/api/getters/useInvoices/useInvoices.ts +++ b/frontend/src/hooks/api/getters/useInvoices/useInvoices.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; const KEY = `api/admin/invoices`; diff --git a/frontend/src/hooks/api/getters/useProject/getProjectFetcher.ts b/frontend/src/hooks/api/getters/useProject/getProjectFetcher.ts index 77809ca45f..13395ef1e8 100644 --- a/frontend/src/hooks/api/getters/useProject/getProjectFetcher.ts +++ b/frontend/src/hooks/api/getters/useProject/getProjectFetcher.ts @@ -1,4 +1,4 @@ -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; export const getProjectFetcher = (id: string) => { diff --git a/frontend/src/hooks/api/getters/useProjectAccess/useProjectAccess.ts b/frontend/src/hooks/api/getters/useProjectAccess/useProjectAccess.ts index ae62667811..d8e59ad05b 100644 --- a/frontend/src/hooks/api/getters/useProjectAccess/useProjectAccess.ts +++ b/frontend/src/hooks/api/getters/useProjectAccess/useProjectAccess.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { IProjectRole } from '../../../../interfaces/role'; diff --git a/frontend/src/hooks/api/getters/useProjectRole/useProjectRole.ts b/frontend/src/hooks/api/getters/useProjectRole/useProjectRole.ts index d3eb39ee7a..2c476a7320 100644 --- a/frontend/src/hooks/api/getters/useProjectRole/useProjectRole.ts +++ b/frontend/src/hooks/api/getters/useProjectRole/useProjectRole.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; const useProjectRole = (id: string, options: SWRConfiguration = {}) => { diff --git a/frontend/src/hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions.ts b/frontend/src/hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions.ts index 824c45fb38..5565f84145 100644 --- a/frontend/src/hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions.ts +++ b/frontend/src/hooks/api/getters/useProjectRolePermissions/useProjectRolePermissions.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { IProjectEnvironmentPermissions, diff --git a/frontend/src/hooks/api/getters/useProjectRoles/useProjectRoles.ts b/frontend/src/hooks/api/getters/useProjectRoles/useProjectRoles.ts index c1e5e6dab2..42cb258071 100644 --- a/frontend/src/hooks/api/getters/useProjectRoles/useProjectRoles.ts +++ b/frontend/src/hooks/api/getters/useProjectRoles/useProjectRoles.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; const useProjectRoles = (options: SWRConfiguration = {}) => { diff --git a/frontend/src/hooks/api/getters/useProjects/useProjects.ts b/frontend/src/hooks/api/getters/useProjects/useProjects.ts index 765cd19497..0eaaeae6be 100644 --- a/frontend/src/hooks/api/getters/useProjects/useProjects.ts +++ b/frontend/src/hooks/api/getters/useProjects/useProjects.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { IProjectCard } from '../../../../interfaces/project'; import handleErrorResponses from '../httpErrorResponseHandler'; diff --git a/frontend/src/hooks/api/getters/useResetPassword/useResetPassword.ts b/frontend/src/hooks/api/getters/useResetPassword/useResetPassword.ts index b58017c3f6..ca0c3c75e8 100644 --- a/frontend/src/hooks/api/getters/useResetPassword/useResetPassword.ts +++ b/frontend/src/hooks/api/getters/useResetPassword/useResetPassword.ts @@ -1,7 +1,7 @@ import useSWR, { SWRConfiguration } from 'swr'; import useQueryParams from '../../../useQueryParams'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; const getFetcher = (token: string) => () => { const path = formatApiPath(`auth/reset/validate?token=${token}`); diff --git a/frontend/src/hooks/api/getters/useSegments/useSegments.ts b/frontend/src/hooks/api/getters/useSegments/useSegments.ts index 087719da5e..581170139a 100644 --- a/frontend/src/hooks/api/getters/useSegments/useSegments.ts +++ b/frontend/src/hooks/api/getters/useSegments/useSegments.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useCallback } from 'react'; -import { formatApiPath } from 'utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { ISegment } from 'interfaces/segment'; diff --git a/frontend/src/hooks/api/getters/useStrategies/useStrategies.ts b/frontend/src/hooks/api/getters/useStrategies/useStrategies.ts index e1f30b46d6..be93a27e0b 100644 --- a/frontend/src/hooks/api/getters/useStrategies/useStrategies.ts +++ b/frontend/src/hooks/api/getters/useStrategies/useStrategies.ts @@ -1,6 +1,6 @@ import useSWR, { mutate } from 'swr'; import { useCallback } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { IStrategy } from '../../../../interfaces/strategy'; import handleErrorResponses from '../httpErrorResponseHandler'; diff --git a/frontend/src/hooks/api/getters/useStrategy/useStrategy.ts b/frontend/src/hooks/api/getters/useStrategy/useStrategy.ts index 6ecbafc43c..243b50a857 100644 --- a/frontend/src/hooks/api/getters/useStrategy/useStrategy.ts +++ b/frontend/src/hooks/api/getters/useStrategy/useStrategy.ts @@ -1,5 +1,5 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; -import { formatApiPath } from 'utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { defaultStrategy } from './defaultStrategy'; diff --git a/frontend/src/hooks/api/getters/useTagType/useTagType.ts b/frontend/src/hooks/api/getters/useTagType/useTagType.ts index 97dbd667ee..9ec23e2227 100644 --- a/frontend/src/hooks/api/getters/useTagType/useTagType.ts +++ b/frontend/src/hooks/api/getters/useTagType/useTagType.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; const useTagType = (name: string, options: SWRConfiguration = {}) => { diff --git a/frontend/src/hooks/api/getters/useTagTypes/useTagTypes.ts b/frontend/src/hooks/api/getters/useTagTypes/useTagTypes.ts index 4d3a44bd00..682d89f9a3 100644 --- a/frontend/src/hooks/api/getters/useTagTypes/useTagTypes.ts +++ b/frontend/src/hooks/api/getters/useTagTypes/useTagTypes.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { ITagType } from '../../../../interfaces/tags'; import handleErrorResponses from '../httpErrorResponseHandler'; diff --git a/frontend/src/hooks/api/getters/useTags/useTags.ts b/frontend/src/hooks/api/getters/useTags/useTags.ts index 16f9c55494..f9c7e15d1a 100644 --- a/frontend/src/hooks/api/getters/useTags/useTags.ts +++ b/frontend/src/hooks/api/getters/useTags/useTags.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { ITag } from '../../../../interfaces/tags'; import handleErrorResponses from '../httpErrorResponseHandler'; diff --git a/frontend/src/hooks/api/getters/useUiBootstrap/useUiBootstrap.ts b/frontend/src/hooks/api/getters/useUiBootstrap/useUiBootstrap.ts index 2f3e6cd1b9..57f67cc5f1 100644 --- a/frontend/src/hooks/api/getters/useUiBootstrap/useUiBootstrap.ts +++ b/frontend/src/hooks/api/getters/useUiBootstrap/useUiBootstrap.ts @@ -1,7 +1,7 @@ import handleErrorResponses from '../httpErrorResponseHandler'; import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; const useUiBootstrap = (options: SWRConfiguration = {}) => { // The point of the bootstrap is to get multiple datasets in one call. Therefore, diff --git a/frontend/src/hooks/api/getters/useUiConfig/useUiConfig.ts b/frontend/src/hooks/api/getters/useUiConfig/useUiConfig.ts index fceabf02fa..1daa7d6550 100644 --- a/frontend/src/hooks/api/getters/useUiConfig/useUiConfig.ts +++ b/frontend/src/hooks/api/getters/useUiConfig/useUiConfig.ts @@ -1,5 +1,5 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import { defaultValue } from './defaultValue'; import { IUiConfig } from '../../../../interfaces/uiConfig'; import handleErrorResponses from '../httpErrorResponseHandler'; diff --git a/frontend/src/hooks/api/getters/useUnleashContext/useUnleashContext.ts b/frontend/src/hooks/api/getters/useUnleashContext/useUnleashContext.ts index 559feb7d51..662e3b2868 100644 --- a/frontend/src/hooks/api/getters/useUnleashContext/useUnleashContext.ts +++ b/frontend/src/hooks/api/getters/useUnleashContext/useUnleashContext.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; import { IUnleashContextDefinition } from '../../../../interfaces/context'; diff --git a/frontend/src/hooks/api/getters/useUserInfo/useUserInfo.ts b/frontend/src/hooks/api/getters/useUserInfo/useUserInfo.ts index ea5283dbb8..adb0063f7a 100644 --- a/frontend/src/hooks/api/getters/useUserInfo/useUserInfo.ts +++ b/frontend/src/hooks/api/getters/useUserInfo/useUserInfo.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; const useUserInfo = (id: string, options: SWRConfiguration = {}) => { diff --git a/frontend/src/hooks/api/getters/useUsers/useUsers.ts b/frontend/src/hooks/api/getters/useUsers/useUsers.ts index 3e22e89960..e4e42afa3d 100644 --- a/frontend/src/hooks/api/getters/useUsers/useUsers.ts +++ b/frontend/src/hooks/api/getters/useUsers/useUsers.ts @@ -1,6 +1,6 @@ import useSWR, { mutate, SWRConfiguration } from 'swr'; import { useState, useEffect } from 'react'; -import { formatApiPath } from '../../../../utils/format-path'; +import { formatApiPath } from 'utils/formatPath'; import handleErrorResponses from '../httpErrorResponseHandler'; const useUsers = (options: SWRConfiguration = {}) => { diff --git a/frontend/src/hooks/useEventSettings.ts b/frontend/src/hooks/useEventSettings.ts index d7c7c2ea95..6578e77767 100644 --- a/frontend/src/hooks/useEventSettings.ts +++ b/frontend/src/hooks/useEventSettings.ts @@ -1,4 +1,4 @@ -import { getBasePath } from '../utils/format-path'; +import { getBasePath } from 'utils/formatPath'; import { createPersistentGlobalStateHook } from './usePersistentGlobalState'; import React from 'react'; diff --git a/frontend/src/hooks/useFeaturesSort.ts b/frontend/src/hooks/useFeaturesSort.ts index fd5415c246..bd4a40ef93 100644 --- a/frontend/src/hooks/useFeaturesSort.ts +++ b/frontend/src/hooks/useFeaturesSort.ts @@ -1,6 +1,6 @@ import { IFeatureToggle } from '../interfaces/featureToggle'; import React, { useMemo } from 'react'; -import { getBasePath } from '../utils/format-path'; +import { getBasePath } from 'utils/formatPath'; import { createPersistentGlobalStateHook } from './usePersistentGlobalState'; type FeaturesSortType = diff --git a/frontend/src/hooks/useLocationSettings.ts b/frontend/src/hooks/useLocationSettings.ts index 5e74ff0240..7577bc4cd6 100644 --- a/frontend/src/hooks/useLocationSettings.ts +++ b/frontend/src/hooks/useLocationSettings.ts @@ -1,4 +1,4 @@ -import { getBasePath } from '../utils/format-path'; +import { getBasePath } from 'utils/formatPath'; import { createPersistentGlobalStateHook } from './usePersistentGlobalState'; import React from 'react'; diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index 5c8fff500a..ccacab7700 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -7,11 +7,11 @@ import { ThemeProvider, CssBaseline } from '@material-ui/core'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; import { StylesProvider } from '@material-ui/core/styles'; -import mainTheme from './themes/main-theme'; +import mainTheme from 'themes/mainTheme'; import { App } from './component/App'; -import ScrollToTop from './component/scroll-to-top'; +import ScrollToTop from 'component/scrollToTop'; import AccessProvider from './component/providers/AccessProvider/AccessProvider'; -import { getBasePath } from './utils/format-path'; +import { getBasePath } from 'utils/formatPath'; import UIProvider from './component/providers/UIProvider/UIProvider'; ReactDOM.render( diff --git a/frontend/src/security-logger.js b/frontend/src/securityLogger.js similarity index 100% rename from frontend/src/security-logger.js rename to frontend/src/securityLogger.js diff --git a/frontend/src/themes/main-theme.ts b/frontend/src/themes/mainTheme.ts similarity index 100% rename from frontend/src/themes/main-theme.ts rename to frontend/src/themes/mainTheme.ts diff --git a/frontend/src/utils/api-utils.ts b/frontend/src/utils/apiUtils.ts similarity index 100% rename from frontend/src/utils/api-utils.ts rename to frontend/src/utils/apiUtils.ts diff --git a/frontend/src/utils/calculate-percentage.ts b/frontend/src/utils/calculatePercentage.ts similarity index 100% rename from frontend/src/utils/calculate-percentage.ts rename to frontend/src/utils/calculatePercentage.ts diff --git a/frontend/src/utils/cleanConstraint.ts b/frontend/src/utils/cleanConstraint.ts index 46230600f8..6cb305670b 100644 --- a/frontend/src/utils/cleanConstraint.ts +++ b/frontend/src/utils/cleanConstraint.ts @@ -1,6 +1,6 @@ import { singleValueOperators } from 'constants/operators'; import { IConstraint } from 'interfaces/strategy'; -import { oneOf } from './one-of'; +import { oneOf } from 'utils/oneOf'; const VALUES = 'values'; const VALUE = 'value'; diff --git a/frontend/src/utils/format-date.ts b/frontend/src/utils/formatDate.ts similarity index 100% rename from frontend/src/utils/format-date.ts rename to frontend/src/utils/formatDate.ts diff --git a/frontend/src/utils/format-path.ts b/frontend/src/utils/formatPath.ts similarity index 100% rename from frontend/src/utils/format-path.ts rename to frontend/src/utils/formatPath.ts diff --git a/frontend/src/utils/format-unknown-error.test.ts b/frontend/src/utils/formatUnknownError.test.ts similarity index 81% rename from frontend/src/utils/format-unknown-error.test.ts rename to frontend/src/utils/formatUnknownError.test.ts index 1e12a3153a..28276c75f0 100644 --- a/frontend/src/utils/format-unknown-error.test.ts +++ b/frontend/src/utils/formatUnknownError.test.ts @@ -1,4 +1,4 @@ -import { formatUnknownError } from './format-unknown-error'; +import { formatUnknownError } from 'utils/formatUnknownError'; test('formatUnknownError', () => { expect(formatUnknownError(1)).toEqual('Unknown error'); diff --git a/frontend/src/utils/format-unknown-error.ts b/frontend/src/utils/formatUnknownError.ts similarity index 100% rename from frontend/src/utils/format-unknown-error.ts rename to frontend/src/utils/formatUnknownError.ts diff --git a/frontend/src/utils/get-feature-metrics.ts b/frontend/src/utils/getFeatureMetrics.ts similarity index 100% rename from frontend/src/utils/get-feature-metrics.ts rename to frontend/src/utils/getFeatureMetrics.ts diff --git a/frontend/src/utils/get-feature-type-icons.ts b/frontend/src/utils/getFeatureTypeIcons.ts similarity index 100% rename from frontend/src/utils/get-feature-type-icons.ts rename to frontend/src/utils/getFeatureTypeIcons.ts diff --git a/frontend/src/utils/get-strategy-object.ts b/frontend/src/utils/getStrategyObject.ts similarity index 87% rename from frontend/src/utils/get-strategy-object.ts rename to frontend/src/utils/getStrategyObject.ts index b6df4a41ee..d33cf6475c 100644 --- a/frontend/src/utils/get-strategy-object.ts +++ b/frontend/src/utils/getStrategyObject.ts @@ -1,5 +1,5 @@ import { IStrategy, IParameter } from '../interfaces/strategy'; -import { resolveDefaultParamValue } from './resolve-default-param-value'; +import { resolveDefaultParamValue } from 'utils/resolveDefaultParamValue'; export const getStrategyObject = ( selectableStrategies: IStrategy[], diff --git a/frontend/src/utils/object-id.test.ts b/frontend/src/utils/objectId.test.ts similarity index 88% rename from frontend/src/utils/object-id.test.ts rename to frontend/src/utils/objectId.test.ts index 25b0a3dc5f..faaa67b091 100644 --- a/frontend/src/utils/object-id.test.ts +++ b/frontend/src/utils/objectId.test.ts @@ -1,4 +1,4 @@ -import { objectId } from 'utils/object-id'; +import { objectId } from 'utils/objectId'; test('objectId', () => { const a = {}; diff --git a/frontend/src/utils/object-id.ts b/frontend/src/utils/objectId.ts similarity index 100% rename from frontend/src/utils/object-id.ts rename to frontend/src/utils/objectId.ts diff --git a/frontend/src/utils/one-of.ts b/frontend/src/utils/oneOf.ts similarity index 100% rename from frontend/src/utils/one-of.ts rename to frontend/src/utils/oneOf.ts diff --git a/frontend/src/utils/project-filter-generator.ts b/frontend/src/utils/projectFilterGenerator.ts similarity index 100% rename from frontend/src/utils/project-filter-generator.ts rename to frontend/src/utils/projectFilterGenerator.ts diff --git a/frontend/src/utils/remove-empty-string-fields.test.ts b/frontend/src/utils/removeEmptyStringFields.test.ts similarity index 87% rename from frontend/src/utils/remove-empty-string-fields.test.ts rename to frontend/src/utils/removeEmptyStringFields.test.ts index 8a9fd199cf..48f847b5f2 100644 --- a/frontend/src/utils/remove-empty-string-fields.test.ts +++ b/frontend/src/utils/removeEmptyStringFields.test.ts @@ -1,4 +1,4 @@ -import { removeEmptyStringFields } from './remove-empty-string-fields'; +import { removeEmptyStringFields } from 'utils/removeEmptyStringFields'; test('removeEmptyStringFields', () => { expect(removeEmptyStringFields({})).toEqual({}); diff --git a/frontend/src/utils/remove-empty-string-fields.ts b/frontend/src/utils/removeEmptyStringFields.ts similarity index 100% rename from frontend/src/utils/remove-empty-string-fields.ts rename to frontend/src/utils/removeEmptyStringFields.ts diff --git a/frontend/src/utils/resolve-default-param-value.ts b/frontend/src/utils/resolveDefaultParamValue.ts similarity index 100% rename from frontend/src/utils/resolve-default-param-value.ts rename to frontend/src/utils/resolveDefaultParamValue.ts diff --git a/frontend/src/utils/route-path-helpers.ts b/frontend/src/utils/routePathHelpers.ts similarity index 100% rename from frontend/src/utils/route-path-helpers.ts rename to frontend/src/utils/routePathHelpers.ts diff --git a/frontend/src/utils/strategy-names.ts b/frontend/src/utils/strategyNames.ts similarity index 100% rename from frontend/src/utils/strategy-names.ts rename to frontend/src/utils/strategyNames.ts