refactor(uuid): move uuid extract method to utils

PrivateAIM · Jul 26, 2024 · 9adc58d · 9adc58d
1 parent aa763cb
commit 9adc58d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/components/data-stores/DetailedAnalysisTable.vue b/components/data-stores/DetailedAnalysisTable.vue
@@ -3,6 +3,7 @@ import { deleteAnalysisFromKong } from "~/composables/useAPIFetch";
 import { useConfirm } from "primevue/useconfirm";
 import type { Consumer } from "~/services/Api";
 import { formatDataRow } from "~/utils/format-data-row";
+import { extractUuid } from "~/utils/extract-uuid-from-kong-username";
 
 const props = defineProps({
   detailedAnalysisList: {
@@ -68,12 +69,6 @@ function onConfirmDeleteAnalysis(
   }
 }
 
-function formatAnalysisUuid(kongAnalysisUsername: string) {
-  const analysisUuid = kongAnalysisUsername.split("-");
-  analysisUuid.pop();
-  return analysisUuid.join("-");
-}
-
 function compileAnalysisTable() {
   let elongatedTableRows = new Array<analysisRow>();
   const analysisNameMap = props.analysisNameMap;
@@ -83,7 +78,7 @@ function compileAnalysisTable() {
 
   if (consumers && consumers.length > 0) {
     consumers.forEach((consumer: Consumer) => {
-      const analysisUuid = formatAnalysisUuid(consumer.username!);
+      const analysisUuid = extractUuid(consumer.username!);
       const analysisName = analysisNameMap.has(analysisUuid)
         ? analysisNameMap.get(analysisUuid)
         : "N/A";

diff --git a/components/data-stores/DetailedProjectTable.vue b/components/data-stores/DetailedProjectTable.vue
@@ -2,6 +2,7 @@
 import { deleteProjectFromKong } from "~/composables/useAPIFetch";
 import { useConfirm } from "primevue/useconfirm";
 import type { DetailedService, Route } from "~/services/Api";
+import { extractUuid } from "~/utils/extract-uuid-from-kong-username";
 
 const props = defineProps({
   detailedStoreList: Array<DetailedService>,
@@ -26,12 +27,6 @@ onBeforeMount(() => {
   meltDataStoreTable();
 });
 
-function formatProjectUuid(kongProjectName: string) {
-  const projectUuid = kongProjectName.split("-");
-  projectUuid.pop();
-  return projectUuid.join("-");
-}
-
 const confirmDeleteProject = (event, projectUuid: string) => {
   confirm.require({
     target: event.currentTarget,
@@ -62,7 +57,7 @@ function meltDataStoreTable() {
       const routes = store.routes;
       if (routes && routes.length > 0) {
         routes.forEach((proj: Route) => {
-          const projectUuid = formatProjectUuid(proj.name!);
+          const projectUuid = extractUuid(proj.name!);
           const newRow = {
             dataStore: store.name!,
             kongProjectId: proj.id!,

diff --git a/utils/extract-uuid-from-kong-username.ts b/utils/extract-uuid-from-kong-username.ts
@@ -0,0 +1,5 @@
+export function extractUuid(kongName: string) {
+  const uuid = kongName.split("-");
+  uuid.pop();
+  return uuid.join("-");
+}