From 804e342a995020353f021ebee54ca8fc0688b1a3 Mon Sep 17 00:00:00 2001 From: John Cowen Date: Mon, 15 Jul 2024 15:06:22 +0100 Subject: [PATCH] chore: Remove/move some unused or little used functions (#2744) As part of our modularization of the application, we are working towards removing all our 'global' files/folders. This PR: - Moves `camelCaseToWords` to the only place we use it (inside `i18n::t`) and make it completely private as we don't want to use it for anything else. - Converts any references to `import { useI18n, useKumaApi } from @/utilities` to their new modularized equivalents. (`kumaApi` will soon be removed entirely in favour of our auto-generated OpenAPI client) - Removes `isSet` we only used it in one file, and there are better one liners to use than `isSet` - Removes `getLabels`. Again, we only use it in one file and its a one liner. Note: We'll probably stop doing this reshaping anyway, just not now. Signed-off-by: John Cowen --- .../components/app-collection/AppCollection.vue | 2 +- .../components/route-view/RouteView.vue | 3 +-- src/app/application/services/i18n/I18n.ts | 9 ++++++++- src/app/common/DeleteResourceModal.vue | 2 +- src/app/common/EmptyBlock.vue | 2 +- src/app/common/ErrorBlock.vue | 2 +- src/app/common/StatusBadge.vue | 2 +- src/app/common/TagList.vue | 3 +-- src/app/common/code-block/ResourceCodeBlock.vue | 2 +- src/app/data-planes/data/index.ts | 7 +++---- src/app/gateways/components/ListenerRoutes.vue | 2 +- src/app/kuma/index.ts | 7 ++++++- src/app/meshes/components/MeshStatus.vue | 2 +- .../onboarding/components/OnboardingAlert.vue | 2 +- .../components/graphs/KubernetesGraph.vue | 2 +- .../onboarding/components/graphs/MemoryGraph.vue | 2 +- .../components/graphs/MultizoneGraph.vue | 2 +- .../components/graphs/PostgresGraph.vue | 2 +- .../components/graphs/StandaloneGraph.vue | 2 +- .../views/OnboardingConfigurationTypesView.vue | 2 +- src/app/policies/components/PolicySummary.vue | 2 +- .../components/SubscriptionDetails.vue | 2 +- src/app/zones-crud/views/ZoneCreateView.vue | 3 ++- src/app/zones/views/ZoneDetailTabsView.vue | 2 +- src/app/zones/views/ZoneListView.vue | 2 +- src/utilities/camelCaseToWords.spec.ts | 16 ---------------- src/utilities/camelCaseToWords.ts | 8 -------- src/utilities/getLabels.spec.ts | 14 -------------- src/utilities/getLabels.ts | 5 ----- src/utilities/index.ts | 11 ----------- src/utilities/isSet.ts | 3 --- 31 files changed, 40 insertions(+), 87 deletions(-) delete mode 100644 src/utilities/camelCaseToWords.spec.ts delete mode 100644 src/utilities/camelCaseToWords.ts delete mode 100644 src/utilities/getLabels.spec.ts delete mode 100644 src/utilities/getLabels.ts delete mode 100644 src/utilities/index.ts delete mode 100644 src/utilities/isSet.ts diff --git a/src/app/application/components/app-collection/AppCollection.vue b/src/app/application/components/app-collection/AppCollection.vue index 36648037e..757f42a12 100644 --- a/src/app/application/components/app-collection/AppCollection.vue +++ b/src/app/application/components/app-collection/AppCollection.vue @@ -111,8 +111,8 @@ import { KButton, KTable } from '@kong/kongponents' import { useSlots, ref, watch, Ref } from 'vue' import { RouteLocationRaw } from 'vue-router' +import { useI18n } from '@/app/application' import EmptyBlock from '@/app/common/EmptyBlock.vue' -import { useI18n } from '@/utilities' import type { TableHeader as KTableHeader, TablePreferences } from '@kong/kongponents' type CellAttrParams = { diff --git a/src/app/application/components/route-view/RouteView.vue b/src/app/application/components/route-view/RouteView.vue index 0c45db1a8..620df48bd 100644 --- a/src/app/application/components/route-view/RouteView.vue +++ b/src/app/application/components/route-view/RouteView.vue @@ -50,7 +50,7 @@ import { computed, provide, inject, ref, watch, onBeforeUnmount, reactive, useAt import { useRoute, useRouter } from 'vue-router' import { ROUTE_VIEW_PARENT, ROUTE_VIEW_ROOT } from '.' -import { useCan, useI18n, uniqueId } from '../../index' +import { useCan, useI18n, uniqueId, useEnv } from '../../index' import { urlParam, normalizeUrlParam, @@ -61,7 +61,6 @@ import { } from '../../utilities' import { useUri } from '@/app/application/services/data-source' import { sources } from '@/app/me/sources' -import { useEnv } from '@/utilities' import { get } from '@/utilities/get' import type { RouteRecordRaw } from 'vue-router' diff --git a/src/app/application/services/i18n/I18n.ts b/src/app/application/services/i18n/I18n.ts index 54d384e88..4e6ea39a1 100644 --- a/src/app/application/services/i18n/I18n.ts +++ b/src/app/application/services/i18n/I18n.ts @@ -1,7 +1,6 @@ import { createI18n } from '@kong-ui-public/i18n' import type Env from '@/app/application/services/env/Env' -import { camelCaseToWords } from '@/utilities/camelCaseToWords' import { get } from '@/utilities/get' declare module 'intl-messageformat' { @@ -19,6 +18,14 @@ class I18nError extends Error { return this.message } } +const camelCaseToWords = (str: string): string => { + const words = str + .split(/([A-Z][a-z]+)/) + .join(' ') + .replace(/\s+/g, ' ') + .trim() + return words.charAt(0).toUpperCase() + words.substring(1) +} export default (strs: T, env: Env['var']) => { const i18n = createI18n('en-us', strs, { diff --git a/src/app/common/DeleteResourceModal.vue b/src/app/common/DeleteResourceModal.vue index a7db5223f..437cb7d17 100644 --- a/src/app/common/DeleteResourceModal.vue +++ b/src/app/common/DeleteResourceModal.vue @@ -42,8 +42,8 @@ import { KAlert, KPrompt } from '@kong/kongponents' import { PropType, ref } from 'vue' +import { useI18n } from '@/app/application' import { ApiError } from '@/app/kuma/services/kuma-api/ApiError' -import { useI18n } from '@/utilities' const { t } = useI18n() diff --git a/src/app/common/EmptyBlock.vue b/src/app/common/EmptyBlock.vue index 750f114ff..b32af6a5e 100644 --- a/src/app/common/EmptyBlock.vue +++ b/src/app/common/EmptyBlock.vue @@ -77,7 +77,7 @@ diff --git a/src/app/onboarding/components/graphs/KubernetesGraph.vue b/src/app/onboarding/components/graphs/KubernetesGraph.vue index cd4307d52..87d470ae1 100644 --- a/src/app/onboarding/components/graphs/KubernetesGraph.vue +++ b/src/app/onboarding/components/graphs/KubernetesGraph.vue @@ -684,7 +684,7 @@ diff --git a/src/app/onboarding/components/graphs/MemoryGraph.vue b/src/app/onboarding/components/graphs/MemoryGraph.vue index 97b0aa69c..33adf1690 100644 --- a/src/app/onboarding/components/graphs/MemoryGraph.vue +++ b/src/app/onboarding/components/graphs/MemoryGraph.vue @@ -364,7 +364,7 @@ diff --git a/src/app/onboarding/components/graphs/MultizoneGraph.vue b/src/app/onboarding/components/graphs/MultizoneGraph.vue index 03f04e297..1e789c304 100644 --- a/src/app/onboarding/components/graphs/MultizoneGraph.vue +++ b/src/app/onboarding/components/graphs/MultizoneGraph.vue @@ -895,7 +895,7 @@ diff --git a/src/app/onboarding/components/graphs/PostgresGraph.vue b/src/app/onboarding/components/graphs/PostgresGraph.vue index 0daef76de..5ac64c25c 100644 --- a/src/app/onboarding/components/graphs/PostgresGraph.vue +++ b/src/app/onboarding/components/graphs/PostgresGraph.vue @@ -685,7 +685,7 @@ diff --git a/src/app/onboarding/components/graphs/StandaloneGraph.vue b/src/app/onboarding/components/graphs/StandaloneGraph.vue index 614b44570..e9aac9467 100644 --- a/src/app/onboarding/components/graphs/StandaloneGraph.vue +++ b/src/app/onboarding/components/graphs/StandaloneGraph.vue @@ -446,7 +446,7 @@ diff --git a/src/app/onboarding/views/OnboardingConfigurationTypesView.vue b/src/app/onboarding/views/OnboardingConfigurationTypesView.vue index 0ea9fa15c..a69ea1848 100644 --- a/src/app/onboarding/views/OnboardingConfigurationTypesView.vue +++ b/src/app/onboarding/views/OnboardingConfigurationTypesView.vue @@ -69,7 +69,7 @@ import PostgresGraph from '../components/graphs/PostgresGraph.vue' import OnboardingHeading from '../components/OnboardingHeading.vue' import OnboardingNavigation from '../components/OnboardingNavigation.vue' import OnboardingPage from '../components/OnboardingPage.vue' -import { useEnv } from '@/utilities' +import { useEnv } from '@/app/application' const env = useEnv() diff --git a/src/app/policies/components/PolicySummary.vue b/src/app/policies/components/PolicySummary.vue index b8f47bb97..6c7e07f53 100644 --- a/src/app/policies/components/PolicySummary.vue +++ b/src/app/policies/components/PolicySummary.vue @@ -56,8 +56,8 @@