@adminide-stack/core 1.1.1-alpha.97 → 1.1.3-alpha.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/lib/constants/billing-plan.d.ts +1 -0
  2. package/lib/constants/billing-plan.js +5 -0
  3. package/lib/constants/billing-plan.js.map +1 -0
  4. package/lib/constants/configuration.d.ts +0 -5
  5. package/lib/constants/configuration.js +1 -6
  6. package/lib/constants/configuration.js.map +1 -1
  7. package/lib/constants/index.d.ts +1 -0
  8. package/lib/constants/index.js +1 -0
  9. package/lib/constants/index.js.map +1 -1
  10. package/lib/core/configurations/configuration.d.ts +14 -11
  11. package/lib/core/configurations/configuration.js +24 -16
  12. package/lib/core/configurations/configuration.js.map +1 -1
  13. package/lib/core/configurations/helpers/configuration.js +4 -4
  14. package/lib/core/configurations/helpers/configuration.js.map +1 -1
  15. package/lib/core/organization/configuration.d.ts +5 -4
  16. package/lib/core/organization/configuration.js +10 -11
  17. package/lib/core/organization/configuration.js.map +1 -1
  18. package/lib/core/organization/organization.d.ts +4 -3
  19. package/lib/core/organization/organization.js +2 -1
  20. package/lib/core/organization/organization.js.map +1 -1
  21. package/lib/enums/integrations-connection-names.d.ts +2 -0
  22. package/lib/enums/integrations-connection-names.js +2 -0
  23. package/lib/enums/integrations-connection-names.js.map +1 -1
  24. package/lib/enums/integrations.d.ts +3 -1
  25. package/lib/enums/integrations.js +2 -0
  26. package/lib/enums/integrations.js.map +1 -1
  27. package/lib/interfaces/configuration/configuration.d.ts +9 -3
  28. package/lib/interfaces/configuration/configuration.js +9 -3
  29. package/lib/interfaces/configuration/configuration.js.map +1 -1
  30. package/lib/interfaces/configuration/configuraton-service.d.ts +12 -1
  31. package/lib/interfaces/enum.d.ts +0 -8
  32. package/lib/interfaces/enum.js +0 -10
  33. package/lib/interfaces/enum.js.map +1 -1
  34. package/lib/interfaces/generated/generated-models.d.ts +1534 -4271
  35. package/lib/interfaces/generated/generated-models.js +469 -3330
  36. package/lib/interfaces/generated/generated-models.js.map +1 -1
  37. package/lib/interfaces/generated/index.d.ts +0 -20
  38. package/lib/interfaces/organization/organization-context-service.d.ts +3 -3
  39. package/lib/interfaces/page-store.d.ts +3 -2
  40. package/lib/interfaces/preferences-service.d.ts +8 -4
  41. package/lib/interfaces/service.d.ts +1 -0
  42. package/lib/interfaces/workbench-exports.js.map +1 -1
  43. package/lib/modules/account-api/enums/index.d.ts +26 -1
  44. package/lib/modules/account-api/enums/index.js +25 -0
  45. package/lib/modules/account-api/enums/index.js.map +1 -1
  46. package/lib/services/abstract-configuration.d.ts +8 -4
  47. package/lib/services/abstract-configuration.js +7 -2
  48. package/lib/services/abstract-configuration.js.map +1 -1
  49. package/lib/utils/flatten-utils.d.ts +1 -0
  50. package/lib/utils/flatten-utils.js +20 -0
  51. package/lib/utils/flatten-utils.js.map +1 -0
  52. package/lib/utils/generate-uri.d.ts +12 -3
  53. package/lib/utils/generate-uri.js +13 -4
  54. package/lib/utils/generate-uri.js.map +1 -1
  55. package/lib/utils/generated-settings-id.js +6 -1
  56. package/lib/utils/generated-settings-id.js.map +1 -1
  57. package/package.json +4 -4
@@ -1,21 +1 @@
1
1
  export * from './generated-models';
2
- import { IUserProjectMeta as IIUserProjectMeta, IIUser as IUser } from './generated-models';
3
- export interface IUserGitProviderInfo {
4
- [key: string]: {
5
- email: string;
6
- username: string;
7
- sshkeyPath: string;
8
- };
9
- }
10
- export { IUser };
11
- export interface IGitGlobalMeta {
12
- email: string;
13
- sshkeyPath: string;
14
- username: string;
15
- }
16
- export interface IUserProjectGitMeta extends IUserGitProviderInfo {
17
- globals: IGitGlobalMeta;
18
- }
19
- export interface IUserProjectMeta extends IIUserProjectMeta {
20
- projects: IUserProjectGitMeta;
21
- }
@@ -1,7 +1,7 @@
1
1
  import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
2
2
  import { Event } from '@vscode-alt/monaco-editor/esm/vs/base/common/event';
3
3
  import { IDisposable } from '@vscode-alt/monaco-editor/esm/vs/base/common/lifecycle';
4
- import { IOrganizationData, IOrganizationIdentifier, IOrganizationResourceCreationData_Input } from '../generated';
4
+ import { IOrganizationData, IOrganizationIdentifier, IResourceCreationData_Input } from '../generated';
5
5
  import { IOrganizationResource, ApplicationState, IOrganizationResourcesChangeEvent, IOrganizationContext } from './organization-context';
6
6
  import { IOrganizationResourceCreationData, ISingleResourceOrganizationIdentifier } from './organizations-context';
7
7
  export interface IOrganizationContextService extends IDisposable {
@@ -57,9 +57,9 @@ export interface IClientOrganizationContextService extends IOrganizationContextS
57
57
  initialize(args: any): any;
58
58
  }
59
59
  export interface IServerOrganizationContextService {
60
- addResources(orgId: string, resourcesToAdd: IOrganizationResourceCreationData_Input[], index?: number): Promise<void>;
60
+ addResources(orgId: string, resourcesToAdd: IResourceCreationData_Input[], index?: number): Promise<void>;
61
61
  removeResources(orgId: string, resourcesToRemove: URI[]): Promise<void>;
62
- updateResources(orgId: string, resourcesToAdd: IOrganizationResourceCreationData_Input[], resourcesToRemove: URI[], index?: number): Promise<void>;
62
+ updateResources(orgId: string, resourcesToAdd: IResourceCreationData_Input[], resourcesToRemove: URI[], index?: number): Promise<void>;
63
63
  getOrganizationContext(orgId: string): Promise<IOrganizationData>;
64
64
  getOrganizationResources(resource: URI): Promise<IOrganizationResource[]>;
65
65
  }
@@ -1,11 +1,12 @@
1
- import { IMenuPosition } from '@common-stack/client-react';
2
- export interface IPageStore {
1
+ import { IMenuPosition, IMappedData } from '@common-stack/client-react';
2
+ export interface IPageStore extends IMappedData {
3
3
  key: string;
4
4
  tab?: string;
5
5
  tabTitle?: string;
6
6
  path: string;
7
7
  exact?: boolean;
8
8
  name?: string;
9
+ authority?: string[];
9
10
  /**
10
11
  * When `exact: false` we may not have an component
11
12
  */
@@ -1,6 +1,10 @@
1
1
  import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
2
- import { ISettingsSubject, IViewerSettingsInput, IRoleInput, IPermissionSubject, IViewerSettingsSubject, IPolicySubject } from './generated';
2
+ import { ISettingsSubject, IViewerSettingsInput, IRoleInput, IPermissionSubject, IViewerSettingsSubject, IPolicySubject, IViewerPoliciesInput } from './generated';
3
3
  import { ConfigurationTarget, IPreferencesInput, IPreferencesOpenOptions_Input as IPreferencesOpenOptions, IContributionSettings } from './generated';
4
+ export declare type IPrefFragment = {
5
+ fragmentName?: string;
6
+ fragmentDoc?: string;
7
+ };
4
8
  export interface IPreferencesService {
5
9
  initiateSettingsFile(resource: URI): Promise<any>;
6
10
  defaultViewerSettingsSubject(target: ConfigurationTarget): ISettingsSubject;
@@ -9,9 +13,9 @@ export interface IPreferencesService {
9
13
  * @param params
10
14
  * @param context
11
15
  */
12
- viewerSettings(params: IViewerSettingsInput): Promise<IViewerSettingsSubject>;
13
- viewerPermissions(params: IRoleInput): Promise<IPermissionSubject>;
14
- viewerPolicies(params: IRoleInput): Promise<IPolicySubject>;
16
+ viewerSettings<T = IViewerSettingsSubject>(input: IViewerSettingsInput, fragment?: IPrefFragment): Promise<T>;
17
+ viewerPolicies<T = IPolicySubject>(input: IViewerPoliciesInput, fragment?: IPrefFragment): Promise<T>;
18
+ viewerPermissions<T = IPermissionSubject>(input: IRoleInput, fragment?: IPrefFragment): Promise<T>;
15
19
  }
16
20
  export interface IPreferenceClientService {
17
21
  readonly defaultKeybindingsResource: URI;
@@ -7,6 +7,7 @@ import { IEnvironmentService } from './environment';
7
7
  import { IRegistry } from './workbench-exports';
8
8
  export interface IClientService {
9
9
  readonly configurationService: IClientConfigurationService;
10
+ readonly permissionService?: IClientConfigurationService;
10
11
  readonly contextKeyService: IContextKeyService;
11
12
  readonly organizationContextService: IOrganizationContextService;
12
13
  readonly lifecycleService: ILifecycleService;
@@ -1 +1 @@
1
- {"version":3,"file":"workbench-exports.js","sourceRoot":"","sources":["../../src/interfaces/workbench-exports.ts"],"names":[],"mappings":";;;AAaA,8CAA8D;AAA1C,kGAAA,UAAU,OAAA"}
1
+ {"version":3,"file":"workbench-exports.js","sourceRoot":"","sources":["../../src/interfaces/workbench-exports.ts"],"names":[],"mappings":";;;AAWA,8CAA8D;AAA1C,kGAAA,UAAU,OAAA"}
@@ -1,15 +1,39 @@
1
1
  export declare enum IPreDefineAccountPermissions {
2
+ secureUser = "account.user.secure",
3
+ guestUser = "account.user.guest",
2
4
  inviteMember = "organization.teams.inviteMember",
3
5
  viewTeams = "organization.teams.view",
4
6
  createTeams = "organization.teams.create",
5
7
  editTeams = "organization.teams.edit",
6
8
  deleteTeams = "organization.teams.delete",
7
9
  manageTeams = "organization.teams.manage",
10
+ accessTeamDashboard = "organization.teams.dashboard.access",
8
11
  viewProjects = "organization.projects.view",
9
12
  createProjects = "organization.projects.create",
10
13
  editProjects = "organization.projects.edit",
11
14
  deleteProjects = "organization.projects.delete",
12
15
  manageProjects = "organization.projects.manage",
16
+ viewProjectStatus = "organization.projects.status.view",
17
+ viewMembers = "organization.members.view",
18
+ createMembers = "organization.members.create",
19
+ editMembers = "organization.members.edit",
20
+ deleteMembers = "organization.members.delete",
21
+ manageMembers = "organization.members.manage",
22
+ viewClients = "organization.clients.view",
23
+ createClients = "organization.clients.create",
24
+ editClients = "organization.clients.edit",
25
+ deleteClients = "organization.clients.delete",
26
+ manageClients = "organization.clients.manage",
27
+ viewTasks = "organization.tasks.view",
28
+ createTasks = "organization.tasks.create",
29
+ editTasks = "organization.tasks.edit",
30
+ deleteTasks = "organization.tasks.delete",
31
+ manageTasks = "organization.tasks.manage",
32
+ viewTags = "organization.tags.view",
33
+ createTags = "organization.tags.create",
34
+ editTags = "organization.tags.edit",
35
+ deleteTags = "organization.tags.delete",
36
+ manageTags = "organization.tags.manage",
13
37
  viewOrganization = "organization.view",
14
38
  createOrganization = "organization.create",
15
39
  editOrganization = "organization.edit",
@@ -22,5 +46,6 @@ export declare enum IPreDefineAccountPermissions {
22
46
  viewPolicies = "organization.policies.view",
23
47
  editPolicies = "organization.policies.edit",
24
48
  viewSettings = "organization.settings.view",
25
- editSettings = "organization.settings.edit"
49
+ editSettings = "organization.settings.edit",
50
+ viewReports = "organization.reports.view"
26
51
  }
@@ -3,17 +3,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.IPreDefineAccountPermissions = void 0;
4
4
  var IPreDefineAccountPermissions;
5
5
  (function (IPreDefineAccountPermissions) {
6
+ IPreDefineAccountPermissions["secureUser"] = "account.user.secure";
7
+ IPreDefineAccountPermissions["guestUser"] = "account.user.guest";
6
8
  IPreDefineAccountPermissions["inviteMember"] = "organization.teams.inviteMember";
7
9
  IPreDefineAccountPermissions["viewTeams"] = "organization.teams.view";
8
10
  IPreDefineAccountPermissions["createTeams"] = "organization.teams.create";
9
11
  IPreDefineAccountPermissions["editTeams"] = "organization.teams.edit";
10
12
  IPreDefineAccountPermissions["deleteTeams"] = "organization.teams.delete";
11
13
  IPreDefineAccountPermissions["manageTeams"] = "organization.teams.manage";
14
+ IPreDefineAccountPermissions["accessTeamDashboard"] = "organization.teams.dashboard.access";
12
15
  IPreDefineAccountPermissions["viewProjects"] = "organization.projects.view";
13
16
  IPreDefineAccountPermissions["createProjects"] = "organization.projects.create";
14
17
  IPreDefineAccountPermissions["editProjects"] = "organization.projects.edit";
15
18
  IPreDefineAccountPermissions["deleteProjects"] = "organization.projects.delete";
16
19
  IPreDefineAccountPermissions["manageProjects"] = "organization.projects.manage";
20
+ IPreDefineAccountPermissions["viewProjectStatus"] = "organization.projects.status.view";
21
+ IPreDefineAccountPermissions["viewMembers"] = "organization.members.view";
22
+ IPreDefineAccountPermissions["createMembers"] = "organization.members.create";
23
+ IPreDefineAccountPermissions["editMembers"] = "organization.members.edit";
24
+ IPreDefineAccountPermissions["deleteMembers"] = "organization.members.delete";
25
+ IPreDefineAccountPermissions["manageMembers"] = "organization.members.manage";
26
+ IPreDefineAccountPermissions["viewClients"] = "organization.clients.view";
27
+ IPreDefineAccountPermissions["createClients"] = "organization.clients.create";
28
+ IPreDefineAccountPermissions["editClients"] = "organization.clients.edit";
29
+ IPreDefineAccountPermissions["deleteClients"] = "organization.clients.delete";
30
+ IPreDefineAccountPermissions["manageClients"] = "organization.clients.manage";
31
+ IPreDefineAccountPermissions["viewTasks"] = "organization.tasks.view";
32
+ IPreDefineAccountPermissions["createTasks"] = "organization.tasks.create";
33
+ IPreDefineAccountPermissions["editTasks"] = "organization.tasks.edit";
34
+ IPreDefineAccountPermissions["deleteTasks"] = "organization.tasks.delete";
35
+ IPreDefineAccountPermissions["manageTasks"] = "organization.tasks.manage";
36
+ IPreDefineAccountPermissions["viewTags"] = "organization.tags.view";
37
+ IPreDefineAccountPermissions["createTags"] = "organization.tags.create";
38
+ IPreDefineAccountPermissions["editTags"] = "organization.tags.edit";
39
+ IPreDefineAccountPermissions["deleteTags"] = "organization.tags.delete";
40
+ IPreDefineAccountPermissions["manageTags"] = "organization.tags.manage";
17
41
  IPreDefineAccountPermissions["viewOrganization"] = "organization.view";
18
42
  IPreDefineAccountPermissions["createOrganization"] = "organization.create";
19
43
  IPreDefineAccountPermissions["editOrganization"] = "organization.edit";
@@ -27,5 +51,6 @@ var IPreDefineAccountPermissions;
27
51
  IPreDefineAccountPermissions["editPolicies"] = "organization.policies.edit";
28
52
  IPreDefineAccountPermissions["viewSettings"] = "organization.settings.view";
29
53
  IPreDefineAccountPermissions["editSettings"] = "organization.settings.edit";
54
+ IPreDefineAccountPermissions["viewReports"] = "organization.reports.view";
30
55
  })(IPreDefineAccountPermissions = exports.IPreDefineAccountPermissions || (exports.IPreDefineAccountPermissions = {}));
31
56
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/modules/account-api/enums/index.ts"],"names":[],"mappings":";;;AAAA,IAAY,4BA4BX;AA5BD,WAAY,4BAA4B;IACtC,gFAAgD,CAAA;IAChD,qEAAqC,CAAA;IACrC,yEAAyC,CAAA;IACzC,qEAAqC,CAAA;IACrC,yEAAyC,CAAA;IACzC,yEAAyC,CAAA;IAEzC,2EAA2C,CAAA;IAC3C,+EAA+C,CAAA;IAC/C,2EAA2C,CAAA;IAC3C,+EAA+C,CAAA;IAC/C,+EAA+C,CAAA;IAE/C,sEAAsC,CAAA;IACtC,0EAA0C,CAAA;IAC1C,sEAAsC,CAAA;IACtC,0EAA0C,CAAA;IAC1C,0EAA0C,CAAA;IAE1C,qEAAqC,CAAA;IACrC,qEAAsC,CAAA;IACtC,iFAAiD,CAAA;IACjD,iFAAiD,CAAA;IACjD,2EAA2C,CAAA;IAC3C,2EAA2C,CAAA;IAC3C,2EAA2C,CAAA;IAC3C,2EAA2C,CAAA;AAC7C,CAAC,EA5BW,4BAA4B,GAA5B,oCAA4B,KAA5B,oCAA4B,QA4BvC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/modules/account-api/enums/index.ts"],"names":[],"mappings":";;;AAAA,IAAY,4BA0DX;AA1DD,WAAY,4BAA4B;IACtC,kEAAkC,CAAA;IAClC,gEAAgC,CAAA;IAChC,gFAAgD,CAAA;IAChD,qEAAqC,CAAA;IACrC,yEAAyC,CAAA;IACzC,qEAAqC,CAAA;IACrC,yEAAyC,CAAA;IACzC,yEAAyC,CAAA;IACzC,2FAA2D,CAAA;IAE3D,2EAA2C,CAAA;IAC3C,+EAA+C,CAAA;IAC/C,2EAA2C,CAAA;IAC3C,+EAA+C,CAAA;IAC/C,+EAA+C,CAAA;IAC/C,uFAAuD,CAAA;IAEvD,yEAAyC,CAAA;IACzC,6EAA6C,CAAA;IAC7C,yEAAyC,CAAA;IACzC,6EAA6C,CAAA;IAC7C,6EAA6C,CAAA;IAE7C,yEAAyC,CAAA;IACzC,6EAA6C,CAAA;IAC7C,yEAAyC,CAAA;IACzC,6EAA6C,CAAA;IAC7C,6EAA6C,CAAA;IAE7C,qEAAqC,CAAA;IACrC,yEAAyC,CAAA;IACzC,qEAAqC,CAAA;IACrC,yEAAyC,CAAA;IACzC,yEAAyC,CAAA;IAEzC,mEAAmC,CAAA;IACnC,uEAAuC,CAAA;IACvC,mEAAmC,CAAA;IACnC,uEAAuC,CAAA;IACvC,uEAAuC,CAAA;IAEvC,sEAAsC,CAAA;IACtC,0EAA0C,CAAA;IAC1C,sEAAsC,CAAA;IACtC,0EAA0C,CAAA;IAC1C,0EAA0C,CAAA;IAE1C,qEAAqC,CAAA;IACrC,qEAAsC,CAAA;IACtC,iFAAiD,CAAA;IACjD,iFAAiD,CAAA;IACjD,2EAA2C,CAAA;IAC3C,2EAA2C,CAAA;IAC3C,2EAA2C,CAAA;IAC3C,2EAA2C,CAAA;IAE3C,yEAAyC,CAAA;AAC3C,CAAC,EA1DW,4BAA4B,GAA5B,oCAA4B,KAA5B,oCAA4B,QA0DvC"}
@@ -1,7 +1,9 @@
1
- import { IClientConfigurationService, IConfigurationChangeEvent, IConfigurationOverrides, ConfigurationTarget, IConfigurationData, IOrganizationResource, IIConfigurationModel, IOrganizationContext } from '../interfaces';
1
+ import { IClientConfigurationService, IConfigurationChangeEvent, IConfigurationOverrides, ConfigurationTarget, IConfigurationData, IConfigurationModel, IOrganizationResource, IIResourceData, IIConfigurationModel, IOrganizationContext } from '../interfaces';
2
2
  import { IDisposable } from '@vscode-alt/monaco-editor/esm/vs/base/common/lifecycle';
3
3
  import { Disposable } from '@workbench-stack/core';
4
4
  import { OrganizationConfiguration as Configuration, ConfigurationModel } from '../core';
5
+ import { ResourceMap } from '@vscode-alt/monaco-editor/esm/vs/base/common/map';
6
+ import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
5
7
  import { CdmLogger } from '@cdm-logger/core';
6
8
  import { Event, Emitter } from '@vscode-alt/monaco-editor/esm/vs/base/common/event';
7
9
  declare type ILogger = CdmLogger.ILogger;
@@ -13,6 +15,7 @@ export declare abstract class AbstractOrganizationConfigurationClientService ext
13
15
  protected readonly _onDidChangeConfiguration: Emitter<IConfigurationChangeEvent>;
14
16
  readonly onDidChangeConfiguration: Event<IConfigurationChangeEvent>;
15
17
  abstract initialize(organizationContext: any): any;
18
+ abstract loadResourceConfiguration(resources: IIResourceData[], force: any): any;
16
19
  get configuration(): Configuration;
17
20
  set configuration(configuration: Configuration);
18
21
  getConfigurationData(): IConfigurationData;
@@ -27,11 +30,12 @@ export declare abstract class AbstractOrganizationConfigurationClientService ext
27
30
  abstract updateValue(key: string, value: any, overrides: IConfigurationOverrides, target: ConfigurationTarget, donotNotifyError: boolean): Promise<void>;
28
31
  abstract updateValue(key: string, value: any, arg3?: any, arg4?: any, donotNotifyError?: any): Promise<void>;
29
32
  abstract reloadConfiguration(resource?: IOrganizationResource): Promise<void>;
33
+ abstract externalConfiguration?(resource: URI): IConfigurationModel;
30
34
  inspect<T>(key: string, overrides?: IConfigurationOverrides): {
31
35
  default: T;
32
36
  user: T;
33
- userLocal?: T;
34
- userRemote?: T;
37
+ application?: T;
38
+ machine?: T;
35
39
  organization?: T;
36
40
  organizationResource?: T;
37
41
  memory?: T;
@@ -44,7 +48,7 @@ export declare abstract class AbstractOrganizationConfigurationClientService ext
44
48
  organizationResource: string[];
45
49
  };
46
50
  extAcceptConfigurationChanged(data: IConfigurationData, event: IConfigurationChangeEvent): void;
47
- static parse(data: IConfigurationData, organization: IOrganizationContext): Configuration;
51
+ static parse(data: IConfigurationData, organization: IOrganizationContext, previousConfiguration?: ConfigurationModel, prevResourceConfigurations?: ResourceMap<ConfigurationModel>): Configuration;
48
52
  protected static parseConfigurationModel(model: IIConfigurationModel): ConfigurationModel;
49
53
  }
50
54
  export {};
@@ -39,6 +39,10 @@ let AbstractOrganizationConfigurationClientService = AbstractOrganizationConfigu
39
39
  getValue(arg1, arg2) {
40
40
  const section = typeof arg1 === 'string' ? arg1 : undefined;
41
41
  const overrides = core_2.isConfigurationOverrides(arg1) ? arg1 : core_2.isConfigurationOverrides(arg2) ? arg2 : {};
42
+ if (overrides === null || overrides === void 0 ? void 0 : overrides.externalResource) {
43
+ const externalConfiguration = this.externalConfiguration(overrides.externalResource);
44
+ return this.configuration.getValue(section, overrides, undefined, externalConfiguration);
45
+ }
42
46
  return this.configuration.getValue(section, overrides);
43
47
  }
44
48
  inspect(key, overrides) {
@@ -52,15 +56,16 @@ let AbstractOrganizationConfigurationClientService = AbstractOrganizationConfigu
52
56
  // this._confugrationScopes = data.configurationScopes;
53
57
  this._onDidChangeConfiguration.fire(event);
54
58
  }
55
- static parse(data, organization) {
59
+ static parse(data, organization, previousConfiguration, prevResourceConfigurations) {
56
60
  const defaultConfiguration = AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.defaults);
57
61
  const userConfiguration = AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.user);
62
+ const machineConfiguration = data.machine ? AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.machine) : new core_2.ConfigurationModel();
58
63
  const organizationConfiguration = AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.organization);
59
64
  const resources = Object.keys(data.resources).reduce((result, key) => {
60
65
  result.set(uri_1.URI.parse(key), AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.resources[key]));
61
66
  return result;
62
67
  }, new map_1.ResourceMap());
63
- return new core_2.OrganizationConfiguration(defaultConfiguration, userConfiguration, new core_2.ConfigurationModel(), organizationConfiguration, resources, new core_2.ConfigurationModel(), new map_1.ResourceMap(), organization);
68
+ return new core_2.OrganizationConfiguration(defaultConfiguration, userConfiguration, machineConfiguration, organizationConfiguration, resources, previousConfiguration || new core_2.ConfigurationModel(), prevResourceConfigurations || new map_1.ResourceMap(), organization);
64
69
  }
65
70
  static parseConfigurationModel(model) {
66
71
  return new core_2.ConfigurationModel(model.contents, model.keys, model.overrides).freeze();
@@ -1 +1 @@
1
- {"version":3,"file":"abstract-configuration.js","sourceRoot":"","sources":["../../src/services/abstract-configuration.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"abstract-configuration.js","sourceRoot":"","sources":["../../src/services/abstract-configuration.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAA+C;AAM/C,gDAAmD;AACnD,kCAAmH;AACnH,0EAA+E;AAC/E,0EAAuE;AAEvE,8EAAoF;AAKpF,IAAsB,8CAA8C,sDAApE,MAAsB,8CAA+C,SAAQ,iBAAU;IAMnF,YAEI,MAAe;QAEf,KAAK,EAAE,CAAC;QAIO,8BAAyB,GAAuC,IAAI,CAAC,SAAS,CAAC,IAAI,eAAO,EAA6B,CAAC,CAAC;QAC5H,6BAAwB,GAAqC,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;QAJ9G,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,wCAAwC,EAAE,CAAC,CAAC;IACxF,CAAC;IASD,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IACD,IAAI,aAAa,CAAC,aAA4B;QAC1C,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACxC,CAAC;IAEM,oBAAoB;QACvB,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;IACvC,CAAC;IAOM,QAAQ,CAAC,IAAU,EAAE,IAAU;QAClC,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5D,MAAM,SAAS,GAAG,+BAAwB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,+BAAwB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACrG,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,gBAAgB,EAAE;YAC7B,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;YACrF,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,qBAAqB,CAAC,CAAC;SAC5F;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3D,CAAC;IAaM,OAAO,CAAI,GAAW,EAAE,SAAmC;QAU9D,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAI,GAAG,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IACM,IAAI;QAMP,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;IACrC,CAAC;IAEM,6BAA6B,CAAC,IAAwB,EAAE,KAAgC;QAC3F,IAAI,CAAC,cAAc,GAAG,gDAA8C,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACpG,uDAAuD;QACvD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,IAAwB,EAAE,YAAkC,EAAE,qBAA0C,EAAE,0BAA4D;QACtL,MAAM,oBAAoB,GAAG,gDAA8C,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnH,MAAM,iBAAiB,GAAG,gDAA8C,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5G,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,gDAA8C,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA,CAAC,CAAC,IAAI,yBAAkB,EAAE,CAAC;QAC3J,MAAM,yBAAyB,GAAG,gDAA8C,CAAC,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5H,MAAM,SAAS,GAAoC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YAClG,MAAM,CAAC,GAAG,CAAC,SAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,gDAA8C,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACxH,OAAO,MAAM,CAAC;QAClB,CAAC,EAAE,IAAI,iBAAW,EAAsB,CAAC,CAAC;QAC1C,OAAO,IAAI,gCAAa,CACpB,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,EACpB,yBAAyB,EACzB,SAAS,EACT,qBAAqB,IAAI,IAAI,yBAAkB,EAAE,EACjD,0BAA0B,IAAI,IAAI,iBAAW,EAAsB,EACnE,YAAY,CACf,CAAC;IACN,CAAC;IAES,MAAM,CAAC,uBAAuB,CAAC,KAA2B;QAChE,OAAO,IAAI,yBAAkB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;IACxF,CAAC;CACJ,CAAA;AA7GqB,8CAA8C;IADnE,sBAAU,EAAE;IAQJ,WAAA,kBAAM,CAAC,QAAQ,CAAC,CAAA;;GAPH,8CAA8C,CA6GnE;AA7GqB,wGAA8C"}
@@ -0,0 +1 @@
1
+ export declare function flatten<T extends Record<string, any>>(object: T, path?: string | null, separator?: string): T;
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.flatten = void 0;
4
+ function flatten(object, path = null, separator = '.') {
5
+ return Object.keys(object).reduce((acc, key) => {
6
+ const value = object[key];
7
+ const newPath = [path, key].filter(Boolean).join(separator);
8
+ const isObject = [
9
+ typeof value === 'object',
10
+ value !== null,
11
+ !(value instanceof Date),
12
+ !(value instanceof RegExp),
13
+ !(Array.isArray(value) && value.length === 0),
14
+ ].every(Boolean);
15
+ return isObject
16
+ ? Object.assign(Object.assign({}, acc), flatten(value, newPath, separator)) : Object.assign(Object.assign({}, acc), { [newPath]: value });
17
+ }, {});
18
+ }
19
+ exports.flatten = flatten;
20
+ //# sourceMappingURL=flatten-utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"flatten-utils.js","sourceRoot":"","sources":["../../src/utils/flatten-utils.ts"],"names":[],"mappings":";;;AAEA,SAAgB,OAAO,CACnB,MAAS,EACT,OAAsB,IAAI,EAC1B,SAAS,GAAG,GAAG;IAEf,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,GAAM,EAAE,GAAW,EAAK,EAAE;QAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAE1B,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE5D,MAAM,QAAQ,GAAG;YACf,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,CAAC,CAAC,KAAK,YAAY,IAAI,CAAC;YACxB,CAAC,CAAC,KAAK,YAAY,MAAM,CAAC;YAC1B,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;SAC9C,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEjB,OAAO,QAAQ;YACb,CAAC,iCAAM,GAAG,GAAK,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,EACjD,CAAC,iCAAM,GAAG,KAAE,CAAC,OAAO,CAAC,EAAE,KAAK,GAAE,CAAC;IACnC,CAAC,EAAE,EAAO,CAAC,CAAC;AACd,CAAC;AAtBH,0BAsBG"}
@@ -9,18 +9,27 @@ import { IConfigCollectionName, IConfigFragmentName } from '../interfaces';
9
9
  */
10
10
  export declare const generateUri: (collectionName: IConfigCollectionName, params: {
11
11
  [key: string]: any;
12
- }, fragment: string, authority?: string) => URI;
12
+ }, fragment: string, authority?: string, options?: {
13
+ flatten: boolean;
14
+ }) => URI;
13
15
  /**
14
16
  * Generates URI for User with `_id` as `self` if the user logged in otherwise `guest`
15
17
  */
16
- export declare const generateUserUri: (userProxyId: 'self' | 'guest', fragment?: IConfigFragmentName) => URI;
18
+ export declare const generateProxyUserUri: (userProxyId: 'self' | 'guest', fragment?: IConfigFragmentName, authority?: string) => URI;
19
+ /**
20
+ * Generates URI for User with `_id` as `self` if the user logged in otherwise `guest`
21
+ */
22
+ export declare const generateUserUri: (params: {
23
+ [key: string]: any;
24
+ }, fragment?: IConfigFragmentName, authority?: string) => URI;
17
25
  /**
18
26
  * Generates URI for Application
19
27
  */
20
- export declare const generateApplicationUri: (orgName: string, fragment?: IConfigFragmentName) => URI;
28
+ export declare const generateApplicationUri: (orgName: string, fragment?: IConfigFragmentName, authority?: string) => URI;
21
29
  export declare const generateResourceUri: (collectionName: IConfigCollectionName, params: {
22
30
  [key: string]: any;
23
31
  name: string;
24
32
  orgName: string;
25
33
  }, fragment: string, authority?: string) => URI;
26
34
  export declare const generateOrgUri: (name: any, fragment: string, authority?: string) => URI;
35
+ export declare const generateMachineUri: (name: any, fragment: string, authority?: string) => URI;
@@ -1,8 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.generateOrgUri = exports.generateResourceUri = exports.generateApplicationUri = exports.generateUserUri = exports.generateUri = void 0;
3
+ exports.generateMachineUri = exports.generateOrgUri = exports.generateResourceUri = exports.generateApplicationUri = exports.generateUserUri = exports.generateProxyUserUri = exports.generateUri = void 0;
4
4
  const core_1 = require("@workbench-stack/core");
5
5
  const uri_1 = require("@vscode-alt/monaco-editor/esm/vs/base/common/uri");
6
+ const flatten_utils_1 = require("./flatten-utils");
6
7
  const sortKeys = require('sort-keys');
7
8
  const querystring = require('querystring');
8
9
  /**
@@ -12,7 +13,8 @@ const querystring = require('querystring');
12
13
  * @param fragment
13
14
  * @param authority
14
15
  */
15
- const generateUri = (collectionName, params, fragment, authority = '') => {
16
+ const generateUri = (collectionName, params, fragment, authority = '', options = { flatten: false }) => {
17
+ params = options.flatten ? flatten_utils_1.flatten(params) : params;
16
18
  const orderedParams = sortKeys(params);
17
19
  const queryString = querystring.stringify(orderedParams);
18
20
  return uri_1.URI.file(`/${collectionName}`).with({
@@ -26,15 +28,22 @@ exports.generateUri = generateUri;
26
28
  /**
27
29
  * Generates URI for User with `_id` as `self` if the user logged in otherwise `guest`
28
30
  */
29
- const generateUserUri = (userProxyId, fragment = "settings" /* settings */) => exports.generateUri("accounts" /* accounts */, { _id: userProxyId }, fragment, '');
31
+ const generateProxyUserUri = (userProxyId, fragment = "settings" /* settings */, authority = '') => exports.generateUri("accounts" /* accounts */, { _id: userProxyId }, fragment, authority);
32
+ exports.generateProxyUserUri = generateProxyUserUri;
33
+ /**
34
+ * Generates URI for User with `_id` as `self` if the user logged in otherwise `guest`
35
+ */
36
+ const generateUserUri = (params, fragment = "settings" /* settings */, authority = '') => exports.generateUri("accounts" /* accounts */, params, fragment, authority);
30
37
  exports.generateUserUri = generateUserUri;
31
38
  /**
32
39
  * Generates URI for Application
33
40
  */
34
- const generateApplicationUri = (orgName, fragment = "settings" /* settings */) => exports.generateUri("organizations" /* organizations */, { orgName }, fragment, '');
41
+ const generateApplicationUri = (orgName, fragment = "settings" /* settings */, authority = '') => exports.generateUri("organizations" /* organizations */, { orgName }, fragment, authority);
35
42
  exports.generateApplicationUri = generateApplicationUri;
36
43
  const generateResourceUri = (collectionName, params, fragment, authority = '') => exports.generateUri(collectionName, params, fragment, authority);
37
44
  exports.generateResourceUri = generateResourceUri;
38
45
  const generateOrgUri = (name, fragment, authority = '') => exports.generateUri("organizations" /* organizations */, { name }, fragment, authority);
39
46
  exports.generateOrgUri = generateOrgUri;
47
+ const generateMachineUri = (name, fragment, authority = '') => exports.generateUri("machines" /* machines */, { name }, fragment, authority);
48
+ exports.generateMachineUri = generateMachineUri;
40
49
  //# sourceMappingURL=generate-uri.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"generate-uri.js","sourceRoot":"","sources":["../../src/utils/generate-uri.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,0EAAuE;AAGvE,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAEtC,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAE3C;;;;;;GAMG;AACI,MAAM,WAAW,GAAG,CACvB,cAAqC,EACrC,MAA8B,EAC9B,QAAgB,EAChB,SAAS,GAAG,EAAE,EAChB,EAAE;IACA,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAEzD,OAAO,SAAG,CAAC,IAAI,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC;QACvC,MAAM,EAAE,cAAO,CAAC,WAAW;QAC3B,SAAS;QACT,QAAQ;QACR,KAAK,EAAE,WAAW;KACrB,CAAC,CAAC;AACP,CAAC,CAAC;AAfW,QAAA,WAAW,eAetB;AAEF;;GAEG;AACI,MAAM,eAAe,GAAG,CAAC,WAA6B,EAAE,QAAQ,4BAA+B,EAAE,EAAE,CACtG,mBAAW,4BAAiC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AADvE,QAAA,eAAe,mBACwD;AAEpF;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,QAAQ,4BAA+B,EAAE,EAAE,CAC/F,mBAAW,sCAAsC,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;AADnE,QAAA,sBAAsB,0BAC6C;AAEzE,MAAM,mBAAmB,GAAG,CAC/B,cAAqC,EACrC,MAA6D,EAC7D,QAAgB,EAChB,SAAS,GAAG,EAAE,EAChB,EAAE,CAAC,mBAAW,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AALjD,QAAA,mBAAmB,uBAK8B;AAEvD,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,QAAgB,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CACrE,mBAAW,sCAAsC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AADvE,QAAA,cAAc,kBACyD"}
1
+ {"version":3,"file":"generate-uri.js","sourceRoot":"","sources":["../../src/utils/generate-uri.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,0EAAuE;AAEvE,mDAA0C;AAE1C,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAEtC,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAE3C;;;;;;GAMG;AACI,MAAM,WAAW,GAAG,CACvB,cAAqC,EACrC,MAA8B,EAC9B,QAAgB,EAChB,SAAS,GAAG,EAAE,EACd,OAAO,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,EAC9B,EAAE;IACA,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACpD,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAEzD,OAAO,SAAG,CAAC,IAAI,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC;QACvC,MAAM,EAAE,cAAO,CAAC,WAAW;QAC3B,SAAS;QACT,QAAQ;QACR,KAAK,EAAE,WAAW;KACrB,CAAC,CAAC;AACP,CAAC,CAAC;AAjBW,QAAA,WAAW,eAiBtB;AAEF;;GAEG;AACI,MAAM,oBAAoB,GAAG,CAAC,WAA6B,EAAE,QAAQ,4BAA+B,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CAC3H,mBAAW,4BAAiC,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAD9E,QAAA,oBAAoB,wBAC0D;AAE3F;;EAEE;AACK,MAAM,eAAe,GAAG,CAAC,MAA8B,EAAE,QAAQ,4BAA+B,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CACvH,mBAAW,4BAAiC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AADhE,QAAA,eAAe,mBACiD;AAE7E;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAAC,OAAe,EAAE,QAAQ,4BAA+B,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CAC/G,mBAAW,sCAAsC,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAD1E,QAAA,sBAAsB,0BACoD;AAEhF,MAAM,mBAAmB,GAAG,CAC/B,cAAqC,EACrC,MAA6D,EAC7D,QAAgB,EAChB,SAAS,GAAG,EAAE,EAChB,EAAE,CAAC,mBAAW,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AALjD,QAAA,mBAAmB,uBAK8B;AAEvD,MAAM,cAAc,GAAG,CAAC,IAAI,EAAE,QAAgB,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CACrE,mBAAW,sCAAsC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AADvE,QAAA,cAAc,kBACyD;AAE7E,MAAM,kBAAkB,GAAG,CAAC,IAAI,EAAE,QAAgB,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CACzE,mBAAW,4BAAiC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;AADjE,QAAA,kBAAkB,sBAC+C"}
@@ -2,6 +2,11 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.generateSettingsId = void 0;
4
4
  // not used anymore
5
- const generateSettingsId = (target, nativeId = "defaultSettings" /* defaultSettings */) => `${nativeId}_${target}`;
5
+ const generateSettingsId = (target, nativeId = "defaultSettings" /* defaultSettings */) => {
6
+ if (!nativeId) {
7
+ nativeId = "defaultSettings" /* defaultSettings */;
8
+ }
9
+ return `${nativeId}_${target}`;
10
+ };
6
11
  exports.generateSettingsId = generateSettingsId;
7
12
  //# sourceMappingURL=generated-settings-id.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"generated-settings-id.js","sourceRoot":"","sources":["../../src/utils/generated-settings-id.ts"],"names":[],"mappings":";;;AAGA,mBAAmB;AACZ,MAAM,kBAAkB,GAAG,CAAC,MAA2B,EAAE,kDAAkE,EAAE,EAAE,CAAC,GAAG,QAAQ,IAAI,MAAM,EAAE,CAAC;AAAlJ,QAAA,kBAAkB,sBAAgI"}
1
+ {"version":3,"file":"generated-settings-id.js","sourceRoot":"","sources":["../../src/utils/generated-settings-id.ts"],"names":[],"mappings":";;;AAGA,mBAAmB;AACZ,MAAM,kBAAkB,GAAG,CAAC,MAA2B,EAAE,kDAAkE,EAAE,EAAE;IAClI,IAAI,CAAC,QAAQ,EAAE;QACX,QAAQ,0CAAkD,CAAC;KAC9D;IACD,OAAO,GAAG,QAAQ,IAAI,MAAM,EAAE,CAAC;AACnC,CAAC,CAAC;AALW,QAAA,kBAAkB,sBAK7B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@adminide-stack/core",
3
- "version": "1.1.1-alpha.97",
3
+ "version": "1.1.3-alpha.8",
4
4
  "description": "AdminIDE core for higher packages to depend on",
5
5
  "license": "ISC",
6
6
  "author": "CDMBase LLC",
@@ -39,12 +39,12 @@
39
39
  },
40
40
  "dependencies": {
41
41
  "@vscode-alt/monaco-editor": "^0.21.2",
42
- "@workbench-stack/core": "2.1.1-alpha.0",
42
+ "@workbench-stack/core": "2.1.1-alpha.3",
43
43
  "querystring": "^0.2.0",
44
44
  "sort-keys": "^4.0.0"
45
45
  },
46
46
  "peerDependencies": {
47
- "@common-stack/server-core": ">=0.1.7"
47
+ "@common-stack/server-core": ">=0.2.4"
48
48
  },
49
49
  "publishConfig": {
50
50
  "access": "public"
@@ -52,5 +52,5 @@
52
52
  "typescript": {
53
53
  "definition": "lib/index.d.ts"
54
54
  },
55
- "gitHead": "21e07937c2b3f4600505d0acdda81e8a5270c416"
55
+ "gitHead": "3dbd9396eaca4df069bf04f3edc0d240692aee46"
56
56
  }