mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-18 02:21:13 +00:00
refactor(core): Remove env variable to enable folders (no-changelog) (#14076)
This commit is contained in:
1
.github/workflows/e2e-reusable.yml
vendored
1
.github/workflows/e2e-reusable.yml
vendored
@@ -161,7 +161,6 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
NODE_OPTIONS: --dns-result-order=ipv4first
|
NODE_OPTIONS: --dns-result-order=ipv4first
|
||||||
CYPRESS_NODE_VIEW_VERSION: 2
|
CYPRESS_NODE_VIEW_VERSION: 2
|
||||||
N8N_FOLDERS_ENABLED: true
|
|
||||||
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
|
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
E2E_TESTS: true
|
E2E_TESTS: true
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ describe('Folders', () => {
|
|||||||
before(() => {
|
before(() => {
|
||||||
cy.resetDatabase();
|
cy.resetDatabase();
|
||||||
cy.enableFeature('sharing');
|
cy.enableFeature('sharing');
|
||||||
|
cy.enableFeature('folders');
|
||||||
cy.enableFeature('advancedPermissions');
|
cy.enableFeature('advancedPermissions');
|
||||||
cy.enableFeature('projectRole:admin');
|
cy.enableFeature('projectRole:admin');
|
||||||
cy.enableFeature('projectRole:editor');
|
cy.enableFeature('projectRole:editor');
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ switch (scenario) {
|
|||||||
testCommand: 'cypress open',
|
testCommand: 'cypress open',
|
||||||
customEnv: {
|
customEnv: {
|
||||||
CYPRESS_NODE_VIEW_VERSION: 2,
|
CYPRESS_NODE_VIEW_VERSION: 2,
|
||||||
N8N_FOLDERS_ENABLED: true,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
@@ -59,7 +58,6 @@ switch (scenario) {
|
|||||||
customEnv: {
|
customEnv: {
|
||||||
CYPRESS_NODE_VIEW_VERSION: 1,
|
CYPRESS_NODE_VIEW_VERSION: 1,
|
||||||
CYPRESS_BASE_URL: 'http://localhost:8080',
|
CYPRESS_BASE_URL: 'http://localhost:8080',
|
||||||
N8N_FOLDERS_ENABLED: true,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
@@ -71,7 +69,6 @@ switch (scenario) {
|
|||||||
customEnv: {
|
customEnv: {
|
||||||
CYPRESS_NODE_VIEW_VERSION: 2,
|
CYPRESS_NODE_VIEW_VERSION: 2,
|
||||||
CYPRESS_BASE_URL: 'http://localhost:8080',
|
CYPRESS_BASE_URL: 'http://localhost:8080',
|
||||||
N8N_FOLDERS_ENABLED: true,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
@@ -85,7 +82,6 @@ switch (scenario) {
|
|||||||
testCommand: `cypress run --headless ${specParam}`,
|
testCommand: `cypress run --headless ${specParam}`,
|
||||||
customEnv: {
|
customEnv: {
|
||||||
CYPRESS_NODE_VIEW_VERSION: 2,
|
CYPRESS_NODE_VIEW_VERSION: 2,
|
||||||
N8N_FOLDERS_ENABLED: true,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -364,13 +364,4 @@ export const schema = {
|
|||||||
env: 'N8N_PROXY_HOPS',
|
env: 'N8N_PROXY_HOPS',
|
||||||
doc: 'Number of reverse-proxies n8n is running behind',
|
doc: 'Number of reverse-proxies n8n is running behind',
|
||||||
},
|
},
|
||||||
|
|
||||||
folders: {
|
|
||||||
enabled: {
|
|
||||||
format: Boolean,
|
|
||||||
default: false,
|
|
||||||
env: 'N8N_FOLDERS_ENABLED',
|
|
||||||
doc: 'Temporary env variable to enable folders feature',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -362,8 +362,7 @@ export class FrontendService {
|
|||||||
|
|
||||||
this.settings.enterprise.projects.team.limit = this.license.getTeamProjectLimit();
|
this.settings.enterprise.projects.team.limit = this.license.getTeamProjectLimit();
|
||||||
|
|
||||||
this.settings.folders.enabled =
|
this.settings.folders.enabled = this.license.isFoldersEnabled();
|
||||||
config.get('folders.enabled') || this.license.isFoldersEnabled();
|
|
||||||
|
|
||||||
return this.settings;
|
return this.settings;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user