From 34a16efbb012054fc9ddfdb042413498c0619a19 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 2 Sep 2023 11:41:14 +0530
Subject: [PATCH] fix: use same env variable

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb-sdk/package-lock.json         |  4 +--
 packages/nocodb/package-lock.json             | 32 +++++++++++--------
 packages/nocodb/package.json                  |  4 +--
 .../nocodb/src/utils/nc-config/NcConfig.ts    |  2 +-
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/packages/nocodb-sdk/package-lock.json b/packages/nocodb-sdk/package-lock.json
index 9aa87deff5..f3341d61f2 100644
--- a/packages/nocodb-sdk/package-lock.json
+++ b/packages/nocodb-sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nocodb-sdk",
-  "version": "0.111.0",
+  "version": "0.111.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nocodb-sdk",
-      "version": "0.111.0",
+      "version": "0.111.1",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json
index c52851a0f2..36c3e2a559 100644
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@@ -98,7 +98,7 @@
         "ncp": "^2.0.0",
         "nestjs-kafka": "^1.0.6",
         "nestjs-throttler-storage-redis": "^0.3.0",
-        "nocodb-sdk": "0.111.1",
+        "nocodb-sdk": "file:../nocodb-sdk",
         "nodemailer": "^6.4.10",
         "object-hash": "^3.0.0",
         "object-sizeof": "^2.6.1",
@@ -211,7 +211,6 @@
     },
     "../nocodb-sdk": {
       "version": "0.111.1",
-      "extraneous": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
@@ -14383,13 +14382,8 @@
       }
     },
     "node_modules/nocodb-sdk": {
-      "version": "0.111.1",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.111.1.tgz",
-      "integrity": "sha512-FS5wyWd3XkPtRkqjO7Hdj5HKsco6/oYc8MPrZ7K/JRmqf0Yf1oydtarkv7h+dDTaNtfcp6Qm56b1JdwJP/EWvg==",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      }
+      "resolved": "../nocodb-sdk",
+      "link": true
     },
     "node_modules/node-abort-controller": {
       "version": "3.1.1",
@@ -30908,12 +30902,24 @@
       "requires": {}
     },
     "nocodb-sdk": {
-      "version": "0.111.1",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.111.1.tgz",
-      "integrity": "sha512-FS5wyWd3XkPtRkqjO7Hdj5HKsco6/oYc8MPrZ7K/JRmqf0Yf1oydtarkv7h+dDTaNtfcp6Qm56b1JdwJP/EWvg==",
+      "version": "file:../nocodb-sdk",
       "requires": {
+        "@typescript-eslint/eslint-plugin": "^4.0.1",
+        "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.21.1",
-        "jsep": "^1.3.6"
+        "cspell": "^4.1.0",
+        "eslint": "^7.8.0",
+        "eslint-config-prettier": "^6.11.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-functional": "^3.0.2",
+        "eslint-plugin-import": "^2.22.0",
+        "eslint-plugin-prettier": "^4.0.0",
+        "jsep": "^1.3.6",
+        "npm-run-all": "^4.1.5",
+        "prettier": "^2.1.1",
+        "rimraf": "^5.0.1",
+        "tsc-alias": "^1.8.7",
+        "typescript": "^4.7.4"
       }
     },
     "node-abort-controller": {
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index 4ab02a0df1..a52650cf42 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -131,7 +131,7 @@
     "ncp": "^2.0.0",
     "nestjs-kafka": "^1.0.6",
     "nestjs-throttler-storage-redis": "^0.3.0",
-    "nocodb-sdk": "0.111.1",
+    "nocodb-sdk": "file:../nocodb-sdk",
     "nodemailer": "^6.4.10",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.1",
@@ -223,4 +223,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/nocodb/src/utils/nc-config/NcConfig.ts b/packages/nocodb/src/utils/nc-config/NcConfig.ts
index 5f715d1bb2..6063f9486d 100644
--- a/packages/nocodb/src/utils/nc-config/NcConfig.ts
+++ b/packages/nocodb/src/utils/nc-config/NcConfig.ts
@@ -146,7 +146,7 @@ export class NcConfig {
       port: process.env.NC_PORT,
       tryMode: !!process.env.NC_TRY,
       worker: !!process.env.NC_WORKER,
-      dashboardPath: process.env.NC_DASHBOARD_PATH ?? '/dashboard',
+      dashboardPath: process.env.NC_DASHBOARD_URL ?? '/dashboard',
       publicUrl: process.env.NC_PUBLIC_URL,
     });
   }