@adminide-stack/core 3.1.4-alpha.17 → 3.1.4-alpha.32
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.
- package/lib/interfaces/configuration/configuraton-service.d.ts +4 -0
- package/lib/interfaces/organization/organization-context-service.d.ts +7 -0
- package/lib/services/abstract-configuration.d.ts +1 -1
- package/lib/services/abstract-configuration.js +14 -5
- package/lib/services/abstract-configuration.js.map +1 -1
- package/lib/services/abstract-organization-context-service.d.ts +4 -1
- package/lib/services/abstract-organization-context-service.js +20 -10
- package/lib/services/abstract-organization-context-service.js.map +1 -1
- package/package.json +2 -2
|
@@ -5,6 +5,7 @@ import { ConfigurationTarget, IConfigurationValue } from './configuration';
|
|
|
5
5
|
import { IConfigurationChangeEvent } from './event';
|
|
6
6
|
import { IConfigurationOverrides, IConfigurationData, IConfigurationModel, IIResourceData, IIConfigurationModel } from '../generated';
|
|
7
7
|
import { IOrganizationContext } from '../organization';
|
|
8
|
+
import { Configuration } from '../../core';
|
|
8
9
|
export interface IConfigurationService extends IDisposable {
|
|
9
10
|
onDidChangeConfiguration: Event<IConfigurationChangeEvent>;
|
|
10
11
|
getConfigurationData(): IConfigurationData;
|
|
@@ -45,11 +46,14 @@ export interface IConfigurationService extends IDisposable {
|
|
|
45
46
|
};
|
|
46
47
|
}
|
|
47
48
|
export interface IClientConfigurationService extends IConfigurationService {
|
|
49
|
+
get configuration(): Configuration;
|
|
50
|
+
set configuration(configuration: Configuration);
|
|
48
51
|
externalConfiguration?(resource: URI): IConfigurationModel;
|
|
49
52
|
extAcceptConfigurationChanged(data: IConfigurationData, event: IConfigurationChangeEvent): void;
|
|
50
53
|
}
|
|
51
54
|
export interface IUserClientConfigurationService extends IClientConfigurationService {
|
|
52
55
|
userId: string;
|
|
56
|
+
isGuest: boolean;
|
|
53
57
|
}
|
|
54
58
|
export interface IConfigurationMicroserviceEvent {
|
|
55
59
|
onDidChangeConfiguration: (event: IConfigurationChangeEvent) => Promise<void>;
|
|
@@ -4,6 +4,7 @@ import { IDisposable } from '@vscode-alt/monaco-editor/esm/vs/base/common/lifecy
|
|
|
4
4
|
import { IOrganizationData, IOrganizationIdentifier, IResourceCreationDataInput } from '../generated';
|
|
5
5
|
import { IOrganizationResource, ApplicationState, IOrganizationResourcesChangeEvent, IOrganizationContext } from './organization-context';
|
|
6
6
|
import { IOrganizationResourceCreationData, ISingleResourceOrganizationIdentifier } from './organizations-context';
|
|
7
|
+
import { OrganizationContext } from '../../core';
|
|
7
8
|
export interface IOrganizationContextService extends IDisposable {
|
|
8
9
|
/**
|
|
9
10
|
* An event which fires on workbench state changes.
|
|
@@ -17,6 +18,10 @@ export interface IOrganizationContextService extends IDisposable {
|
|
|
17
18
|
* An event which fires on organization resources change.
|
|
18
19
|
*/
|
|
19
20
|
onDidChangeOrganizationResources: Event<IOrganizationResourcesChangeEvent>;
|
|
21
|
+
/**
|
|
22
|
+
* hydrate the organization context
|
|
23
|
+
*/
|
|
24
|
+
hydrate(state: string): any;
|
|
20
25
|
/**
|
|
21
26
|
* Provides access to the complete organization object.
|
|
22
27
|
*/
|
|
@@ -51,6 +56,8 @@ export interface IOrganizationContextService extends IDisposable {
|
|
|
51
56
|
updateResources(resourcesToAdd: IOrganizationResourceCreationData[], resourcesToRemove: URI[], index?: number): Promise<void>;
|
|
52
57
|
}
|
|
53
58
|
export interface IClientOrganizationContextService extends IOrganizationContextService {
|
|
59
|
+
get organizationContext(): OrganizationContext;
|
|
60
|
+
set organizationContext(context: OrganizationContext);
|
|
54
61
|
extAcceptChangedApplicationState(organization: IOrganizationData, event: ApplicationState): any;
|
|
55
62
|
extAcceptChangedOrganizationResources(data: IOrganizationData, event: IOrganizationResourcesChangeEvent): any;
|
|
56
63
|
extAcceptChangedOrganizationName(date: IOrganizationData): any;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { IDisposable } from '@vscode-alt/monaco-editor/esm/vs/base/common/lifecycle';
|
|
2
2
|
import { Disposable } from '@workbench-stack/core';
|
|
3
|
-
import { OrganizationConfiguration as Configuration, ConfigurationModel } from '../core';
|
|
4
3
|
import { ResourceMap } from '@vscode-alt/monaco-editor/esm/vs/base/common/map';
|
|
5
4
|
import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
|
|
6
5
|
import { CdmLogger } from '@cdm-logger/core';
|
|
7
6
|
import { Event, Emitter } from '@vscode-alt/monaco-editor/esm/vs/base/common/event';
|
|
8
7
|
import { InMemoryCache } from '@apollo/client';
|
|
8
|
+
import { OrganizationConfiguration as Configuration, ConfigurationModel } from '../core';
|
|
9
9
|
import { IClientConfigurationService, IConfigurationChangeEvent, IConfigurationOverrides, ConfigurationTarget, IConfigurationData, IConfigurationModel, IOrganizationResource, IIResourceData, IIConfigurationModel, IOrganizationContext, IConfigurationValue, IConfigurationChange } from '../interfaces';
|
|
10
10
|
type ILogger = CdmLogger.ILogger;
|
|
11
11
|
export declare abstract class AbstractOrganizationConfigurationClientService extends Disposable implements IClientConfigurationService, IDisposable {
|
|
@@ -17,11 +17,11 @@ exports.AbstractOrganizationConfigurationClientService = void 0;
|
|
|
17
17
|
const inversify_1 = require("inversify");
|
|
18
18
|
const client_core_1 = require("@common-stack/client-core");
|
|
19
19
|
const core_1 = require("@workbench-stack/core");
|
|
20
|
-
const core_2 = require("../core");
|
|
21
20
|
const map_1 = require("@vscode-alt/monaco-editor/esm/vs/base/common/map");
|
|
22
21
|
const uri_1 = require("@vscode-alt/monaco-editor/esm/vs/base/common/uri");
|
|
23
22
|
const event_1 = require("@vscode-alt/monaco-editor/esm/vs/base/common/event");
|
|
24
23
|
const client_1 = require("@apollo/client");
|
|
24
|
+
const core_2 = require("../core");
|
|
25
25
|
const MAX_EXTERNAL_RESOURCE_SIZE = 5;
|
|
26
26
|
let AbstractOrganizationConfigurationClientService = AbstractOrganizationConfigurationClientService_1 = class AbstractOrganizationConfigurationClientService extends core_1.Disposable {
|
|
27
27
|
constructor(apolloCache, utility, logger) {
|
|
@@ -71,7 +71,10 @@ let AbstractOrganizationConfigurationClientService = AbstractOrganizationConfigu
|
|
|
71
71
|
if (this.externalResources.length >= MAX_EXTERNAL_RESOURCE_SIZE) {
|
|
72
72
|
const oldestResource = this.externalResources.shift();
|
|
73
73
|
this.configuration.deleteResourceConfiguration(oldestResource);
|
|
74
|
-
const resourceId = this.utility.getCacheKey({
|
|
74
|
+
const resourceId = this.utility.getCacheKey({
|
|
75
|
+
__typename: 'MachineConfiguration',
|
|
76
|
+
resource: oldestResource,
|
|
77
|
+
});
|
|
75
78
|
this.apolloCache.evict({ id: resourceId });
|
|
76
79
|
}
|
|
77
80
|
}
|
|
@@ -88,10 +91,16 @@ let AbstractOrganizationConfigurationClientService = AbstractOrganizationConfigu
|
|
|
88
91
|
}
|
|
89
92
|
static parse(data, organization, previousConfiguration, prevResourceConfigurations) {
|
|
90
93
|
const defaultConfiguration = AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.defaults);
|
|
91
|
-
const policyConfiguration = data.policy
|
|
92
|
-
|
|
94
|
+
const policyConfiguration = data.policy
|
|
95
|
+
? AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.policy)
|
|
96
|
+
: new core_2.ConfigurationModel();
|
|
97
|
+
const applicationConfiguration = data.application
|
|
98
|
+
? AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.application)
|
|
99
|
+
: new core_2.ConfigurationModel();
|
|
93
100
|
const userConfiguration = AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.user);
|
|
94
|
-
const machineConfiguration = data.machine
|
|
101
|
+
const machineConfiguration = data.machine
|
|
102
|
+
? AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.machine)
|
|
103
|
+
: new core_2.ConfigurationModel();
|
|
95
104
|
const organizationConfiguration = AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.organization);
|
|
96
105
|
const resources = Object.keys(data.resources).reduce((result, key) => {
|
|
97
106
|
result.set(uri_1.URI.parse(key), AbstractOrganizationConfigurationClientService_1.parseConfigurationModel(data.resources[key]));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-configuration.js","sourceRoot":"","sources":["../../src/services/abstract-configuration.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAA+C;AAC/C,2DAAwD;AAExD,gDAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"abstract-configuration.js","sourceRoot":"","sources":["../../src/services/abstract-configuration.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAA+C;AAC/C,2DAAwD;AAExD,gDAAmD;AACnD,0EAA+E;AAC/E,0EAAuE;AAEvE,8EAAoF;AACpF,2CAA+C;AAC/C,kCAKiB;AAmBjB,MAAM,0BAA0B,GAAG,CAAC,CAAC;AAE9B,IAAe,8CAA8C,sDAA7D,MAAe,8CAClB,SAAQ,iBAAU;IAWlB,YAEc,WAA0B,EAE1B,OAAO,EAEjB,MAAe;QAEf,KAAK,EAAE,CAAC;QANE,gBAAW,GAAX,WAAW,CAAe;QAE1B,YAAO,GAAP,OAAO,CAAA;QASF,8BAAyB,GAAuC,IAAI,CAAC,SAAS,CAC7F,IAAI,eAAO,EAA6B,CAC3C,CAAC;QAEc,6BAAwB,GAAqC,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;QAR9G,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,wCAAwC,EAAE,CAAC,CAAC;IACxF,CAAC;IAYD,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,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;IAUM,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,IAAA,+BAAwB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,+BAAwB,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACrG,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,gBAAgB,EAAE;YAC7B,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;SAChD;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3D,CAAC;IAEO,WAAW,CAAC,QAAa;QAC7B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAC1D,oCAAoC;YACpC,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YACnE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,qBAAqB,CAAC;YAC5D,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAAC,QAAQ,EAAE,IAAI,yBAAkB,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;SAC5G;aAAM;YACH,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;SAC1C;IACL,CAAC;IAEO,uBAAuB,CAAC,QAAa;QACzC,kFAAkF;QAClF,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAEO,eAAe;QACnB,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,IAAI,0BAA0B,EAAE;YAC7D,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;YACtD,IAAI,CAAC,aAAa,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC;YAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;gBACxC,UAAU,EAAE,sBAAsB;gBAClC,QAAQ,EAAE,cAAc;aAC3B,CAAC,CAAC;YACH,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;SAC9C;IACL,CAAC;IA6BM,OAAO,CAAI,GAAW,EAAE,SAAmC;QAC9D,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,CAAI,GAAG,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IAEM,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,CACf,IAAwB,EACxB,YAAkC,EAClC,qBAA0C,EAC1C,0BAA4D;QAE5D,MAAM,oBAAoB,GAAG,gDAA8C,CAAC,uBAAuB,CAC/F,IAAI,CAAC,QAAQ,CAChB,CAAC;QACF,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM;YACnC,CAAC,CAAC,gDAA8C,CAAC,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC;YACrF,CAAC,CAAC,IAAI,yBAAkB,EAAE,CAAC;QAC/B,MAAM,wBAAwB,GAAG,IAAI,CAAC,WAAW;YAC7C,CAAC,CAAC,gDAA8C,CAAC,uBAAuB,CAAC,IAAI,CAAC,WAAW,CAAC;YAC1F,CAAC,CAAC,IAAI,yBAAkB,EAAE,CAAC;QAC/B,MAAM,iBAAiB,GAAG,gDAA8C,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5G,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO;YACrC,CAAC,CAAC,gDAA8C,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC;YACtF,CAAC,CAAC,IAAI,yBAAkB,EAAE,CAAC;QAC/B,MAAM,yBAAyB,GAAG,gDAA8C,CAAC,uBAAuB,CACpG,IAAI,CAAC,YAAY,CACpB,CAAC;QACF,MAAM,SAAS,GAAoC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YAClG,MAAM,CAAC,GAAG,CACN,SAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EACd,gDAA8C,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAC9F,CAAC;YACF,OAAO,MAAM,CAAC;QAClB,CAAC,EAAE,IAAI,iBAAW,EAAsB,CAAC,CAAC;QAC1C,OAAO,IAAI,gCAAa,CACpB,oBAAoB,EACpB,mBAAmB,EACnB,wBAAwB,EACxB,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;IAES,OAAO,CACb,mBAAyC,EACzC,QAA4B,EAC5B,MAA2B;QAE3B,MAAM,KAAK,GAAG,IAAI,+BAAwB,CAAC,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACzG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;QACtB,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAEO,sBAAsB,CAAC,MAA2B;QACtD,QAAQ,MAAM,EAAE;YACZ;gBACI,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACjD;gBACI,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,QAAQ,CAAC;YAC1D;gBACI,OAAO,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,QAAQ,CAAC;YAC7D;gBACI,OAAO,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,QAAQ,CAAC;SACrE;QACD,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;AAnNqB,8CAA8C;IADnE,IAAA,sBAAU,GAAE;IAcJ,WAAA,IAAA,kBAAM,EAAC,yBAAW,CAAC,aAAa,CAAC,CAAA;IAEjC,WAAA,IAAA,kBAAM,EAAC,yBAAW,CAAC,YAAY,CAAC,CAAA;IAEhC,WAAA,IAAA,kBAAM,EAAC,yBAAW,CAAC,MAAM,CAAC,CAAA;qCAHJ,sBAAa;GAdtB,8CAA8C,CAmNnE;AAnNqB,wGAA8C"}
|
|
@@ -7,7 +7,7 @@ import { OrganizationContext } from '../core';
|
|
|
7
7
|
import { IConfigurationChangeEvent, IOrganizationIdentifier, IOrganizationData, IClientOrganizationContextService, ApplicationState, IOrganizationResource, IOrganizationResourceCreationData, IOrganizationResourcesChangeEvent, ISingleResourceOrganizationIdentifier } from '../interfaces';
|
|
8
8
|
type ILogger = CdmLogger.ILogger;
|
|
9
9
|
export declare abstract class AbstractOrganizationContextService extends Disposable implements IClientOrganizationContextService {
|
|
10
|
-
protected
|
|
10
|
+
protected _organizationContext: OrganizationContext;
|
|
11
11
|
protected completeOrganizationBarrier: Barrier;
|
|
12
12
|
protected updateOrganizationBarrier: Barrier;
|
|
13
13
|
protected logger: ILogger;
|
|
@@ -21,6 +21,9 @@ export declare abstract class AbstractOrganizationContextService extends Disposa
|
|
|
21
21
|
readonly onDidChangeApplicationState: Event<ApplicationState>;
|
|
22
22
|
constructor(logger: ILogger);
|
|
23
23
|
abstract initialize(args: any): any;
|
|
24
|
+
abstract hydrate(apolloState: any): any;
|
|
25
|
+
get organizationContext(): OrganizationContext;
|
|
26
|
+
set organizationContext(context: OrganizationContext);
|
|
24
27
|
getCompleteOrganization(): Promise<OrganizationContext>;
|
|
25
28
|
getOrganization(): OrganizationContext;
|
|
26
29
|
getApplicationState(): ApplicationState;
|
|
@@ -13,6 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.AbstractOrganizationContextService = void 0;
|
|
16
|
+
/* eslint-disable default-case */
|
|
16
17
|
const uri_1 = require("@vscode-alt/monaco-editor/esm/vs/base/common/uri");
|
|
17
18
|
const event_1 = require("@vscode-alt/monaco-editor/esm/vs/base/common/event");
|
|
18
19
|
// import { Disposable } from '@vscode-alt/monaco-editor/esm/vs/base/common/lifecycle';
|
|
@@ -37,26 +38,32 @@ let AbstractOrganizationContextService = class AbstractOrganizationContextServic
|
|
|
37
38
|
this.logger = logger.child({ className: 'AbstractOrganizationService' });
|
|
38
39
|
this.completeOrganizationBarrier = new async_1.Barrier();
|
|
39
40
|
}
|
|
41
|
+
get organizationContext() {
|
|
42
|
+
return this._organizationContext;
|
|
43
|
+
}
|
|
44
|
+
set organizationContext(context) {
|
|
45
|
+
this._organizationContext = context;
|
|
46
|
+
}
|
|
40
47
|
getCompleteOrganization() {
|
|
41
48
|
return this.completeOrganizationBarrier.wait().then(() => this.getOrganization());
|
|
42
49
|
}
|
|
43
50
|
getOrganization() {
|
|
44
|
-
return this.
|
|
51
|
+
return this._organizationContext;
|
|
45
52
|
}
|
|
46
53
|
getApplicationState() {
|
|
47
54
|
// OrganizationContext has configuration file
|
|
48
|
-
if (this.
|
|
55
|
+
if (this._organizationContext.configuration) {
|
|
49
56
|
return 3 /* ApplicationState.ORGANIZATION */;
|
|
50
57
|
}
|
|
51
58
|
// Resource has single root
|
|
52
|
-
if (this.
|
|
59
|
+
if (this._organizationContext.resources.length === 1) {
|
|
53
60
|
return 2 /* ApplicationState.RESOURCE */;
|
|
54
61
|
}
|
|
55
62
|
// Empty
|
|
56
63
|
return 1 /* ApplicationState.EMPTY */;
|
|
57
64
|
}
|
|
58
65
|
getOrganizationResource(resource) {
|
|
59
|
-
return this.
|
|
66
|
+
return this._organizationContext.getResource(resource);
|
|
60
67
|
}
|
|
61
68
|
isInsideOrganization(resource) {
|
|
62
69
|
return !!this.getOrganizationResource(resource);
|
|
@@ -64,19 +71,21 @@ let AbstractOrganizationContextService = class AbstractOrganizationContextServic
|
|
|
64
71
|
isCurrentOrganization(organizationIdentifier) {
|
|
65
72
|
switch (this.getApplicationState()) {
|
|
66
73
|
case 2 /* ApplicationState.RESOURCE */:
|
|
67
|
-
return (0, helpers_1.isSingleResourceOrganizationIdentifier)(organizationIdentifier) &&
|
|
74
|
+
return ((0, helpers_1.isSingleResourceOrganizationIdentifier)(organizationIdentifier) &&
|
|
75
|
+
(0, resources_1.isEqual)(organizationIdentifier, this._organizationContext.resources[0].uri));
|
|
68
76
|
case 3 /* ApplicationState.ORGANIZATION */:
|
|
69
|
-
return (0, helpers_1.isOrganizationIdentifier)(organizationIdentifier) &&
|
|
77
|
+
return ((0, helpers_1.isOrganizationIdentifier)(organizationIdentifier) &&
|
|
78
|
+
this._organizationContext.id === organizationIdentifier.id);
|
|
70
79
|
}
|
|
71
80
|
return false;
|
|
72
81
|
}
|
|
73
82
|
extAcceptChangedApplicationState(organizationContext, event) {
|
|
74
|
-
this.
|
|
83
|
+
this._organizationContext = this.reviveOrganizationUris(organizationContext);
|
|
75
84
|
this._onDidChangeApplicationState.fire(event);
|
|
76
85
|
this.releaseUpdateOrganizationBarrier();
|
|
77
86
|
}
|
|
78
87
|
extAcceptChangedOrganizationResources(organizationContext, event) {
|
|
79
|
-
this.
|
|
88
|
+
this._organizationContext = this.reviveOrganizationUris(organizationContext);
|
|
80
89
|
this._onDidChangeOrganizationResources.fire(event);
|
|
81
90
|
this.releaseUpdateOrganizationBarrier();
|
|
82
91
|
}
|
|
@@ -96,9 +105,10 @@ let AbstractOrganizationContextService = class AbstractOrganizationContextServic
|
|
|
96
105
|
}
|
|
97
106
|
}
|
|
98
107
|
reviveOrganizationUris(organizationData) {
|
|
99
|
-
let organizationContext
|
|
108
|
+
let organizationContext;
|
|
109
|
+
let organizationResources;
|
|
100
110
|
if (organizationData.resources) {
|
|
101
|
-
organizationResources = organizationData.resources.map(({ index, uri: uriComponent, name }) =>
|
|
111
|
+
organizationResources = organizationData.resources.map(({ index, uri: uriComponent, name }) => new core_3.OrganizationResource({ index, uri: uri_1.URI.revive(uriComponent), name }));
|
|
102
112
|
}
|
|
103
113
|
if (organizationData.configuration) {
|
|
104
114
|
organizationContext = uri_1.URI.revive(organizationData.configuration);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-organization-context-service.js","sourceRoot":"","sources":["../../src/services/abstract-organization-context-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0EAAuE;AACvE,8EAAoF;AACpF,uFAAuF;AACvF,gDAAmD;AACnD,8EAAoF;AAEpF,yCAA+C;AAC/C,6CAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"abstract-organization-context-service.js","sourceRoot":"","sources":["../../src/services/abstract-organization-context-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,0EAAuE;AACvE,8EAAoF;AACpF,uFAAuF;AACvF,gDAAmD;AACnD,8EAAoF;AAEpF,yCAA+C;AAC/C,6CAAgD;AAChD,sFAKgE;AAChE,kCAAmF;AAYnF,0DAAgH;AAIzG,IAAe,kCAAkC,GAAjD,MAAe,kCAClB,SAAQ,iBAAU;IAkClB,YAEI,MAAe;QAEf,KAAK,EAAE,CAAC;QA3BO,8BAAyB,GAAuC,IAAI,CAAC,SAAS,CAC7F,IAAI,eAAO,EAA6B,CAC3C,CAAC;QAEc,6BAAwB,GAAqC,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC;QAE/F,sCAAiC,GAA+C,IAAI,CAAC,SAAS,CAC7G,IAAI,eAAO,EAAqC,CACnD,CAAC;QAEc,qCAAgC,GAC5C,IAAI,CAAC,iCAAiC,CAAC,KAAK,CAAC;QAE9B,iCAA4B,GAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,eAAO,EAAU,CAAC,CAAC;QAEzF,gCAA2B,GAAkB,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC;QAElF,iCAA4B,GAA8B,IAAI,CAAC,SAAS,CACvF,IAAI,eAAO,EAAoB,CAClC,CAAC;QAEc,gCAA2B,GAA4B,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC;QAO3G,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,6BAA6B,EAAE,CAAC,CAAC;QAEzE,IAAI,CAAC,2BAA2B,GAAG,IAAI,eAAO,EAAE,CAAC;IACrD,CAAC;IAMD,IAAI,mBAAmB;QACnB,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACrC,CAAC;IAED,IAAI,mBAAmB,CAAC,OAAO;QAC3B,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC;IACxC,CAAC;IAEM,uBAAuB;QAC1B,OAAO,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IACtF,CAAC;IAEM,eAAe;QAClB,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACrC,CAAC;IAEM,mBAAmB;QACtB,6CAA6C;QAC7C,IAAI,IAAI,CAAC,oBAAoB,CAAC,aAAa,EAAE;YACzC,6CAAqC;SACxC;QAED,2BAA2B;QAC3B,IAAI,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;YAClD,yCAAiC;SACpC;QAED,QAAQ;QACR,sCAA8B;IAClC,CAAC;IAEM,uBAAuB,CAAC,QAAa;QACxC,OAAO,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAYM,oBAAoB,CAAC,QAAa;QACrC,OAAO,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IACpD,CAAC;IAEM,qBAAqB,CACxB,sBAAuF;QAEvF,QAAQ,IAAI,CAAC,mBAAmB,EAAE,EAAE;YAChC;gBACI,OAAO,CACH,IAAA,gDAAsC,EAAC,sBAAsB,CAAC;oBAC9D,IAAA,mBAAO,EAAC,sBAAsB,EAAE,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAC9E,CAAC;YACN;gBACI,OAAO,CACH,IAAA,kCAAwB,EAAC,sBAAsB,CAAC;oBAChD,IAAI,CAAC,oBAAoB,CAAC,EAAE,KAAK,sBAAsB,CAAC,EAAE,CAC7D,CAAC;SACT;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,gCAAgC,CAAC,mBAAsC,EAAE,KAAuB;QACnG,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;QAC7E,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,CAAC,gCAAgC,EAAE,CAAC;IAC5C,CAAC;IAEM,qCAAqC,CACxC,mBAAsC,EACtC,KAAwC;QAExC,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;QAC7E,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,CAAC,gCAAgC,EAAE,CAAC;IAC5C,CAAC;IAEM,gCAAgC,CAAC,mBAAsC;QAC1E,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;QAC5E,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,gCAAgC,EAAE,CAAC;IAC5C,CAAC;IAES,0BAA0B;QAChC,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,MAAM,EAAE,EAAE;YAC5C,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC;SAC3C;IACL,CAAC;IAES,gCAAgC;QACtC,IAAI,IAAI,CAAC,yBAAyB,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,MAAM,EAAE,EAAE;YAC5E,IAAI,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC;SACzC;IACL,CAAC;IAES,sBAAsB,CAAC,gBAAmC;QAChE,IAAI,mBAAmB,CAAC;QACxB,IAAI,qBAAqB,CAAC;QAC1B,IAAI,gBAAgB,CAAC,SAAS,EAAE;YAC5B,qBAAqB,GAAG,gBAAgB,CAAC,SAAS,CAAC,GAAG,CAClD,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,CACnC,IAAI,2BAAoB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,SAAG,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC,CAC/E,CAAC;SACL;QAED,IAAI,gBAAgB,CAAC,aAAa,EAAE;YAChC,mBAAmB,GAAG,SAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;SACpE;QACD,OAAO,IAAI,0BAAmB,CAAC,gBAAgB,CAAC,EAAE,EAAE,qBAAqB,EAAE,mBAAmB,CAAC,CAAC;IACpG,CAAC;CACJ,CAAA;AApKqB,kCAAkC;IADvD,IAAA,sBAAU,GAAE;IAqCJ,WAAA,IAAA,kBAAM,EAAC,iBAAU,CAAC,MAAM,CAAC,CAAA;;GApCZ,kCAAkC,CAoKvD;AApKqB,gFAAkC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adminide-stack/core",
|
|
3
|
-
"version": "3.1.4-alpha.
|
|
3
|
+
"version": "3.1.4-alpha.32",
|
|
4
4
|
"description": "AdminIDE core for higher packages to depend on",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -36,5 +36,5 @@
|
|
|
36
36
|
"typescript": {
|
|
37
37
|
"definition": "lib/index.d.ts"
|
|
38
38
|
},
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "8b15a11cbe88bfed8c6bcc5e8b460d6b64488849"
|
|
40
40
|
}
|