Change relative path to include nested dataconnect folders (#8853)

* change relative path to include nested dataconnect folders

* changelog

* update deprecated call

Author: hlshen

firebase-vscode/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## NEXT
 
+- [Fixed] Language server now properly recognizes nested Dataconnect folders
+
 ## 1.5.0
 
 - Update internal `firebase-tools` dependency to 14.9.0

firebase-vscode/src/data-connect/config.ts

@@ -268,7 +268,10 @@ export class ResolvedDataConnectConfig {
   }
 
   get relativePath(): string {
-    return this.path.split("/").pop()!;
+    if (!getConfigPath()) {
+      return this.path.split("/").pop()!;
+    }
+    return path.relative(getConfigPath()!, this.path);
   }
 
   get relativeSchemaPath(): string {

firebase-vscode/src/data-connect/language-client.ts

@@ -141,15 +141,5 @@ export function setupLanguageClient(
     outputChannel.appendLine("Firebase GraphQL Language Server restarted");
   });
 
-  // ** DISABLED FOR NOW WHILE WE TEST GENERATED YAML **
-  // restart server whenever config file changes
-  // const watcher = vscode.workspace.createFileSystemWatcher(
-  //   "**/.graphqlrc.*", // TODO: extend to schema files, and other config types
-  //   false,
-  //   false,
-  //   false,
-  // );
-  // watcher.onDidChange(() => restartGraphqlLSP());
-
   return client;
 }