@adminide-stack/core 10.2.2-alpha.7 → 10.2.3-alpha.1
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/constants/scheme.d.ts +10 -10
- package/lib/constants/scheme.js +10 -10
- package/lib/constants/scheme.js.map +1 -1
- package/lib/core/configurations/events/ConfigurationChangeEvent.js +1 -1
- package/lib/core/configurations/events/ConfigurationChangeEvent.js.map +1 -1
- package/lib/core/organization/configuration.js +1 -1
- package/lib/core/organization/configuration.js.map +1 -1
- package/lib/index.js +1 -1
- package/lib/interfaces/configuration/configuration.d.ts +1 -2
- package/lib/interfaces/configuration/configuration.js +1 -1
- package/lib/interfaces/configuration/configuration.js.map +1 -1
- package/lib/interfaces/configuration/configurationRegistry.d.ts +4 -2
- package/lib/interfaces/configuration/configuraton-service.d.ts +1 -1
- package/lib/interfaces/configuration/defaultSettingSnapshot.d.ts +1 -1
- package/lib/interfaces/page-store.d.ts +2 -16
- package/lib/services/abstract-organization-context-service.js +1 -1
- package/lib/services/abstract-organization-context-service.js.map +1 -1
- package/lib/utils/cdecodeUri.js +107 -43
- package/lib/utils/cdecodeUri.js.map +1 -1
- package/lib/utils/generate-uri.d.ts +8 -6
- package/lib/utils/generate-uri.js +17 -13
- package/lib/utils/generate-uri.js.map +1 -1
- package/lib/utils/getUserAlias.d.ts +1 -1
- package/lib/utils/preferenceUri.d.ts +4 -4
- package/lib/utils/preferenceUri.js +9 -8
- package/lib/utils/preferenceUri.js.map +1 -1
- package/lib/utils/resourceUriConversion.js +20 -9
- package/lib/utils/resourceUriConversion.js.map +1 -1
- package/lib/utils/splitCdecodeUri.d.ts +28 -0
- package/lib/utils/splitCdecodeUri.js +47 -2
- package/lib/utils/splitCdecodeUri.js.map +1 -1
- package/lib/vscodeExport/index.d.ts +3 -0
- package/package.json +3 -3
@@ -5,36 +5,36 @@
|
|
5
5
|
* handling resources with the cdecode protocol.
|
6
6
|
*/
|
7
7
|
export declare const enum Scheme {
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
8
|
+
http = "http",
|
9
|
+
https = "https",
|
10
|
+
file = "file",
|
11
|
+
mailto = "mailto",
|
12
12
|
/**
|
13
13
|
* Main scheme for cdecode resources.
|
14
14
|
* This is used as the primary identifier for any resource that
|
15
15
|
* adheres to the cdecode-specific protocol.
|
16
16
|
*/
|
17
|
-
|
17
|
+
cdecode = "cdecode",
|
18
18
|
/**
|
19
19
|
* Scheme for referencing cdecode resources.
|
20
20
|
* Useful when distinguishing between different contexts of cdecode-based assets.
|
21
21
|
*/
|
22
|
-
|
22
|
+
cdeResource = "cde-resource",
|
23
23
|
/**
|
24
24
|
* Scheme for file resources processed using the cdecode protocol.
|
25
25
|
*/
|
26
|
-
|
26
|
+
cdecodeFile = "cdecode-file",
|
27
27
|
/**
|
28
28
|
* Scheme for cde extensions.
|
29
29
|
* This identifies resources that relate to extensions within the cdecode ecosystem.
|
30
30
|
*/
|
31
|
-
|
31
|
+
cdeExtension = "cde-extention",
|
32
32
|
/**
|
33
33
|
* Scheme for remote cdecode resource access.
|
34
34
|
*/
|
35
|
-
|
35
|
+
cdecodeRemote = "cdecode-remote",
|
36
36
|
/**
|
37
37
|
* Scheme for MongoDB file references used within the cdecode system.
|
38
38
|
*/
|
39
|
-
|
39
|
+
mongoDbFile = "mongo-db-file"
|
40
40
|
}
|
package/lib/constants/scheme.js
CHANGED
@@ -7,37 +7,37 @@
|
|
7
7
|
var Scheme;
|
8
8
|
(function (Scheme) {
|
9
9
|
/* Standard URI schemes */
|
10
|
-
Scheme["
|
11
|
-
Scheme["
|
12
|
-
Scheme["
|
13
|
-
Scheme["
|
10
|
+
Scheme["http"] = "http";
|
11
|
+
Scheme["https"] = "https";
|
12
|
+
Scheme["file"] = "file";
|
13
|
+
Scheme["mailto"] = "mailto";
|
14
14
|
/* Custom cdecode schemes */
|
15
15
|
/**
|
16
16
|
* Main scheme for cdecode resources.
|
17
17
|
* This is used as the primary identifier for any resource that
|
18
18
|
* adheres to the cdecode-specific protocol.
|
19
19
|
*/
|
20
|
-
Scheme["
|
20
|
+
Scheme["cdecode"] = "cdecode";
|
21
21
|
/**
|
22
22
|
* Scheme for referencing cdecode resources.
|
23
23
|
* Useful when distinguishing between different contexts of cdecode-based assets.
|
24
24
|
*/
|
25
|
-
Scheme["
|
25
|
+
Scheme["cdeResource"] = "cde-resource";
|
26
26
|
/**
|
27
27
|
* Scheme for file resources processed using the cdecode protocol.
|
28
28
|
*/
|
29
|
-
Scheme["
|
29
|
+
Scheme["cdecodeFile"] = "cdecode-file";
|
30
30
|
/**
|
31
31
|
* Scheme for cde extensions.
|
32
32
|
* This identifies resources that relate to extensions within the cdecode ecosystem.
|
33
33
|
*/
|
34
|
-
Scheme["
|
34
|
+
Scheme["cdeExtension"] = "cde-extention";
|
35
35
|
/**
|
36
36
|
* Scheme for remote cdecode resource access.
|
37
37
|
*/
|
38
|
-
Scheme["
|
38
|
+
Scheme["cdecodeRemote"] = "cdecode-remote";
|
39
39
|
/**
|
40
40
|
* Scheme for MongoDB file references used within the cdecode system.
|
41
41
|
*/
|
42
|
-
Scheme["
|
42
|
+
Scheme["mongoDbFile"] = "mongo-db-file";
|
43
43
|
})(Scheme || (Scheme = {}));export{Scheme};//# sourceMappingURL=scheme.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"scheme.js","sources":["../../src/constants/scheme.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;;AAKG;IACe;AAAlB,CAAA,UAAkB,MAAM,EAAA;;AAEpB,EAAA,MAAA,CAAA,MAAA,CAAA,GAAA,MAAA;AACA,EAAA,MAAA,CAAA,OAAA,CAAA,GAAA,OAAA;AACA,EAAA,MAAA,CAAA,MAAA,CAAA,GAAA,MAAA;AACA,EAAA,MAAA,CAAA,QAAA,CAAA,GAAA,QAAA;;AAGA;;;;AAIG;AACH,EAAA,MAAA,CAAA,SAAA,CAAA,GAAA,SAAA;AAEA;;;AAGG;AACH,EAAA,MAAA,CAAA,
|
1
|
+
{"version":3,"file":"scheme.js","sources":["../../src/constants/scheme.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;;AAKG;IACe;AAAlB,CAAA,UAAkB,MAAM,EAAA;;AAEpB,EAAA,MAAA,CAAA,MAAA,CAAA,GAAA,MAAA;AACA,EAAA,MAAA,CAAA,OAAA,CAAA,GAAA,OAAA;AACA,EAAA,MAAA,CAAA,MAAA,CAAA,GAAA,MAAA;AACA,EAAA,MAAA,CAAA,QAAA,CAAA,GAAA,QAAA;;AAGA;;;;AAIG;AACH,EAAA,MAAA,CAAA,SAAA,CAAA,GAAA,SAAA;AAEA;;;AAGG;AACH,EAAA,MAAA,CAAA,aAAA,CAAA,GAAA,cAAA;AAEA;;AAEG;AACH,EAAA,MAAA,CAAA,aAAA,CAAA,GAAA,cAAA;AAEA;;;AAGG;AACH,EAAA,MAAA,CAAA,cAAA,CAAA,GAAA,eAAA;AAEA;;AAEG;AACH,EAAA,MAAA,CAAA,eAAA,CAAA,GAAA,gBAAA;AAEA;;AAEG;AACH,EAAA,MAAA,CAAA,aAAA,CAAA,GAAA,eAAA;AACJ,CAAC,EAzCiB,MAAM,KAAN,MAAM,GAyCvB,EAAA,CAAA,CAAA"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import*as objects from'@vscode-alt/monaco-editor/esm/vs/base/common/objects.js';import'
|
1
|
+
import*as objects from'@vscode-alt/monaco-editor/esm/vs/base/common/objects.js';import'common';import'../../../interfaces/organization/organization-context.js';import'@workbench-stack/core/lib/constants/extensions.js';import'@workbench-stack/core/lib/interfaces/lifecycle/lifecycle.js';import'../../../interfaces/permissions.js';import'common/lib/generated/generated-models.js';import {Configuration}from'../configuration.js';import {toValuesTree}from'../helpers/configuration.js';import {ConfigurationModel}from'../models/ConfigurationModel.js';/* tslint:disable */
|
2
2
|
// https://github.com/microsoft/vscode/blob/1562a35c863c312eec35c161b9ceac9921afa50e/src/vs/platform/configuration/common/configurationModels.ts
|
3
3
|
class ConfigurationChangeEvent {
|
4
4
|
change;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ConfigurationChangeEvent.js","sources":["../../../../src/core/configurations/events/ConfigurationChangeEvent.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"ConfigurationChangeEvent.js","sources":["../../../../src/core/configurations/events/ConfigurationChangeEvent.ts"],"sourcesContent":[null],"names":[],"mappings":"kiBAAA;AAaA;MACa,wBAAwB,CAAA;AAUpB,EAAA,MAAA;AACQ,EAAA,QAAA;AACA,EAAA,oBAAA;AACA,EAAA,mBAAA;AAZZ,EAAA,YAAA;AAET,EAAA,MAAA;AAEA,EAAA,YAAA;AAEiB,EAAA,gBAAA;AAEjB,EAAA,WAAA,CAAA,QACyC,QACpB,EAAuF,oBACvF,EAAmC,mBACO,EAAA;QAHlD,CAAM,MAAA,GAAA;QACE,CAAQ,QAAA,GAAA;QACR,CAAoB,oBAAA,GAAA;QACpB,CAAmB,mBAAA,GAAA;AAEpC,IAAA,MAAA,OAAa,GAAA,IAAG,GAAI,EAAA;AACpB,IAAA,MAAA,CAAA,IAAO,CAAI,OAAQ,CAAA,GAAA,IAAK,eAAa,CAAA,CAAG;AACxC,IAAA,MAAA,CAAA,SAAO,CAAA,OAAU,CAAA,CAAA,GAAQ,IAAI,CAAI,KAAG,IAAG,CAAI,OAAQ,CAAA,GAAA,IAAE,OAAQ,CAAA,GAAA,CAAA,GAAQ,CAAA,CAAG,CAAC;QACzE,CAAI,YAAa,GAAA,CAAA,GAAG,cAAY,EAAA,CAAA;AAEhC,IAAA,MAAA,kBAAwB,GAAA,IAAG,kBAAI,EAAA;AAC/B,IAAA,IAAA,CAAA,YAAiB,CAAA,WAAQ,sBAA4B,CAAA,cAAS,EAAC,CAAA,CAAG;AAClE,IAAA,IAAA,CAAA,gBAAqB,GAAA,kBAAqB,CAAA;;wBAGhB,GAAA;AAE9B,EAAA,IAAA,qBAAyB,GAAA;QACrB,CAAI,IAAC,uBAAK,IAAsB,IAAI,CAAI,QAAS,EAAA;AAC7C,MAAA,IAAA,CAAA,sBAAK,GAAA,aAAyB,CAAA,KAAa,CAAC,IAAA,CAAK,QAAM,CAAA,IAAA,CAAQ;;WAE5D,IAAA,CAAA,sBAAK;;sBAGI,CAAA,OAAgB,EAAA,SAAqC,EAAA;QACrE,IAAI,CAAA,4BAAK,CAAA,IAA6B,CAAA,gBAAK,EAAA,OAAkB,CAAA,EAAA;mBACrD,EAAA;AACA,QAAA,MAAA,MAAA,GAAY,IAAA,CAAA,qBAA6B,GAAA,IAAA,CAAA,qBAAA,CAAA,QAAA,CAAA,OAAA,EAAA,SAAA,EAAA,IAAA,CAAA,QAAA,EAAA,YAAA,CAAA,GAAA,SAAA;AACrC,QAAA,MAAA,MAAA,GAAM,IAAC,CAAqB,oBAAA,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC;+BACpD,MAAC,EAAA,MAAA,CAAA;AAChB;iBACO;;AAEX,IAAA,OAAA,KAAA;;AAEJ,EAAA,4BAAa,CAAA,gBAAA,EAAA,OAAA,EAAA;IACjB,IAAC,aAAA,GAAA,YAAA,CAAA;MAEmC,CAAA,OAAA,GAAA;AAChC,KAAA,EAAA;AAEA,IAAA,IAAA,GAAA;AACA,IAAA,OAAA,oBAA2B,KAAA,aAAiB,GAAA,SAAO,CAAA,IAAO,CAAI,iBAAc,CAAC,EAAE;;AAE3E,MAAA,gBAAA,GAAA,gBAAmB,CAAA,GAAA,CAAA;2BACE,EAAA;oBACV,CAAA;;AAEX,MAAA,aAAA,GAAA,aAAgB,CAAA,GAAA,CAAA;;AAEpB,IAAA,OAAA,IAAO;;AAEd"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import'@vscode-alt/monaco-editor/esm/vs/base/common/types.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import'common/lib/generated/generated-models.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/objects.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/arrays.js';import {Configuration}from'../configurations/configuration.js';import'
|
1
|
+
import'@vscode-alt/monaco-editor/esm/vs/base/common/types.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import'common/lib/generated/generated-models.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/objects.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/arrays.js';import {Configuration}from'../configurations/configuration.js';import'common';import'../../interfaces/organization/organization-context.js';import'@workbench-stack/core/lib/constants/extensions.js';import'@workbench-stack/core/lib/interfaces/lifecycle/lifecycle.js';import'../../interfaces/permissions.js';class OrganizationConfiguration extends Configuration {
|
2
2
|
_organization;
|
3
3
|
constructor(defaults, policy, application, user, machine, organizationConfiguration, resources, memoryConfiguration, memoryConfigurationByResource, _organization) {
|
4
4
|
super(defaults, policy, application, user, machine, organizationConfiguration, resources, memoryConfiguration, memoryConfigurationByResource);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"configuration.js","sources":["../../../src/core/organization/configuration.ts"],"sourcesContent":[null],"names":["BaseConfiguration","undefined"],"mappings":"
|
1
|
+
{"version":3,"file":"configuration.js","sources":["../../../src/core/organization/configuration.ts"],"sourcesContent":[null],"names":["BaseConfiguration","undefined"],"mappings":"4lBAOM,MAAO,yBAA0B,SAAQA,aAAiB,CAAA;AAWvC,EAAA,aAAA;AAVrB,EAAA,WAAA,CAAA,UACgC,MAC5B,EAA0B,WACK,EAAA,MACP,OACxB,EAA2B,yBAC3B,EAA6C,SACH,EAAA,qBACH,6BACvC,EAA8D,aACT,EAAA;AAErD,IAAA,KAAA,CAAA,QACY,EAAA,mBAER,EAAA,IACA,EAAI,kCAEJ,EAAA,SACS,EAAA,kDAET,CAAA;QAXa,CAAa,aAAA,GAAA;;AAelC,EAAA,QAAA,CAAA,GAC2B,EAAA,WACYC,WACnC,EAAU,qBACiC,EAAA;AAE3C,IAAA,OAAA,KAAY,CAAA,QAAS,CAAA,GAAA,WAAM,EAAA,IAAW,CAAA,aAAK,EAAA,qBAAe,CAAA;;AAG9D,EAAA,OAAA,CAAA,GAAW,EAAW,SAAE,GAAA,EAAqC,EAAE;AAC3D,IAAA,OAAA,KAAY,CAAA,OAAQ,CAAA,GAAA,EAAI,SAAW,EAAA,IAAE,CAAI,aAAc,CAAA;;MAGvD,GAAA;WAMO,KAAA,CAAA,IAAM,CAAI,IAAC,cAAK,CAAA;;AAE9B"}
|
package/lib/index.js
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export{NATS_HEMERA_ADMINIDE_WORKSPACE,NATS_HEMERA_ADMINIDE_WORKSPACE_UPDATER}from'./constants/constants.js';export{DEFAULT_CPU,DEFAULT_HDD,DEFAULT_RAM}from'./constants/default-workspace-config.js';export{DEFAULT_TENANT_ID,GLOBAL_CONFIGURATION_FILE,OVERRIDE_IDENTIFIER_PATTERN,OVERRIDE_PATTERN_WITH_SUBSTITUTION,OVERRIDE_PROPERTY,OVERRIDE_PROPERTY_PATTERN,SETTINGS_OVERRRIDE_NODE_ID,USER_CONFIGURATION_FILE}from'./constants/configuration.js';export{CommonTypes,PlatformClientTypes,ServerTypes}from'./constants/types.js';export{ASANA_WEBHOOK_ENDPOINT,ORG_BASE_PATH,ORG_STD_ROUTES}from'./constants/urls.js';export{IntegrationConfigurationRoute}from'./constants/routes.js';export{BillingPlan}from'./constants/billing-plan.js';export{Scheme}from'./constants/scheme.js';export{LOCAL_MACHINE_SCOPES,ORGANIZATION_SCOPES,REMOTE_MACHINE_SCOPES,RESOURCE_SCOPES,USER_SCOPES}from'./interfaces/configuration/configuration.js';export{ApplicationState,IOrganizationContext,IOrganizationResource}from'./interfaces/organization/organization-context.js';export{Extensions}from'@workbench-stack/core/lib/constants/extensions.js';export{LifecyclePhase,ShutdownReason,StartupKind}from'@workbench-stack/core/lib/interfaces/lifecycle/lifecycle.js';export{PermissionBehavior}from'./interfaces/permissions.js';export*from'common/lib/generated/generated-models.js';export{getFilteredRoutes,getFilteredTabs,getTtl}from'./utils/utils.js';export{convertToResourceUri,resourcePath}from'./utils/resourceUriConversion.js';export{generateApplicationUri,generateMachineUri,generateOrgUri,generateProxyUserUri,generateResourceUri,generateUri,generateUserUri}from'./utils/generate-uri.js';export{determineConfigurationTarget,generateCdecodeUri,parseCdecodeUri}from'./utils/cdecodeUri.js';export{generateApplicationRoleResource,generateRegisteredRoleURI}from'./utils/roles-utils.js';export{getScopes}from'./utils/configuration-utils.js';export{omitDeep}from'./utils/omit-deep.js';export{generateSettingsId}from'./utils/generated-settings-id.js';export{validateEmail}from'./utils/validations.js';export{toMilliSeconds}from'./utils/date-utils.js';export{expand,flatten,flattenObject}from'./utils/flatten-utils.js';export{generateUserAlias}from'./utils/generateUserAlias.js';export{getUserAlias}from'./utils/getUserAlias.js';export{getLogger}from'./utils/getLogger.js';export{getDefaultSettingsURI,getEditableSettingsURI,getOpenSettings,parseExtensionFromDefaultSettingsUri}from'./utils/preferenceUri.js';export{reviveUri}from'./utils/reviveUri.js';export{buildNodeContext,buildPermissionNodeContext,buildPolicyNodeContext,buildRoleNodeContext}from'./utils/nodeContext.js';export{splitCdecodeUri}from'./utils/splitCdecodeUri.js';export{Disposable,DisposableCollection}from'./core/disposable.js';export{Emitter,Event,WaitUntilEvent}from'./core/event.js';export{Path}from'./core/path.js';export{OrganizationContext,OrganizationResource,toOrganizationResource,toOrganizationResources,toUri}from'./core/organization/organization.js';export{OrganizationConfiguration}from'./core/organization/configuration.js';export{isOrganizationIdentifier,isRawFileOrganizationResource,isRawUriOrganizationResource,isSingleResourceOrganizationIdentifier,isSingleResourceOrganizationInitializationPayload}from'./core/organization/helpers/organization-helpers.js';export{ConfigurationTargetConfigurationMapper,ConfigurationTargetToString,SettingsTypeToConfiguraitonTarget,addToValueTree,getConfigurationValue,getMigratedSettingValue,isConfigurationOverrides,keyFromOverrideIdentifier,merge,overrideIdentifierFromKey,removeFromValueTree,toValuesTree}from'./core/configurations/helpers/configuration.js';export{ConfigurationModel}from'./core/configurations/models/ConfigurationModel.js';export{Configuration,OVERRIDE_PROPERTY_REGEX,compare,overrideIdentifiersFromKey}from'./core/configurations/configuration.js';export{ConfigurationChangeEvent}from'./core/configurations/events/ConfigurationChangeEvent.js';export{CdeCodeProvider}from'./core/in-memory-providers/cde-code-provider.js';export{AuthError}from'./errors/auth-error.js';export{AbstractOrganizationContextService}from'./services/abstract-organization-context-service.js';export{AbstractOrganizationConfigurationClientService}from'./services/abstract-configuration.js';export{PreDefineAccountPermissions}from'./modules/account-api/enums/index.js';export{BillingModules,PreDefineBillingPermissions}from'./modules/billing-api/enums/index.js';export{PreDefineInboxPermissions}from'./modules/inbox/enums/index.js';export{PermissionTypes}from'./enums/permissions.js';export{IntegrationConnections}from'./enums/integrations-connection-names.js';export{ConnectionStatus}from'./enums/connection-status.js';export{IntegrationsConfigSteps}from'./enums/integrations-configuration-steps.js';export{IntegrationConfigStatus}from'./enums/integration-configuration-status.js';export{Integrations}from'./enums/integrations.js';export{URI,uriToFsPath}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';export{ConfigurationScope}from'
|
1
|
+
export{NATS_HEMERA_ADMINIDE_WORKSPACE,NATS_HEMERA_ADMINIDE_WORKSPACE_UPDATER}from'./constants/constants.js';export{DEFAULT_CPU,DEFAULT_HDD,DEFAULT_RAM}from'./constants/default-workspace-config.js';export{DEFAULT_TENANT_ID,GLOBAL_CONFIGURATION_FILE,OVERRIDE_IDENTIFIER_PATTERN,OVERRIDE_PATTERN_WITH_SUBSTITUTION,OVERRIDE_PROPERTY,OVERRIDE_PROPERTY_PATTERN,SETTINGS_OVERRRIDE_NODE_ID,USER_CONFIGURATION_FILE}from'./constants/configuration.js';export{CommonTypes,PlatformClientTypes,ServerTypes}from'./constants/types.js';export{ASANA_WEBHOOK_ENDPOINT,ORG_BASE_PATH,ORG_STD_ROUTES}from'./constants/urls.js';export{IntegrationConfigurationRoute}from'./constants/routes.js';export{BillingPlan}from'./constants/billing-plan.js';export{Scheme}from'./constants/scheme.js';export{LOCAL_MACHINE_SCOPES,ORGANIZATION_SCOPES,REMOTE_MACHINE_SCOPES,RESOURCE_SCOPES,USER_SCOPES}from'./interfaces/configuration/configuration.js';export{ApplicationState,IOrganizationContext,IOrganizationResource}from'./interfaces/organization/organization-context.js';export{Extensions}from'@workbench-stack/core/lib/constants/extensions.js';export{LifecyclePhase,ShutdownReason,StartupKind}from'@workbench-stack/core/lib/interfaces/lifecycle/lifecycle.js';export{PermissionBehavior}from'./interfaces/permissions.js';export*from'common/lib/generated/generated-models.js';export{getFilteredRoutes,getFilteredTabs,getTtl}from'./utils/utils.js';export{convertToResourceUri,resourcePath}from'./utils/resourceUriConversion.js';export{generateApplicationUri,generateMachineUri,generateOrgUri,generateProxyUserUri,generateResourceUri,generateUri,generateUserUri}from'./utils/generate-uri.js';export{determineConfigurationTarget,generateCdecodeUri,parseCdecodeUri}from'./utils/cdecodeUri.js';export{generateApplicationRoleResource,generateRegisteredRoleURI}from'./utils/roles-utils.js';export{getScopes}from'./utils/configuration-utils.js';export{omitDeep}from'./utils/omit-deep.js';export{generateSettingsId}from'./utils/generated-settings-id.js';export{validateEmail}from'./utils/validations.js';export{toMilliSeconds}from'./utils/date-utils.js';export{expand,flatten,flattenObject}from'./utils/flatten-utils.js';export{generateUserAlias}from'./utils/generateUserAlias.js';export{getUserAlias}from'./utils/getUserAlias.js';export{getLogger}from'./utils/getLogger.js';export{getDefaultSettingsURI,getEditableSettingsURI,getOpenSettings,parseExtensionFromDefaultSettingsUri}from'./utils/preferenceUri.js';export{reviveUri}from'./utils/reviveUri.js';export{buildNodeContext,buildPermissionNodeContext,buildPolicyNodeContext,buildRoleNodeContext}from'./utils/nodeContext.js';export{splitCdecodeUri,splitOrgUri}from'./utils/splitCdecodeUri.js';export{Disposable,DisposableCollection}from'./core/disposable.js';export{Emitter,Event,WaitUntilEvent}from'./core/event.js';export{Path}from'./core/path.js';export{OrganizationContext,OrganizationResource,toOrganizationResource,toOrganizationResources,toUri}from'./core/organization/organization.js';export{OrganizationConfiguration}from'./core/organization/configuration.js';export{isOrganizationIdentifier,isRawFileOrganizationResource,isRawUriOrganizationResource,isSingleResourceOrganizationIdentifier,isSingleResourceOrganizationInitializationPayload}from'./core/organization/helpers/organization-helpers.js';export{ConfigurationTargetConfigurationMapper,ConfigurationTargetToString,SettingsTypeToConfiguraitonTarget,addToValueTree,getConfigurationValue,getMigratedSettingValue,isConfigurationOverrides,keyFromOverrideIdentifier,merge,overrideIdentifierFromKey,removeFromValueTree,toValuesTree}from'./core/configurations/helpers/configuration.js';export{ConfigurationModel}from'./core/configurations/models/ConfigurationModel.js';export{Configuration,OVERRIDE_PROPERTY_REGEX,compare,overrideIdentifiersFromKey}from'./core/configurations/configuration.js';export{ConfigurationChangeEvent}from'./core/configurations/events/ConfigurationChangeEvent.js';export{CdeCodeProvider}from'./core/in-memory-providers/cde-code-provider.js';export{AuthError}from'./errors/auth-error.js';export{AbstractOrganizationContextService}from'./services/abstract-organization-context-service.js';export{AbstractOrganizationConfigurationClientService}from'./services/abstract-configuration.js';export{PreDefineAccountPermissions}from'./modules/account-api/enums/index.js';export{BillingModules,PreDefineBillingPermissions}from'./modules/billing-api/enums/index.js';export{PreDefineInboxPermissions}from'./modules/inbox/enums/index.js';export{PermissionTypes}from'./enums/permissions.js';export{IntegrationConnections}from'./enums/integrations-connection-names.js';export{ConnectionStatus}from'./enums/connection-status.js';export{IntegrationsConfigSteps}from'./enums/integrations-configuration-steps.js';export{IntegrationConfigStatus}from'./enums/integration-configuration-status.js';export{Integrations}from'./enums/integrations.js';export{URI,uriToFsPath}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';export{ConfigurationScope}from'common';//# sourceMappingURL=index.js.map
|
@@ -1,5 +1,4 @@
|
|
1
|
-
import { ConfigurationScope } from '
|
2
|
-
import { IConfigurationDefaults, IConfigurationExtensionInfo, IConfigurationNode, IPreferences, IResolveConfigurationQuery } from 'common/lib/generated/generated-models.js';
|
1
|
+
import { ConfigurationScope, IConfigurationDefaults, IConfigurationExtensionInfo, IConfigurationNode, IPreferences, IResolveConfigurationQuery } from 'common';
|
3
2
|
export { ConfigurationScope };
|
4
3
|
export declare const USER_SCOPES: ConfigurationScope[];
|
5
4
|
export declare const LOCAL_MACHINE_SCOPES: ConfigurationScope[];
|
@@ -1,4 +1,4 @@
|
|
1
|
-
export{ConfigurationScope}from'
|
1
|
+
export{ConfigurationScope}from'common';// export const enum ConfigurationScope {
|
2
2
|
// /**
|
3
3
|
// * Application specific configuration, which can be configured only in local user settings.
|
4
4
|
// */
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"configuration.js","sources":["../../../src/interfaces/configuration/configuration.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"configuration.js","sources":["../../../src/interfaces/configuration/configuration.ts"],"sourcesContent":[null],"names":[],"mappings":"uCAUA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEO,MAAM,WAAW,GAAG;AACd,MAAA,oBAAoB,GAAG,CAAA,CAAA,uCAAA,CAAA,kCAAA,CAAA;;;"}
|
@@ -4,7 +4,7 @@ import { Event } from '@vscode-alt/monaco-editor/esm/vs/base/common/event';
|
|
4
4
|
import { ConfigurationScope } from '@workbench-stack/core/lib/interfaces/configuration/configuration.js';
|
5
5
|
import { EditPresentationTypes } from '@workbench-stack/core/lib/interfaces/configuration/configuration-registry.js';
|
6
6
|
import { IConfigurationDelta, IConfigurationDefaultOverrideValue } from './configuration';
|
7
|
-
import { IConfigurationDefaults, IConfigurationExtensionInfo, IConfigurationNode, IConfigurationNodeContextInput } from 'common
|
7
|
+
import { IConfigurationDefaults, IConfigurationExtensionInfo, IConfigurationNode, IConfigurationNodeContextInput } from 'common';
|
8
8
|
export type PolicyName = string;
|
9
9
|
export interface IPolicy {
|
10
10
|
/**
|
@@ -17,7 +17,7 @@ export interface IPolicy {
|
|
17
17
|
readonly minimumVersion: `${number}.${number}`;
|
18
18
|
}
|
19
19
|
export interface IConfigurationPropertySchema extends IJSONSchema {
|
20
|
-
scope?: ConfigurationScope;
|
20
|
+
scope?: ConfigurationScope | ConfigurationScope[];
|
21
21
|
/**
|
22
22
|
* When restricted, value of this configuration will be read only from trusted sources.
|
23
23
|
* For example, if the workspace is not trusted, then the value of this configuration
|
@@ -66,7 +66,9 @@ export interface IConfigurationPropertySchema extends IJSONSchema {
|
|
66
66
|
* a system-wide policy.
|
67
67
|
*/
|
68
68
|
policy?: IPolicy;
|
69
|
+
settingDependencies?: string[];
|
69
70
|
}
|
71
|
+
export type IConfigurationSchemaMap = Record<string, IConfigurationPropertySchema>;
|
70
72
|
export type IRegisteredConfigurationPropertySchema = IConfigurationPropertySchema & {
|
71
73
|
defaultDefaultValue?: any;
|
72
74
|
source?: IConfigurationExtensionInfo;
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import { Event } from '@vscode-alt/monaco-editor/esm/vs/base/common/event';
|
2
2
|
import { IDisposable } from '@vscode-alt/monaco-editor/esm/vs/base/common/lifecycle';
|
3
3
|
import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
|
4
|
-
import { IConfigurationOverrides, IConfigurationData, IConfigurationModel, IIResourceData, IIConfigurationModel, ConfigurationTarget } from 'common
|
4
|
+
import { IConfigurationOverrides, IConfigurationData, IConfigurationModel, IIResourceData, IIConfigurationModel, ConfigurationTarget } from 'common';
|
5
5
|
import { IConfigurationValue } from './configuration';
|
6
6
|
import { IConfigurationChangeEvent } from './event';
|
7
7
|
import { IOrganizationContext } from '../organization';
|
@@ -3,7 +3,7 @@ export interface IDefaultSettingsSnapshot {
|
|
3
3
|
content?: string;
|
4
4
|
contentWithoutMostCommonlyUsed?: any;
|
5
5
|
allSettingsMap: Map<string, IContributionSettings>;
|
6
|
-
allSettingsGroups:
|
6
|
+
allSettingsGroups: ISettingsGroup[];
|
7
7
|
registeredGroups: ISettingsGroup[];
|
8
8
|
schema?: string;
|
9
9
|
}
|
@@ -1,16 +1,2 @@
|
|
1
|
-
import {
|
2
|
-
export
|
3
|
-
key: string;
|
4
|
-
tab?: string;
|
5
|
-
tabTitle?: string;
|
6
|
-
path: string;
|
7
|
-
exact?: boolean;
|
8
|
-
name?: string;
|
9
|
-
authority?: string[];
|
10
|
-
/**
|
11
|
-
* When `exact: false` we may not have an component
|
12
|
-
*/
|
13
|
-
component?: any;
|
14
|
-
position?: IMenuPosition;
|
15
|
-
icon?: any;
|
16
|
-
}
|
1
|
+
import type { IRouteModule } from '@common-stack/core';
|
2
|
+
export type IPageStore = IRouteModule;
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import {__decorate,__param,__metadata}from'tslib';import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {Emitter}from'@vscode-alt/monaco-editor/esm/vs/base/common/event.js';import {Disposable}from'@workbench-stack/core/lib/services/lifecycle/disposable.js';import {Barrier}from'@vscode-alt/monaco-editor/esm/vs/base/common/async.js';import {injectable,inject}from'inversify';import {CommonType}from'@common-stack/core';import {isEqual}from'@vscode-alt/monaco-editor/esm/vs/base/common/resources.js';import'../core/disposable.js';import'../core/event.js';import {OrganizationResource,OrganizationContext}from'../core/organization/organization.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/types.js';import'common/lib/generated/generated-models.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/objects.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/arrays.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/map.js';import'../constants/types.js';import'../constants/urls.js';import'../constants/routes.js';import'../constants/scheme.js';import'
|
1
|
+
import {__decorate,__param,__metadata}from'tslib';import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {Emitter}from'@vscode-alt/monaco-editor/esm/vs/base/common/event.js';import {Disposable}from'@workbench-stack/core/lib/services/lifecycle/disposable.js';import {Barrier}from'@vscode-alt/monaco-editor/esm/vs/base/common/async.js';import {injectable,inject}from'inversify';import {CommonType}from'@common-stack/core';import {isEqual}from'@vscode-alt/monaco-editor/esm/vs/base/common/resources.js';import'../core/disposable.js';import'../core/event.js';import {OrganizationResource,OrganizationContext}from'../core/organization/organization.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/types.js';import'common/lib/generated/generated-models.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/objects.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/arrays.js';import'@vscode-alt/monaco-editor/esm/vs/base/common/map.js';import'../constants/types.js';import'../constants/urls.js';import'../constants/routes.js';import'../constants/scheme.js';import'common';import'../interfaces/organization/organization-context.js';import'@workbench-stack/core/lib/constants/extensions.js';import'@workbench-stack/core/lib/interfaces/lifecycle/lifecycle.js';import'../interfaces/permissions.js';import {isOrganizationIdentifier,isSingleResourceOrganizationIdentifier}from'../core/organization/helpers/organization-helpers.js';let AbstractOrganizationContextService = class AbstractOrganizationContextService extends Disposable {
|
2
2
|
completeOrganizationBarrier;
|
3
3
|
updateOrganizationBarrier;
|
4
4
|
logger;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"abstract-organization-context-service.js","sources":["../../src/services/abstract-organization-context-service.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"abstract-organization-context-service.js","sources":["../../src/services/abstract-organization-context-service.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/lib/utils/cdecodeUri.js
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import
|
1
|
+
import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import sortKeys from'sort-keys';import queryString from'query-string';import {ConfigCollectionName}from'common/lib/generated/generated-models.js';/* eslint-disable prefer-destructuring */
|
2
2
|
/* eslint-disable default-param-last */
|
3
3
|
const generateCdecodeUri = (authority, params, query = {}, fragment) => {
|
4
4
|
let authorityString;
|
@@ -44,7 +44,7 @@ const generateCdecodeUri = (authority, params, query = {}, fragment) => {
|
|
44
44
|
// Conditionally include the leading slash
|
45
45
|
const path = pathSegments.length > 0 ? `/${pathSegments.join('/')}` : '/';
|
46
46
|
return URI.from({
|
47
|
-
scheme:
|
47
|
+
scheme: "cdecode" /* Scheme.cdecode */,
|
48
48
|
authority: authorityString,
|
49
49
|
path,
|
50
50
|
query: queryInString,
|
@@ -72,18 +72,44 @@ const generateCdecodeUri = (authority, params, query = {}, fragment) => {
|
|
72
72
|
*/
|
73
73
|
function parseCdecodeUri(uriString) {
|
74
74
|
const uri = typeof uriString === 'string' ? URI.parse(uriString) : uriString;
|
75
|
-
|
75
|
+
// Handle null or undefined path
|
76
|
+
const path = uri.path === '/null' || uri.path === '/undefined' ? '/' : uri.path;
|
77
|
+
// Split the path but preserve empty segments by not filtering
|
78
|
+
// Remove the leading empty segment that comes from the first slash
|
79
|
+
const pathSegmentsArray = path.split('/');
|
80
|
+
if (pathSegmentsArray[0] === '') {
|
81
|
+
pathSegmentsArray.shift(); // Remove the first empty segment from leading slash
|
82
|
+
}
|
76
83
|
const pathSegments = {
|
77
|
-
organization:
|
84
|
+
organization: ''
|
78
85
|
};
|
79
86
|
// Parse query and fragment
|
80
|
-
const queryData = queryString.parse(uri?.query);
|
81
|
-
let fragmentData = uri?.fragment;
|
87
|
+
const queryData = queryString.parse(uri?.query || '');
|
88
|
+
let fragmentData = uri?.fragment || '';
|
82
89
|
if (uri?.fragment?.includes('=')) {
|
83
|
-
fragmentData = queryString.parse(uri
|
90
|
+
fragmentData = queryString.parse(uri.fragment);
|
84
91
|
}
|
85
|
-
if (
|
86
|
-
//
|
92
|
+
if (uri.scheme === "cde-resource" /* Scheme.cdeResource */) {
|
93
|
+
// Remove leading slash and get resource type
|
94
|
+
const resourceType = path.substring(1);
|
95
|
+
if (resourceType === ConfigCollectionName.Organizations) {
|
96
|
+
// Organization URI format: /organizations?name=orgName
|
97
|
+
pathSegments.organization = queryData.name || '';
|
98
|
+
} else if (resourceType === ConfigCollectionName.Projects) {
|
99
|
+
// Project URI format: /projects?orgName=org&resourceGroup=group
|
100
|
+
pathSegments.organization = queryData.orgName || '';
|
101
|
+
} else {
|
102
|
+
// Resource URI format: /resourceType?_id=id&orgName=org
|
103
|
+
// or: /resourceType?field=value&orgName=org
|
104
|
+
pathSegments.resourceType = resourceType;
|
105
|
+
pathSegments.organization = queryData.orgName || '';
|
106
|
+
// Handle different ID fields (_id, name, email, etc)
|
107
|
+
if (queryData._id) {
|
108
|
+
pathSegments.resourceId = queryData._id;
|
109
|
+
} else if (queryData.name) {
|
110
|
+
pathSegments.resourceId = `name:${queryData.name}`;
|
111
|
+
}
|
112
|
+
}
|
87
113
|
return {
|
88
114
|
scheme: uri.scheme,
|
89
115
|
authority: uri.authority,
|
@@ -91,43 +117,81 @@ function parseCdecodeUri(uriString) {
|
|
91
117
|
queryData,
|
92
118
|
fragmentData
|
93
119
|
};
|
94
|
-
}
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
120
|
+
} else if (uri.scheme === "cdecode" /* Scheme.cdecode */) {
|
121
|
+
// Handle empty or invalid path segments
|
122
|
+
if (pathSegmentsArray.length === 0 || pathSegmentsArray.length === 1 && (pathSegmentsArray[0] === 'null' || pathSegmentsArray[0] === 'undefined')) {
|
123
|
+
// Handle the case with no path segments or null/undefined path
|
124
|
+
return {
|
125
|
+
scheme: uri.scheme,
|
126
|
+
authority: uri.authority,
|
127
|
+
pathSegments,
|
128
|
+
queryData,
|
129
|
+
fragmentData
|
130
|
+
};
|
131
|
+
}
|
132
|
+
// Handle empty segments (like `//accounts/resourceId`)
|
133
|
+
if (pathSegmentsArray.length >= 2 && pathSegmentsArray[0] === '') {
|
134
|
+
// Empty organization segment
|
135
|
+
if (pathSegmentsArray.length >= 3 && pathSegmentsArray[1] === '') {
|
136
|
+
// Empty resourceGroup segment also
|
137
|
+
const possibleResourceType = pathSegmentsArray[2];
|
138
|
+
const resourceId = pathSegmentsArray[3];
|
139
|
+
// Validate resourceType exists in ConfigCollectionName
|
140
|
+
const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceType);
|
141
|
+
if (isResourceType && resourceId) {
|
142
|
+
pathSegments.resourceType = possibleResourceType;
|
143
|
+
pathSegments.resourceId = resourceId;
|
144
|
+
return {
|
145
|
+
scheme: uri.scheme,
|
146
|
+
authority: uri.authority,
|
147
|
+
pathSegments,
|
148
|
+
queryData,
|
149
|
+
fragmentData
|
150
|
+
};
|
151
|
+
}
|
152
|
+
}
|
103
153
|
}
|
104
|
-
//
|
105
|
-
|
106
|
-
|
107
|
-
} else if (pathSegmentsArray.length === 2) {
|
108
|
-
// Case: organization/project or organization/resourceType
|
109
|
-
const possibleResourceTypeOrProject = pathSegmentsArray[1];
|
110
|
-
// Check if it's a valid resourceType
|
111
|
-
const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceTypeOrProject);
|
112
|
-
if (isResourceType) {
|
113
|
-
// If it's a valid resourceType, validate further
|
114
|
-
throw new Error(`Invalid URI structure: The resourceType "${possibleResourceTypeOrProject}" is missing the resourceId.`);
|
154
|
+
// Non-empty first segment is the organization
|
155
|
+
if (pathSegmentsArray[0] !== '') {
|
156
|
+
pathSegments.organization = pathSegmentsArray[0];
|
115
157
|
}
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
158
|
+
if (pathSegmentsArray.length === 3) {
|
159
|
+
// Case: organization/resourceType/resourceId
|
160
|
+
const possibleResourceType = pathSegmentsArray[1];
|
161
|
+
const resourceId = pathSegmentsArray[2];
|
162
|
+
// Validate the resourceType against ConfigCollectionName
|
163
|
+
const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceType);
|
164
|
+
if (!isResourceType) {
|
165
|
+
throw new Error(`Invalid URI structure: The resourceType "${possibleResourceType}" is not included in ConfigCollectionName.`);
|
166
|
+
}
|
167
|
+
// Assign resourceType and resourceId
|
168
|
+
pathSegments.resourceType = possibleResourceType;
|
169
|
+
pathSegments.resourceId = resourceId;
|
170
|
+
} else if (pathSegmentsArray.length === 2) {
|
171
|
+
// Case: organization/project or organization/resourceType
|
172
|
+
const possibleResourceTypeOrProject = pathSegmentsArray[1];
|
173
|
+
// Check if it's a valid resourceType
|
174
|
+
const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceTypeOrProject);
|
175
|
+
if (isResourceType) {
|
176
|
+
// If it's a valid resourceType, validate further
|
177
|
+
throw new Error(`Invalid URI structure: The resourceType "${possibleResourceTypeOrProject}" is missing the resourceId.`);
|
178
|
+
}
|
179
|
+
// Otherwise, treat it as a project
|
180
|
+
pathSegments.resourceGroup = possibleResourceTypeOrProject;
|
181
|
+
} else if (pathSegmentsArray.length > 3) {
|
182
|
+
// Case: organization/project/resourceType/resourceId
|
183
|
+
pathSegments.resourceGroup = pathSegmentsArray[1];
|
184
|
+
const possibleResourceType = pathSegmentsArray[2];
|
185
|
+
const resourceId = pathSegmentsArray[3];
|
186
|
+
// Validate the resourceType
|
187
|
+
const isResourceType = Object.values(ConfigCollectionName).includes(possibleResourceType);
|
188
|
+
if (!isResourceType) {
|
189
|
+
throw new Error(`Invalid URI structure: The resourceType "${possibleResourceType}" is not included in ConfigCollectionName.`);
|
190
|
+
}
|
191
|
+
// Assign resourceType and resourceId
|
192
|
+
pathSegments.resourceType = possibleResourceType;
|
193
|
+
pathSegments.resourceId = resourceId;
|
127
194
|
}
|
128
|
-
// Assign resourceType and resourceId
|
129
|
-
pathSegments.resourceType = possibleResourceType;
|
130
|
-
pathSegments.resourceId = resourceId;
|
131
195
|
}
|
132
196
|
return {
|
133
197
|
scheme: uri.scheme,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"cdecodeUri.js","sources":["../../src/utils/cdecodeUri.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"cdecodeUri.js","sources":["../../src/utils/cdecodeUri.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
@@ -1,5 +1,10 @@
|
|
1
1
|
import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
|
2
2
|
import { ConfigCollectionName, ConfigFragmentName } from 'common/lib/generated/generated-models.js';
|
3
|
+
import { Scheme } from '../constants';
|
4
|
+
declare const defaultOptions: {
|
5
|
+
flatten: boolean;
|
6
|
+
scheme: Scheme;
|
7
|
+
};
|
3
8
|
/**
|
4
9
|
* Generate URI, it sorts the params in order to generate URI.
|
5
10
|
* @param collectionName Schema Name to be used
|
@@ -9,9 +14,7 @@ import { ConfigCollectionName, ConfigFragmentName } from 'common/lib/generated/g
|
|
9
14
|
*/
|
10
15
|
export declare const generateUri: (collectionName: ConfigCollectionName, params: {
|
11
16
|
[key: string]: any;
|
12
|
-
}, fragment: string, authority?: string, options?:
|
13
|
-
flatten: boolean;
|
14
|
-
}) => URI;
|
17
|
+
}, fragment: string, authority?: string, options?: Partial<typeof defaultOptions>) => URI;
|
15
18
|
/**
|
16
19
|
* Generates URI for User with `_id` as `self` if the user logged in otherwise `guest`
|
17
20
|
*/
|
@@ -31,8 +34,7 @@ export declare const generateResourceUri: (collectionName: ConfigCollectionName,
|
|
31
34
|
[key: string]: any;
|
32
35
|
name?: string;
|
33
36
|
orgName: string;
|
34
|
-
}, fragment: string, authority?: string, options?:
|
35
|
-
flatten: boolean;
|
36
|
-
}) => URI;
|
37
|
+
}, fragment: string, authority?: string, options?: Partial<typeof defaultOptions>) => URI;
|
37
38
|
export declare const generateOrgUri: (name: string, fragment: string, authority?: string) => URI;
|
38
39
|
export declare const generateMachineUri: (name: string, fragment: string, authority?: string) => URI;
|
40
|
+
export {};
|
@@ -1,17 +1,19 @@
|
|
1
|
-
import {
|
1
|
+
import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import sortKeys from'sort-keys';import queryString from'query-string';import {ConfigFragmentName,ConfigCollectionName}from'common/lib/generated/generated-models.js';import {flatten}from'./flatten-utils.js';function hasNestedObject(obj) {
|
2
2
|
// Not an object or null? No nesting to worry about.
|
3
3
|
if (typeof obj !== 'object' || obj === null) {
|
4
4
|
return false;
|
5
5
|
}
|
6
|
-
// Treat arrays as acceptable
|
6
|
+
// Treat arrays as acceptable
|
7
7
|
if (Array.isArray(obj)) {
|
8
8
|
return false;
|
9
9
|
}
|
10
|
-
//
|
11
|
-
|
12
|
-
// direct child objects. E.g. { name: { name: 'tet' } } triggers an error.
|
13
|
-
return Object.values(obj).some(val => typeof val === 'object' && val !== null && !Array.isArray(val));
|
10
|
+
// Only consider it nested if any value is a non-null, non-array object
|
11
|
+
return Object.values(obj).some(val => val !== null && typeof val === 'object' && !Array.isArray(val) && !(val instanceof Date));
|
14
12
|
}
|
13
|
+
const defaultOptions = {
|
14
|
+
flatten: false,
|
15
|
+
scheme: "mongo-db-file" /* Scheme.mongoDbFile */
|
16
|
+
};
|
15
17
|
/**
|
16
18
|
* Generate URI, it sorts the params in order to generate URI.
|
17
19
|
* @param collectionName Schema Name to be used
|
@@ -19,18 +21,22 @@ import {Schemas}from'@workbench-stack/core/lib/core/network.js';import {URI}from
|
|
19
21
|
* @param fragment
|
20
22
|
* @param authority
|
21
23
|
*/
|
22
|
-
const generateUri = (collectionName, params, fragment, authority = '', options
|
23
|
-
|
24
|
-
|
24
|
+
const generateUri = (collectionName, params, fragment, authority = '', options) => {
|
25
|
+
options = {
|
26
|
+
...defaultOptions,
|
27
|
+
...options
|
28
|
+
};
|
25
29
|
// If we are NOT flattening, but detect nested objects, throw an error
|
26
30
|
if (!options.flatten && hasNestedObject(params)) {
|
27
31
|
throw new Error(`generateUri: "params: ${JSON.stringify(params)}" contains nested object(s), but "options.flatten" is false. Please flatten your data or enable flatten.`);
|
28
32
|
}
|
33
|
+
console.log('---params---', params);
|
29
34
|
params = options.flatten ? flatten(params) : params;
|
35
|
+
console.log('---params after flatten---', params);
|
30
36
|
const orderedParams = sortKeys(params);
|
31
37
|
const queryString$1 = queryString.stringify(orderedParams);
|
32
38
|
return URI.file(`/${collectionName}`).with({
|
33
|
-
scheme:
|
39
|
+
scheme: options.scheme,
|
34
40
|
authority,
|
35
41
|
fragment,
|
36
42
|
query: queryString$1
|
@@ -58,9 +64,7 @@ const generateUserUri = (params, fragment = ConfigFragmentName.Settings, authori
|
|
58
64
|
const generateApplicationUri = (orgName, fragment = ConfigFragmentName.Settings, authority = '') => generateUri(ConfigCollectionName.Organizations, {
|
59
65
|
orgName
|
60
66
|
}, fragment, authority);
|
61
|
-
const generateResourceUri = (collectionName, params, fragment, authority = '', options
|
62
|
-
flatten: false
|
63
|
-
}) => generateUri(collectionName, params, fragment, authority, options);
|
67
|
+
const generateResourceUri = (collectionName, params, fragment, authority = '', options) => generateUri(collectionName, params, fragment, authority, options);
|
64
68
|
const generateOrgUri = (name, fragment, authority = '') => generateUri(ConfigCollectionName.Organizations, {
|
65
69
|
name
|
66
70
|
}, fragment, authority);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"generate-uri.js","sources":["../../src/utils/generate-uri.ts"],"sourcesContent":[null],"names":["queryString","querystring"],"mappings":"
|
1
|
+
{"version":3,"file":"generate-uri.js","sources":["../../src/utils/generate-uri.ts"],"sourcesContent":[null],"names":["queryString","querystring"],"mappings":"oRAOA,SAAS,eAAe,CAAC,GAAQ,EAAA;;MAEzB,OAAA,QAAe,QAAA,OAAe,KAAA,IAAS,EAAA;AACvC,IAAA,OAAA;;;AAGJ,EAAA,IAAA,aAAU,CAAA,GAAW,CAAA,EAAC;AAClB,IAAA,OAAA;;;AAGJ,EAAA,OAAA,aAAc,CAAA,GAAO,CAAA,CAAG,IAAE,CAAA,GACrB,IAAK,GAAE,KAAI,IAAK,IAAI,OAAI,GAAA,KAAU,YAAa,CAAI,KAAM,CAAA,WAAQ,CAAC,IAAI,EAAA,GAAK,gBAAgB,CAAI,CAAA;AAExG;AAEA,MAAM,cAAc,GAAG;AAEvB,EAAA,OAAA,EAAA,KAAA;;;;;;AAMG;AACH;;;AASgB,MAAA,WAAQ,GAAA,CAAI,gBAAgB,MAAM,EAAC,QAAG,EAAA,SAAA,GAAA,EAAA,EAAA,OAAA,KAAA;AAC9C,EAAA,OAAA,GAAA;IAKJ,GAAC,cAAA;AACD,IAAA,GAAA;AACA,GAAA;AACA;AACA,EAAA,IAAA,CAAA,mBAAsB,eAAe,CAAC,MAAC,CAAA,EAAA;IACvC,MAAM,IAAA,KAAA,CAAA,CAAW,wBAAwB,IAAC,CAAA,SAAa,CAAC,MAAC,CAAA,CAAA,wGAAA,CAAA,CAAA;;SAG/C,CAAA,GAAA,CAAA,cAAgB,EAAA,MAAA,CAAA;QACtB,GAAS,OAAA,CAAA,OAAA,GAAA,OAAA,CAAA,MAAA,CAAA,GAAA,MAAA;SACD,CAAA,GAAA,CAAA,4BAAA,EAAA,MAAA,CAAA;AACR,EAAA,MAAA,aAAkB,GAAA,QAAA,CAAA,MAAA,CAAA;AACrB,EAAA,MAAEA,aAAA,GAAAC,WAAA,CAAA,SAAA,CAAA,aAAA,CAAA;AACP,EAAE,OAAA,GAAA,CAAA,IAAA,CAAA,CAAA,CAAA,EAAA,cAAA,CAAA,CAAA,CAAA,CAAA,IAAA,CAAA;AAEF,IAAA,MAAA,EAAA,OAAA,CAAA,MAAA;;AAEG,IAAA,QAAA;AACH,IAAA,KAAO,EAAAD;AAMP,GAAA,CAAA;;AAEG;AACH;AAKI;AACmC,MAAA,oBAAiB,GAAA,CAAA,WAAW,EAAA,QAAA,GAAA,kBAAA,CAAA,QAAA,EAAA,SAAA,GAAA,EAAA,KAAA,WAAA,CAAA,oBAAA,CAAA,QAAA,EAAA;;WAE9D,EAAA,SAAA;AACD;AACJ;AAEA;;AAEG,EAAA,IAAA,MAAA,CAAA,SAAA,EAAA;AACH,IAAA,MAAO,CAAA,KAA4B,GAAA,CAAA,MAAA,CAAA,SAAA,CAAA;AAGnC,IAAA,OAAO,MAAyB,CAAA,SAAA;AAQhC;AAGA,EAAA,OAAO,WAAwB,CAAA,oBAAkB,CAAA,QAAkB,EAAA,MAAA,EAAS,QAAO,EAC/E,SAAA,CAAA;;;;;;;;;;;;;;"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
import { AuthStrategy } from 'common/lib/generated/generated-models';
|
1
|
+
import { AuthStrategy } from 'common/lib/generated/generated-models.js';
|
2
2
|
export declare const getUserAlias: (alias: string[], strategy: AuthStrategy) => any;
|
@@ -1,17 +1,17 @@
|
|
1
1
|
import { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri';
|
2
|
-
import { IPreferencesOpenOptionsInput, ConfigurationTarget } from 'common/lib/generated/generated-models';
|
2
|
+
import { IPreferencesOpenOptionsInput, ConfigurationTarget } from 'common/lib/generated/generated-models.js';
|
3
3
|
export declare function getOpenSettings(target: ConfigurationTarget, resource: URI, options: IPreferencesOpenOptionsInput): {
|
4
4
|
editableSettingsInput: URI;
|
5
5
|
defaultPreferencesInput: URI;
|
6
6
|
};
|
7
7
|
/**
|
8
|
-
* Tries to parse the
|
8
|
+
* Tries to parse the "extension name" from a URI path that might look like:
|
9
9
|
* /myExtension/settings.json
|
10
10
|
* /defaultsettings/resourceSettings.json
|
11
11
|
* /someFolder/myExtension/organizationSettings.json
|
12
12
|
*
|
13
|
-
* If the last path segment is one of the
|
14
|
-
* the second-to-last segment as the extension name. Otherwise, return
|
13
|
+
* If the last path segment is one of the "known" settings files, return
|
14
|
+
* the second-to-last segment as the extension name. Otherwise, return "settings" by default.
|
15
15
|
*/
|
16
16
|
export declare function parseExtensionFromDefaultSettingsUri(resource: URI): string;
|
17
17
|
export declare function getDefaultSettingsURI(target: ConfigurationTarget, options: IPreferencesOpenOptionsInput): URI;
|
@@ -7,7 +7,7 @@ function getOpenSettings(target, resource, options) {
|
|
7
7
|
query: editableSettingsResource.query,
|
8
8
|
// Use editableSettingsResource.fragment if none was explicitly set.
|
9
9
|
defaultFragment: options?.defaultFragment ?? editableSettingsResource.fragment,
|
10
|
-
// Use the provided extensionName, or derive it from the resource
|
10
|
+
// Use the provided extensionName, or derive it from the resource's path
|
11
11
|
extensionName: options?.extensionName ?? parseExtensionFromDefaultSettingsUri(editableSettingsResource)
|
12
12
|
};
|
13
13
|
const defaultPreferencesResource = getDefaultSettingsURI(target, mergedOptions);
|
@@ -17,13 +17,13 @@ function getOpenSettings(target, resource, options) {
|
|
17
17
|
};
|
18
18
|
}
|
19
19
|
/**
|
20
|
-
* Tries to parse the
|
20
|
+
* Tries to parse the "extension name" from a URI path that might look like:
|
21
21
|
* /myExtension/settings.json
|
22
22
|
* /defaultsettings/resourceSettings.json
|
23
23
|
* /someFolder/myExtension/organizationSettings.json
|
24
24
|
*
|
25
|
-
* If the last path segment is one of the
|
26
|
-
* the second-to-last segment as the extension name. Otherwise, return
|
25
|
+
* If the last path segment is one of the "known" settings files, return
|
26
|
+
* the second-to-last segment as the extension name. Otherwise, return "settings" by default.
|
27
27
|
*/
|
28
28
|
function parseExtensionFromDefaultSettingsUri(resource) {
|
29
29
|
const pathSegments = resource.path.split('/').filter(Boolean);
|
@@ -46,7 +46,7 @@ function parseExtensionFromDefaultSettingsUri(resource) {
|
|
46
46
|
if (lastSegment.endsWith('.json')) {
|
47
47
|
// e.g. "/myExtension/otherFile.json" → extension = "otherFile" (or 2nd to last segment?)
|
48
48
|
// This snippet assumes you want "otherFile" from the last segment. If you instead want
|
49
|
-
// the second-to-last segment as an
|
49
|
+
// the second-to-last segment as an "extensionName," just adjust accordingly.
|
50
50
|
const trimmed = lastSegment.replace(/\.json$/, '');
|
51
51
|
return trimmed || ConfigurationContributionNames.Settings;
|
52
52
|
}
|
@@ -90,14 +90,15 @@ function getEditableSettingsURI(resource, options = {
|
|
90
90
|
fragment
|
91
91
|
} = options;
|
92
92
|
if (options?.subFragment) {
|
93
|
-
// If there
|
93
|
+
// If there's a subFragment, stitch it into the main fragment
|
94
94
|
fragment = fragment ? fragment.concat(`.${options.subFragment}`) : options.subFragment;
|
95
95
|
}
|
96
|
-
// Fall back to the resource
|
96
|
+
// Fall back to the resource's existing fragment if neither fragment nor subFragment is provided
|
97
97
|
const finalFragment = fragment ?? resource.fragment;
|
98
|
-
// Create a new URI with the possibly updated fragment
|
98
|
+
// Create a new URI with the possibly updated fragment, make sure to include authority.
|
99
99
|
const newResource = URI.from({
|
100
100
|
scheme: resource.scheme,
|
101
|
+
authority: resource.authority,
|
101
102
|
path: resource.path,
|
102
103
|
query: resource.query,
|
103
104
|
fragment: finalFragment
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"preferenceUri.js","sources":["../../src/utils/preferenceUri.ts"],"sourcesContent":[null],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"preferenceUri.js","sources":["../../src/utils/preferenceUri.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
@@ -15,18 +15,21 @@ function convertToResourceUri(resource, scope) {
|
|
15
15
|
const isValidUri = uri => 'scheme' in uri && 'path' in uri;
|
16
16
|
if (resource instanceof URI) {
|
17
17
|
if (isValidUri(resource)) {
|
18
|
-
if (resource.scheme === "cdecode" /* Scheme.
|
18
|
+
if (resource.scheme === "cdecode" /* Scheme.cdecode */) {
|
19
19
|
// Use parseCdecodeUri for cdecode URIs.
|
20
20
|
const parsedUri = parseCdecodeUri(resource);
|
21
|
-
console.log('parsedUri---hehehrhe', parsedUri, '---scope', scope);
|
21
|
+
// console.log('parsedUri---hehehrhe', parsedUri, '---scope', scope);
|
22
22
|
// Determine the path and construct the query string based on available segments.
|
23
23
|
let path = '';
|
24
24
|
const queryData = {};
|
25
25
|
if (parsedUri.pathSegments.resourceType && (scope ? scope === 4 /* ConfigurationScope.RESOURCE */ : true)) {
|
26
|
-
console.log('resourceType---hehehrhe', parsedUri.pathSegments.resourceType);
|
26
|
+
// console.log('resourceType---hehehrhe', parsedUri.pathSegments.resourceType);
|
27
27
|
// Resource-specific URI detected. Build a resource URI.
|
28
28
|
path = `/${parsedUri.pathSegments.resourceType}`;
|
29
|
-
|
29
|
+
// Only add orgName to query if it exists in the parsed URI
|
30
|
+
if (parsedUri.pathSegments.organization) {
|
31
|
+
queryData.orgName = parsedUri.pathSegments.organization;
|
32
|
+
}
|
30
33
|
if (parsedUri.pathSegments.resourceId) {
|
31
34
|
let resourceId = parsedUri.pathSegments.resourceId;
|
32
35
|
// Instead of decoding, check for both literal colon ':' and its encoded forms '%3A' or '%3a'.
|
@@ -48,15 +51,23 @@ function convertToResourceUri(resource, scope) {
|
|
48
51
|
queryData.orgName = parsedUri.pathSegments.organization;
|
49
52
|
queryData.resourceGroup = parsedUri.pathSegments.resourceGroup;
|
50
53
|
} else if (parsedUri.pathSegments.organization && (scope ? scope === 3 /* ConfigurationScope.WINDOW */ : true)) {
|
51
|
-
console.log('organization---hehehrhe', parsedUri.pathSegments.organization);
|
54
|
+
// console.log('organization---hehehrhe', parsedUri.pathSegments.organization);
|
52
55
|
path = `/${ConfigCollectionName.Organizations}`;
|
53
56
|
queryData.name = parsedUri.pathSegments.organization;
|
54
57
|
} else {
|
55
|
-
|
58
|
+
// if no organization like in pubngo we still return
|
59
|
+
return URI.from({
|
60
|
+
scheme: "cde-resource" /* Scheme.cdeResource */,
|
61
|
+
authority: parsedUri.authority,
|
62
|
+
path,
|
63
|
+
query: queryString.stringify(queryData),
|
64
|
+
fragment: parsedUri.fragmentData
|
65
|
+
});
|
66
|
+
// throw new Error('not a valid resource');
|
56
67
|
}
|
57
68
|
// Regardless of the input, always use the "cde-resource" scheme for converted URIs.
|
58
69
|
return URI.from({
|
59
|
-
scheme: "cde-resource" /* Scheme.
|
70
|
+
scheme: "cde-resource" /* Scheme.cdeResource */,
|
60
71
|
authority: parsedUri.authority,
|
61
72
|
path,
|
62
73
|
query: queryString.stringify(queryData),
|
@@ -69,14 +80,14 @@ function convertToResourceUri(resource, scope) {
|
|
69
80
|
}
|
70
81
|
if (typeof resource === 'string') {
|
71
82
|
const parsedUri = URI.parse(resource);
|
72
|
-
if (parsedUri.scheme === "cdecode" /* Scheme.
|
83
|
+
if (parsedUri.scheme === "cdecode" /* Scheme.cdecode */) {
|
73
84
|
return convertToResourceUri(parsedUri); // Reuse the logic for URI instances.
|
74
85
|
}
|
75
86
|
return parsedUri;
|
76
87
|
}
|
77
88
|
if (typeof resource === 'object') {
|
78
89
|
const revivedUri = reviveUri(resource);
|
79
|
-
if (revivedUri.scheme === "cdecode" /* Scheme.
|
90
|
+
if (revivedUri.scheme === "cdecode" /* Scheme.cdecode */) {
|
80
91
|
return convertToResourceUri(revivedUri); // Reuse the logic for URI instances.
|
81
92
|
}
|
82
93
|
return revivedUri;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"resourceUriConversion.js","sources":["../../src/utils/resourceUriConversion.ts"],"sourcesContent":[null],"names":[],"mappings":"6QAQA;AACa,MAAA,YAAY,GAAG,QAAC,IAA4C;AACrE,EAAA,IAAA,OAAW,QAAA,KAAa,QAAA,EAAQ;AAC5B,IAAA,OAAA;;AAEJ,EAAA,MAAA;AACA,IAAA;AACA,GAAA,GAAA;AACA,EAAA,MAAA,QAAc,cAAW,GAAA,CAAA,CAAA,EAAQ,QAAG,CAAA,KAAA,CAAA,CAAA,GAAA,EAAA;AACxC,EAAE,MAAA,QAAA,GAAA,QAAA,CAAA,QAAA,GAAA,CAAA,CAAA,EAAA,QAAA,CAAA,QAAA,CAAA,CAAA,GAAA,EAAA;AAEF,EAAA,OAAgB,CAAA,EAAA,IAAA,CAAA,EAAA,KAAA,CAAA,EAAA,QAAA,CAAoB,CAAC;AACjC;AAAe,6BAAY,CAAA,QAAA,EAAA,KAAA,EAAA;AAC3B,EAAA,IAAA,CAAA,QAAgB,EAAA,OAAI;AAEpB,EAAA,MAAI,UAAQ,GAAA,GAAA,IAAY,QAAM,IAAA,GAAA,IAAA,MAAA,IAAA,GAAA;AAC1B,EAAA,IAAA,QAAc,YAAS,GAAA,EAAA;AACnB,IAAA,IAAA,UAAY,CAAA,QAAO,CAAA,EAAA;kBACyB,CAAA,MAAA,KAAA,SAAA,uBAAA;AACxC;
|
1
|
+
{"version":3,"file":"resourceUriConversion.js","sources":["../../src/utils/resourceUriConversion.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
@@ -11,6 +11,27 @@ export interface SplitCedcodeUriResult {
|
|
11
11
|
*/
|
12
12
|
resourceUri?: URI;
|
13
13
|
}
|
14
|
+
export interface SplitOrgUriResult {
|
15
|
+
/**
|
16
|
+
* The base organization URI, containing only the organization segment.
|
17
|
+
*/
|
18
|
+
baseOrgUri: URI;
|
19
|
+
/**
|
20
|
+
* The resource group URI if a resource group segment exists.
|
21
|
+
* If not present, this value will be undefined.
|
22
|
+
*/
|
23
|
+
resourceGroupUri?: URI;
|
24
|
+
/**
|
25
|
+
* The resource group type if a resource group segment exists.
|
26
|
+
* If not present, this value will be undefined.
|
27
|
+
*/
|
28
|
+
resourceGroupType?: string;
|
29
|
+
/**
|
30
|
+
* The resource group ID if a resource group segment exists.
|
31
|
+
* If not present, this value will be undefined.
|
32
|
+
*/
|
33
|
+
resourceGroupId?: string;
|
34
|
+
}
|
14
35
|
/**
|
15
36
|
* Splits a given cdecode URI ino an organization URI (orgUri) and, if available, a resource-specific URI (resourceUri).
|
16
37
|
*
|
@@ -23,3 +44,10 @@ export interface SplitCedcodeUriResult {
|
|
23
44
|
* @return An object containing the orgUri and, optionally, the resourceUri.
|
24
45
|
*/
|
25
46
|
export declare function splitCdecodeUri(cdecodeUri: URI): SplitCedcodeUriResult;
|
47
|
+
/**
|
48
|
+
* Splits an organization URI into a base organization URI and, if available, a resource group URI.
|
49
|
+
*
|
50
|
+
* @param orgUri The organization URI that may contain both organization and resource group segments
|
51
|
+
* @returns An object containing the baseOrgUri and optionally the resourceGroupUri
|
52
|
+
*/
|
53
|
+
export declare function splitOrgUri(orgUri: URI): SplitOrgUriResult;
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import {parseCdecodeUri,generateCdecodeUri}from'./cdecodeUri.js';import {convertToResourceUri}from'./resourceUriConversion.js';/**
|
1
|
+
import {URI}from'@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';import {ConfigCollectionName}from'common';import {parseCdecodeUri,generateCdecodeUri}from'./cdecodeUri.js';import {convertToResourceUri}from'./resourceUriConversion.js';/**
|
2
2
|
* Splits a given cdecode URI ino an organization URI (orgUri) and, if available, a resource-specific URI (resourceUri).
|
3
3
|
*
|
4
4
|
* - If the incoming URI contains resource-specific segments (i.e. resourceType and resourceId), the organization URI
|
@@ -10,6 +10,7 @@ import {parseCdecodeUri,generateCdecodeUri}from'./cdecodeUri.js';import {convert
|
|
10
10
|
* @return An object containing the orgUri and, optionally, the resourceUri.
|
11
11
|
*/
|
12
12
|
function splitCdecodeUri(cdecodeUri) {
|
13
|
+
console.log('---cdecodeUri---->>>>>>>>', cdecodeUri);
|
13
14
|
const parsedUri = parseCdecodeUri(cdecodeUri);
|
14
15
|
// Check if resource-specific segments exist.
|
15
16
|
if (parsedUri.pathSegments.resourceType && parsedUri.pathSegments.resourceId) {
|
@@ -36,4 +37,48 @@ function splitCdecodeUri(cdecodeUri) {
|
|
36
37
|
return {
|
37
38
|
orgUri: cdecodeUri
|
38
39
|
};
|
39
|
-
}
|
40
|
+
}
|
41
|
+
/**
|
42
|
+
* Splits an organization URI into a base organization URI and, if available, a resource group URI.
|
43
|
+
*
|
44
|
+
* @param orgUri The organization URI that may contain both organization and resource group segments
|
45
|
+
* @returns An object containing the baseOrgUri and optionally the resourceGroupUri
|
46
|
+
*/
|
47
|
+
function splitOrgUri(orgUri) {
|
48
|
+
const parsedUri = parseCdecodeUri(orgUri);
|
49
|
+
const {
|
50
|
+
organization,
|
51
|
+
resourceGroup
|
52
|
+
} = parsedUri.pathSegments;
|
53
|
+
// Generate the base organization URI
|
54
|
+
const baseOrgUri = URI.from({
|
55
|
+
scheme: "cde-resource" /* Scheme.cdeResource */,
|
56
|
+
authority: orgUri.authority,
|
57
|
+
path: `/${ConfigCollectionName.Organizations}`,
|
58
|
+
fragment: parsedUri.fragmentData,
|
59
|
+
query: `name=${organization}`
|
60
|
+
});
|
61
|
+
// If there's no resource group, return just the base org URI
|
62
|
+
if (!resourceGroup) {
|
63
|
+
return {
|
64
|
+
baseOrgUri
|
65
|
+
};
|
66
|
+
}
|
67
|
+
// Handle resource group with type:id format
|
68
|
+
const colonIndex = resourceGroup.indexOf(':');
|
69
|
+
const [resourceGroupType, resourceGroupId] = colonIndex !== -1 ? [resourceGroup.substring(0, colonIndex), resourceGroup.substring(colonIndex + 1)] : [ConfigCollectionName.Projects, resourceGroup];
|
70
|
+
// Generate the resource group URI using the type as the path segment
|
71
|
+
const resourceGroupUri = URI.from({
|
72
|
+
scheme: "cde-resource" /* Scheme.cdeResource */,
|
73
|
+
authority: orgUri.authority,
|
74
|
+
path: `/${resourceGroupType}`,
|
75
|
+
query: `orgName=${organization}&_id=${resourceGroupId}`,
|
76
|
+
fragment: parsedUri.fragmentData
|
77
|
+
});
|
78
|
+
return {
|
79
|
+
baseOrgUri,
|
80
|
+
resourceGroupUri,
|
81
|
+
resourceGroupType,
|
82
|
+
resourceGroupId
|
83
|
+
};
|
84
|
+
}export{splitCdecodeUri,splitOrgUri};//# sourceMappingURL=splitCdecodeUri.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"splitCdecodeUri.js","sources":["../../src/utils/splitCdecodeUri.ts"],"sourcesContent":[null],"names":[],"mappings":"+
|
1
|
+
{"version":3,"file":"splitCdecodeUri.js","sources":["../../src/utils/splitCdecodeUri.ts"],"sourcesContent":[null],"names":[],"mappings":"+OAyCA;;;;;;;;;;AAUG;AACG,SAAU,eAAe,CAAC,UAAe,EAAA;AAC3C,EAAA,OAAA,CAAA,GAAW,CAAA,6BAA4B,UAAE,CAAA;AACzC,EAAA,MAAA,YAAkB,eAAA,CAAA,UAAgB,CAAA;;AAGlC,EAAA,IAAA,SAAa,CAAA,YAAa,CAAA,YAAa,IAAA,SAAa,CAAA,YAAa,CAAA,UAAW,EAAA;;AAExE,IAAA,MAAA;AACI,MAAA,YAAA,EAAA,SAAc,CAAA,YAAU,CAAA;;;AAI5B,IAAA,IAAA,sBAAc,CAAA,aAAa,EAAA;eACd,CAAA,yBAAiB,CAAA,YAAsB,CAAA;;;AAIpD,IAAA,MAAA,MAAY,GAAA,kBAAqB,CAAA,UACnB,CAAA,SAAU,EAAA,SACX,EAAA,EAAA;;aAKsD,CAAA,YAAA,CAAA;AACnE;AAEA,IAAA,MAAA,WAAS,GAAQ,oBAAc,CAAA,UAAA,CAAA;IACnC,OAAC;MAE4F,MAAA;AAC7F,MAAA;AACJ,KAAC;AAED;;;;;AAKG;AACH;AACI;;;AAIA;AACI;SACS,WAAkB,CAAA,MAAA,EAAA;AAC3B,EAAA,MAAA,SAAM,GAAwB,eAAA,CAAA;QAC9B;gBACe;AAClB,IAAA;MAE4D,SAAA,CAAA,YAAA;;QAEzD,UAAmB,GAAA,GAAA,CAAA,IAAE,CAAC;IAC1B,MAAC,EAAA,cAAA;IAED,SAA4C,EAAA,MAAA,CAAA,SAAA;IAC5C,IAAM,EAAA,CAAA,CAAA,EAAA,oBAA0B,CAAA,aAAY,CAAC,CAAC;IAC9C,gCAA0B;AAElB,IAAA,KAAC,EAAE,CAAA,KAAA,EAAA,YAAuB,CAAA;;;AAIlC,EAAA,IAAA,CAAA,aAAsB,EAAA;AAClB,IAAA,OAAA;;;AAGA;;AAEH,EAAA,MAAE,UAAA,GAAA,aAAA,CAAA,OAAA,CAAA,GAAA,CAAA;QAEI,CAAA,iBAAA,EAAA,eAAA,CAAA,GAAA,UAAA,KAAA,EAAA,GAAA,CAAA,aAAA,CAAA,SAAA,CAAA,CAAA,EAAA,UAAA,CAAA,EAAA,aAAA,CAAA,SAAA,CAAA,UAAA,GAAA,CAAA,CAAA,CAAA,GAAA,CAAA,oBAAA,CAAA,QAAA,EAAA,aAAA,CAAA;;QAEH,gBAAgB,GAAA,GAAA,CAAA,IAAA,CAAA;UACC,EAAA,cAAA;aACF,EAAA,MAAA,CAAA,SAAA;QACjB,EAAA,CAAA,CAAA,EAAA,iBAAA,CAAA,CAAA;AACN,IAAC,KAAA,EAAA,CAAA,QAAA,EAAA,YAAA,CAAA,KAAA,EAAA,eAAA,CAAA,CAAA;;;;;;;;;"}
|
@@ -1 +1,4 @@
|
|
1
|
+
export { IJSONSchema } from '@vscode-alt/monaco-editor/esm/vs/base/common/jsonSchema.js';
|
1
2
|
export { URI, UriComponents, uriToFsPath } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';
|
3
|
+
export { IJSONSchemaMap } from '@vscode-alt/monaco-editor/esm/vs/base/common/jsonSchema.js';
|
4
|
+
export { IJSONSchemaSnippet } from '@vscode-alt/monaco-editor/esm/vs/base/common/jsonSchema.js';
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@adminide-stack/core",
|
3
|
-
"version": "10.2.
|
3
|
+
"version": "10.2.3-alpha.1",
|
4
4
|
"description": "AdminIDE core for higher packages to depend on",
|
5
5
|
"license": "UNLICENSED",
|
6
6
|
"author": "CDMBase LLC",
|
@@ -23,7 +23,7 @@
|
|
23
23
|
"dependencies": {
|
24
24
|
"@vscode-alt/monaco-editor": "^0.21.4",
|
25
25
|
"@workbench-stack/core": "3.9.7",
|
26
|
-
"common": "10.2.
|
26
|
+
"common": "10.2.3-alpha.1",
|
27
27
|
"query-string": "^9.0.0",
|
28
28
|
"sort-keys": "^5.0.0",
|
29
29
|
"vscode-uri": "^3.0.8"
|
@@ -35,7 +35,7 @@
|
|
35
35
|
"publishConfig": {
|
36
36
|
"access": "public"
|
37
37
|
},
|
38
|
-
"gitHead": "
|
38
|
+
"gitHead": "91f27ac410c8cbb8513b73d3c5e63702634df838",
|
39
39
|
"typescript": {
|
40
40
|
"definition": "lib/index.d.ts"
|
41
41
|
}
|