mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-25 04:34:06 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Rename advancedFilters to advancedExecutionFilters (#5643)

Browse source 
rename advancedFilters to advancedExecutionFilters
This commit is contained in:
Michael Auerswald 2023-03-07 18:35:52 +01:00 committed by GitHub
parent e52aa46842
commit 419969c0d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/cli/src/Interfaces.ts
View file

@ -524,7 +524,7 @@ export interface IN8nUISettings {
ldap: boolean;
saml: boolean;
logStreaming: boolean;
advancedFilters: boolean;
advancedExecutionFilters: boolean;
};
hideUsagePage: boolean;
license: {

4
packages/cli/src/License.ts
View file

@ -106,8 +106,8 @@ export class License {
return this.isFeatureEnabled(LICENSE_FEATURES.SAML);
}
isAdvancedFiltersEnabled() {
return this.isFeatureEnabled(LICENSE_FEATURES.ADVANCED_FILTERS);
isAdvancedExecutionFiltersEnabled() {
return this.isFeatureEnabled(LICENSE_FEATURES.ADVANCED_EXECUTION_FILTERS);
}
getCurrentEntitlements() {

6
packages/cli/src/Server.ts
View file

@ -146,7 +146,7 @@ import { Container } from 'typedi';
import { InternalHooks } from './InternalHooks';
import {
getStatusUsingPreviousExecutionStatusMethod,
isAdvancedFiltersEnabled,
isAdvancedExecutionFiltersEnabled,
} from './executions/executionHelpers';
import { getSamlLoginLabel, isSamlLoginEnabled, isSamlLicensed } from './sso/saml/samlHelpers';
import { samlControllerPublic } from './sso/saml/routes/saml.controller.public.ee';
@ -303,7 +303,7 @@ class Server extends AbstractServer {
ldap: false,
saml: false,
logStreaming: config.getEnv('enterprise.features.logStreaming'),
advancedFilters: config.getEnv('enterprise.features.advancedFilters'),
advancedExecutionFilters: config.getEnv('enterprise.features.advancedExecutionFilters'),
},
hideUsagePage: config.getEnv('hideUsagePage'),
license: {
@ -332,7 +332,7 @@ class Server extends AbstractServer {
logStreaming: isLogStreamingEnabled(),
ldap: isLdapEnabled(),
saml: isSamlLicensed(),
advancedFilters: isAdvancedFiltersEnabled(),
advancedExecutionFilters: isAdvancedExecutionFiltersEnabled(),
});
if (isLdapEnabled()) {

2
packages/cli/src/config/schema.ts
View file

@ -1008,7 +1008,7 @@ export const schema = {
format: Boolean,
default: false,
},
advancedFilters: {
advancedExecutionFilters: {
format: Boolean,
default: false,
},

2
packages/cli/src/constants.ts
View file

@ -72,7 +72,7 @@ export enum LICENSE_FEATURES {
LDAP = 'feat:ldap',
SAML = 'feat:saml',
LOG_STREAMING = 'feat:logStreaming',
ADVANCED_FILTERS = 'feat:advancedFilters',
ADVANCED_EXECUTION_FILTERS = 'feat:advancedExecutionFilters',
}
export const CREDENTIAL_BLANKING_VALUE = '__n8n_BLANK_VALUE_e5362baf-c777-4d57-a609-6eaf1f9e87f6';

7
packages/cli/src/executions/executionHelpers.ts
View file

@ -19,7 +19,10 @@ export function getStatusUsingPreviousExecutionStatusMethod(
}
}
export function isAdvancedFiltersEnabled(): boolean {
export function isAdvancedExecutionFiltersEnabled(): boolean {
const license = getLicense();
return config.getEnv('enterprise.features.advancedFilters') || license.isAdvancedFiltersEnabled();
return (
config.getEnv('enterprise.features.advancedExecutionFilters') ||
license.isAdvancedExecutionFiltersEnabled()
);
}