From a561569a10b2cd73b039b4546593e72f2409f341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Wed, 23 Feb 2022 13:36:46 +0100
Subject: [PATCH] default namespace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 packages/catalog-model/src/entity/ref.test.ts | 4 ++--
 packages/catalog-model/src/entity/ref.ts      | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/catalog-model/src/entity/ref.test.ts b/packages/catalog-model/src/entity/ref.test.ts
index 9fc55612fe..ba0402cb71 100644
--- a/packages/catalog-model/src/entity/ref.test.ts
+++ b/packages/catalog-model/src/entity/ref.test.ts
@@ -194,12 +194,12 @@ describe('ref', () => {
       });
       expect(parseEntityRef('a:c')).toEqual({
         kind: 'a',
-        namespace: undefined,
+        namespace: 'default',
         name: 'c',
       });
       expect(parseEntityRef('c')).toEqual({
         kind: undefined,
-        namespace: undefined,
+        namespace: 'default',
         name: 'c',
       });
     });
diff --git a/packages/catalog-model/src/entity/ref.ts b/packages/catalog-model/src/entity/ref.ts
index 850b11686f..3c77998eb8 100644
--- a/packages/catalog-model/src/entity/ref.ts
+++ b/packages/catalog-model/src/entity/ref.ts
@@ -171,11 +171,13 @@ export function parseEntityRef(
     throw new Error(`Entity reference must not be empty`);
   }
 
+  const defaultNamespace = context.defaultNamespace || DEFAULT_NAMESPACE;
+
   if (typeof ref === 'string') {
     const parsed = parseRefString(ref);
     return {
       kind: parsed.kind ?? context.defaultKind,
-      namespace: parsed.namespace ?? context.defaultNamespace,
+      namespace: parsed.namespace ?? defaultNamespace,
       name: parsed.name,
     };
   }
@@ -191,7 +193,7 @@ export function parseEntityRef(
 
   return {
     kind: kind ?? context.defaultKind,
-    namespace: namespace ?? context.defaultNamespace,
+    namespace: namespace ?? defaultNamespace,
     name,
   };
 }