reslove conflict

RHEcosystemAppEng · Aug 20, 2024 · e84bcec · e84bcec
2 parents 541fd6b + 1a34861
commit e84bcec
Show file tree

Hide file tree

Showing 297 changed files with 10,769 additions and 3,635 deletions.
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -86,6 +86,7 @@
   },
   "overrides": {
     "tough-cookie": "^4.1.3",
-    "ws": "^8.17.1"
+    "ws": "^8.17.1",
+    "@types/tar": "^6.1.13"
   }
 }
diff --git a/backend/src/routes/api/connection-types/connectionTypeUtils.ts b/backend/src/routes/api/connection-types/connectionTypeUtils.ts
@@ -128,9 +128,9 @@ export const patchConnectionType = async (
   const { dashboardNamespace } = getNamespaces(fastify);
 
   if (
-    (partialConfigMap.metadata.labels?.[KnownLabels.DASHBOARD_RESOURCE] &&
+    (partialConfigMap.metadata?.labels?.[KnownLabels.DASHBOARD_RESOURCE] &&
       partialConfigMap.metadata.labels[KnownLabels.DASHBOARD_RESOURCE] !== 'true') ||
-    (partialConfigMap.metadata.labels?.[KnownLabels.CONNECTION_TYPE] &&
+    (partialConfigMap.metadata?.labels?.[KnownLabels.CONNECTION_TYPE] &&
       partialConfigMap.metadata.labels[KnownLabels.CONNECTION_TYPE] !== 'true')
   ) {
     const error = 'Unable to update connection type, incorrect labels.';

diff --git a/backend/src/routes/api/storage/index.ts b/backend/src/routes/api/storage/index.ts
diff --git a/backend/src/routes/api/storage/storageUtils.ts b/backend/src/routes/api/storage/storageUtils.ts