Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"@angular/localize": "^20.2.1",
"@briebug/jest-schematic": "^6.0.0",
"@openmfp/portal-ui-lib": "^0.177.0",
"@openmfp/config-prettier": "^0.8.1",
"@types/jest": "^30.0.0",
"@types/jmespath": "0.15.2",
"@types/jsonpath": "^0.2.4",
Expand Down
5 changes: 4 additions & 1 deletion projects/lib/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
"dest": "../../dist",
"lib": {
"entryFile": "./public-api.ts"
}
},
"allowedNonPeerDependencies": [
"@openmfp/portal-ui-lib"
]
}

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions projects/lib/organization/ng-package.json

This file was deleted.

9 changes: 0 additions & 9 deletions projects/lib/organization/provide-organization-feature.ts

This file was deleted.

1 change: 0 additions & 1 deletion projects/lib/organization/public-api.ts

This file was deleted.

1 change: 1 addition & 0 deletions projects/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"dependencies": {
"tslib": "^2.3.0"
},
"prettier": "@openmfp/config-prettier",
"peerDependencies": {
"@openmfp/portal-ui-lib": ">=0.177.0",
"@angular/common": "^19.0.0 || ^20.0.0",
Expand Down
1 change: 1 addition & 0 deletions projects/lib/portal-options/models/luigi-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ interface PortalEntityContext {
export interface PortalNodeContext extends NodeContext {
portalContext: PortalContext;
kcpPath?: string;
translationTable?: any;
namespaceId?: string;
entity?: Resource;
entityId?: string;
Expand Down
11 changes: 6 additions & 5 deletions projects/lib/portal-options/public-api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export * from './services/custom-global-nodes.service'
export * from './services/header-bar-config.service'
export * from './services/luigi-extended-global-context-config.service'
export * from './services/node-change-hook-config.service'
export * from './services/node-context-processing.service'
export * from './services/custom-global-nodes.service';
export * from './services/header-bar-config.service';
export * from './services/luigi-extended-global-context-config.service';
export * from './services/node-change-hook-config.service';
export * from './services/node-context-processing.service';
export * from './services/user-profile-config.service';
export * from './services/user-profile-config.service'
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { kcpRootOrgsPath } from '../models/constants';
import { PortalLuigiNode } from '../models/luigi-node';
import { Injectable, inject } from '@angular/core';
import { EnvConfigService } from '@openmfp/portal-ui-lib';
import { GatewayService } from '@platform-mesh/portal-ui-lib/services';
import { kcpRootOrgsPath } from '../models/constants';
import { PortalLuigiNode } from '../models/luigi-node';

@Injectable({ providedIn: 'root' })
export class CrdGatewayKcpPatchResolver {
Expand All @@ -29,7 +29,7 @@ export class CrdGatewayKcpPatchResolver {
node = node?.parent;
} while (node);

const org = (await this.envConfigService.getEnvConfig())['organization'];
const org = (await this.envConfigService.getEnvConfig()).idpName;
const kcpPath =
nextNode.context?.kcpPath || `${kcpRootOrgsPath}:${org}${entityKcpPath}`;
this.gatewayService.updateCrdGatewayUrlWithEntityPath(kcpPath);
Expand All @@ -46,7 +46,7 @@ export class CrdGatewayKcpPatchResolver {
node = node.parent;
} while (node);

const org = (await this.envConfigService.getEnvConfig())['organization'];
const org = (await this.envConfigService.getEnvConfig()).idpName;
const kcpPath =
nextNode.context?.kcpPath || `${kcpRootOrgsPath}:${org}${entityKcpPath}`;
this.gatewayService.updateCrdGatewayUrlWithEntityPath(kcpPath);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ export class LuigiExtendedGlobalContextConfigServiceImpl

async createLuigiExtendedGlobalContext(): Promise<Record<string, any>> {
const portalConfig = await this.configService.getPortalConfig();
const entityId = (await this.envConfigService.getEnvConfig())[
'organization'
];
const entityId = (await this.envConfigService.getEnvConfig()).idpName;
const operation = 'core_platform_mesh_io';

try {
Expand Down
1 change: 1 addition & 0 deletions projects/lib/services/resource/resource-node-context.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { NodeContext } from '@openmfp/portal-ui-lib';

export interface ResourceNodeContext extends Partial<NodeContext> {
organization?: string;
accountId?: string;
kcpCA?: string;
entity?: {
Expand Down
4 changes: 4 additions & 0 deletions projects/wc/src/app/components/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export * from '../components/generic-ui/detail-view/detail-view.component';
export * from '../components/generic-ui/list-view/list-view.component';
export * from '../components/organization-management/organization-management.component';
export * from '../components/welcome/welcome.component';
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@ import {
EnvConfigService,
I18nService,
Resource,
ResourceDefinition
ResourceDefinition,
} from '@openmfp/portal-ui-lib';
import { ResourceNodeContext, ResourceService } from '@platform-mesh/portal-ui-lib/services';
import {
ResourceNodeContext,
ResourceService,
} from '@platform-mesh/portal-ui-lib/services';
import { generateGraphQLFields } from '@platform-mesh/portal-ui-lib/utils';
import {
ButtonComponent,
Expand All @@ -26,7 +29,6 @@ import {
SelectComponent,
} from '@ui5/webcomponents-ngx';


@Component({
selector: 'organization-management',
standalone: true,
Expand Down Expand Up @@ -88,10 +90,7 @@ export class OrganizationManagementComponent implements OnInit {
this.organizations.set(
result['Accounts']
.map((o) => o.metadata.name)
.filter(
(o) =>
o !== this.context()['organization']
),
.filter((o) => o !== this.context().organization),
);
},
});
Expand Down Expand Up @@ -126,11 +125,13 @@ export class OrganizationManagementComponent implements OnInit {
type: 'info',
});
},
error: (error) => {
this.LuigiClient().uxManager().showAlert({
text: `Failure! Could not create organization: ${resource.metadata.name}.`,
type: 'error',
});
error: (_error) => {
this.LuigiClient()
.uxManager()
.showAlert({
text: `Failure! Could not create organization: ${resource.metadata.name}.`,
type: 'error',
});
},
});
}
Expand Down Expand Up @@ -163,7 +164,7 @@ export class OrganizationManagementComponent implements OnInit {
};
}

/**
/**
* Allows only valid subdomain values: alphanumeric, hyphens, no periods, cannot start/end with hyphen, min 1 character.
* Returns sanitized string or null if invalid.
*/
Expand Down
Loading
Loading