Browse Source

fix: remove envs props from config which is no longer in use

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/5779/head
Pranav C 2 years ago
parent
commit
89f150c497
  1. 8
      packages/nocodb/src/Noco.ts
  2. 7
      packages/nocodb/src/utils/nc-config/NcConfig.ts

8
packages/nocodb/src/Noco.ts

@ -30,13 +30,7 @@ export default class Noco {
private static logger = new Logger(Noco.name); private static logger = new Logger(Noco.name);
public static get dashboardUrl(): string { public static get dashboardUrl(): string {
let siteUrl = `http://localhost:${process.env.PORT || 8080}`; const siteUrl = `http://localhost:${process.env.PORT || 8080}`;
// if (Noco._this?.config?.envs?.[Noco._this?.env]?.publicUrl) {
// siteUrl = Noco._this?.config?.envs?.[Noco._this?.env]?.publicUrl;
// }
if (Noco._this?.config?.envs?.['_noco']?.publicUrl) {
siteUrl = Noco._this?.config?.envs?.['_noco']?.publicUrl;
}
return `${siteUrl}${Noco._this?.config?.dashboardPath}`; return `${siteUrl}${Noco._this?.config?.dashboardPath}`;
} }

7
packages/nocodb/src/utils/nc-config/NcConfig.ts

@ -40,9 +40,6 @@ export class NcConfig {
publicUrl?: string; publicUrl?: string;
dashboardPath?: string; dashboardPath?: string;
// TODO what is this?
envs: any;
queriesFolder: string; queriesFolder: string;
env: string; env: string;
workingEnv: string; workingEnv: string;
@ -81,8 +78,7 @@ export class NcConfig {
ncConfig.env = '_noco'; ncConfig.env = '_noco';
ncConfig.workingEnv = '_noco'; ncConfig.workingEnv = '_noco';
ncConfig.projectType = ncConfig.projectType = 'rest';
ncConfig?.envs?.[ncConfig.workingEnv]?.db?.[0]?.meta?.api?.type || 'rest';
if (ncConfig.meta?.db?.connection?.filename) { if (ncConfig.meta?.db?.connection?.filename) {
ncConfig.meta.db.connection.filename = path.join( ncConfig.meta.db.connection.filename = path.join(
@ -120,7 +116,6 @@ export class NcConfig {
} }
if (publicUrl) { if (publicUrl) {
ncConfig.envs['_noco'].publicUrl = publicUrl;
ncConfig.publicUrl = publicUrl; ncConfig.publicUrl = publicUrl;
} }

Loading…
Cancel
Save