Fix bug where global org/domain winds up in remote command name

foobara · Feb 10, 2024 · 142090e · 142090e
1 parent d422a04
commit 142090e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: foobara
-  revision: b04eab7528d24e71f2d490fa342e0d2614146500
+  revision: ff87027b163493c16d665acab1ef5d5c8574cbbc
   branch: main
   specs:
     foobara (0.0.1)

diff --git a/src/remote_generator/templates/base/RemoteCommand.ts b/src/remote_generator/templates/base/RemoteCommand.ts
@@ -49,7 +49,18 @@ export default abstract class RemoteCommand<Inputs, Result, CommandError extends
   }
 
   static get fullCommandName (): string {
-    return [this.organizationName, this.domainName, this.commandName].filter(Boolean).join('::')
+    const path = []
+
+    if (this.organizationName != null && this.organizationName !== "GlobalOrganization") {
+      path.push(this.organizationName)
+    }
+    if (this.domainName != null && this.domainName !== "GlobalDomain") {
+      path.push(this.domainName)
+    }
+    if (this.commandName != null) {
+      path.push(this.commandName)
+    }
+    return path.join('::')
   }
 
   get fullCommandName (): string {