fix: Fix adding forms file as local resource root

travisstebbins · Feb 5, 2025 · 046a95a · 046a95a
1 parent 8f3bcd5
commit 046a95a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/packages/extension/src/extension.ts b/packages/extension/src/extension.ts
@@ -298,9 +298,11 @@ const showDiagramWebView = async (
           )
             ? [
                 Uri.file(
-                  workspace
-                    .getConfiguration('legend')
-                    .get('studio.forms.file', ''),
+                  path.dirname(
+                    workspace
+                      .getConfiguration('legend')
+                      .get('studio.forms.file', ''),
+                  ),
                 ),
               ]
             : []),
@@ -382,9 +384,11 @@ const showQueryBuilderWebView = async (
             )
               ? [
                   Uri.file(
-                    workspace
-                      .getConfiguration('legend')
-                      .get('studio.forms.file', ''),
+                    path.dirname(
+                      workspace
+                        .getConfiguration('legend')
+                        .get('studio.forms.file', ''),
+                    ),
                   ),
                 ]
               : []),

diff --git a/packages/extension/src/webviews/utils.ts b/packages/extension/src/webviews/utils.ts
@@ -27,6 +27,7 @@ import {
   type TextLocation,
   GET_PROJECT_ENTITIES,
   GET_PROJECT_ENTITIES_RESPONSE,
+  isEmpty,
   QUERY_BUILDER_CONFIG_ERROR,
   WRITE_ENTITY,
 } from '@finos/legend-engine-ide-client-vscode-shared';
@@ -38,6 +39,7 @@ import { type LegendConceptTreeProvider } from '../conceptTree';
 import { TextDocumentIdentifier } from 'vscode-languageclient';
 
 export const isLocalFilePath = (filePath: string): boolean =>
+  !isEmpty(filePath) &&
   new URL(filePath, workspace.workspaceFolders?.[0]?.uri.toString())
     .protocol === 'file:';
 

diff --git a/packages/shared/src/utils/AssertionUtils.ts b/packages/shared/src/utils/AssertionUtils.ts
@@ -69,3 +69,6 @@ export const isObject = (val: unknown): val is object =>
 
 export const isPlainObject = (val: unknown): val is PlainObject =>
   isObject(val) && val.constructor.name === 'Object';
+
+export const isEmpty = (val: string): boolean =>
+  val === undefined || val === null || val.trim() === '';