feat(client+home): single-instance family relations + DSC verified badge
- Family member dialog: disable Father / Mother / Spouse in the Relationship dropdown when one is already added to the client. Son, daughter, brother etc. stay unrestricted. Editing a member keeps its own current relation selectable. Hint added below the field. - Home welcome banner: render a small green "DSC Verified" pill next to the username when GET /v1/dsc/me returns at least one ACTIVE certificate. Tooltip surfaces the masked serial. Silent when no DSC is mapped. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.7
parent
d175354f88
commit
6714897688
+7
-1
@@ -298,9 +298,15 @@
|
|||||||
<mat-label>Relationship</mat-label>
|
<mat-label>Relationship</mat-label>
|
||||||
<mat-select required formControlName="relationshipId">
|
<mat-select required formControlName="relationshipId">
|
||||||
@for (rel of data.options.relationshipIdOptions; track rel) {
|
@for (rel of data.options.relationshipIdOptions; track rel) {
|
||||||
<mat-option [value]="rel.id">{{ rel.name }}</mat-option>
|
<mat-option [value]="rel.id" [disabled]="disabledRelationshipIds.has(rel.id)">
|
||||||
|
{{ rel.name }}
|
||||||
|
@if (disabledRelationshipIds.has(rel.id)) {
|
||||||
|
<span class="fm-rel-taken">· already added</span>
|
||||||
|
}
|
||||||
|
</mat-option>
|
||||||
}
|
}
|
||||||
</mat-select>
|
</mat-select>
|
||||||
|
<mat-hint>Father, Mother and Spouse can only be added once.</mat-hint>
|
||||||
</mat-form-field>
|
</mat-form-field>
|
||||||
|
|
||||||
@if (entryMode === 'manual') {
|
@if (entryMode === 'manual') {
|
||||||
|
|||||||
+8
@@ -28,6 +28,14 @@
|
|||||||
margin-bottom: 16px;
|
margin-bottom: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Suffix shown next to disabled relationship options (Father/Mother/Spouse already added). */
|
||||||
|
.fm-rel-taken {
|
||||||
|
margin-left: 4px;
|
||||||
|
font-size: 11px;
|
||||||
|
font-style: italic;
|
||||||
|
color: #94a3b8;
|
||||||
|
}
|
||||||
|
|
||||||
.fm-mode-btn {
|
.fm-mode-btn {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
+36
@@ -86,6 +86,42 @@ export class ClientFamilyMemberDialogComponent implements OnInit {
|
|||||||
return rel?.name?.toUpperCase() === 'SPOUSE';
|
return rel?.name?.toUpperCase() === 'SPOUSE';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Relationships that may appear at most once per client. Names compared
|
||||||
|
* case-insensitively against the option list returned by the backend.
|
||||||
|
*/
|
||||||
|
private static readonly UNIQUE_RELATIONSHIPS = new Set([
|
||||||
|
'FATHER',
|
||||||
|
'MOTHER',
|
||||||
|
'SPOUSE'
|
||||||
|
]);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set of relationshipId values that are already taken by another family
|
||||||
|
* member and should therefore be disabled in the dropdown. The member
|
||||||
|
* currently being edited is excluded so its existing relationship stays
|
||||||
|
* selectable. Empty set in Add mode when no unique relations exist yet.
|
||||||
|
*/
|
||||||
|
get disabledRelationshipIds(): Set<number> {
|
||||||
|
const disabled = new Set<number>();
|
||||||
|
const existing = this.data?.existingMembers || [];
|
||||||
|
const options = this.data?.options?.relationshipIdOptions || [];
|
||||||
|
if (!existing.length || !options.length) return disabled;
|
||||||
|
const editingId = this.data?.context === 'Edit' ? this.data?.member?.id : undefined;
|
||||||
|
for (const m of existing) {
|
||||||
|
// Skip the member being edited so it can keep its current selection.
|
||||||
|
if (editingId && m.id === editingId) continue;
|
||||||
|
const relId = typeof m.relationshipId === 'object' ? m.relationshipId?.id : m.relationshipId;
|
||||||
|
if (relId == null) continue;
|
||||||
|
const rel = options.find((r: any) => r.id === relId);
|
||||||
|
const name = (rel?.name || '').toUpperCase();
|
||||||
|
if (ClientFamilyMemberDialogComponent.UNIQUE_RELATIONSHIPS.has(name)) {
|
||||||
|
disabled.add(relId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return disabled;
|
||||||
|
}
|
||||||
|
|
||||||
/** Whether dialog is in View-only mode */
|
/** Whether dialog is in View-only mode */
|
||||||
get isViewMode(): boolean {
|
get isViewMode(): boolean {
|
||||||
return this.data.context === 'View';
|
return this.data.context === 'View';
|
||||||
|
|||||||
+17
-3
@@ -132,7 +132,11 @@ export class ClientFamilyMembersStepComponent implements OnInit {
|
|||||||
|
|
||||||
addFamilyMember() {
|
addFamilyMember() {
|
||||||
const ref = this.dialog.open(ClientFamilyMemberDialogComponent, {
|
const ref = this.dialog.open(ClientFamilyMemberDialogComponent, {
|
||||||
data: { context: 'Add', options: this.clientTemplate.familyMemberOptions },
|
data: {
|
||||||
|
context: 'Add',
|
||||||
|
options: this.clientTemplate.familyMemberOptions,
|
||||||
|
existingMembers: this.clientFamilyMembers
|
||||||
|
},
|
||||||
width: '640px',
|
width: '640px',
|
||||||
maxWidth: '95vw',
|
maxWidth: '95vw',
|
||||||
panelClass: 'fm-dialog-panel'
|
panelClass: 'fm-dialog-panel'
|
||||||
@@ -146,7 +150,12 @@ export class ClientFamilyMembersStepComponent implements OnInit {
|
|||||||
|
|
||||||
viewFamilyMember(member: any) {
|
viewFamilyMember(member: any) {
|
||||||
this.dialog.open(ClientFamilyMemberDialogComponent, {
|
this.dialog.open(ClientFamilyMemberDialogComponent, {
|
||||||
data: { context: 'View', member, options: this.clientTemplate.familyMemberOptions },
|
data: {
|
||||||
|
context: 'View',
|
||||||
|
member,
|
||||||
|
options: this.clientTemplate.familyMemberOptions,
|
||||||
|
existingMembers: this.clientFamilyMembers
|
||||||
|
},
|
||||||
width: '640px',
|
width: '640px',
|
||||||
maxWidth: '95vw',
|
maxWidth: '95vw',
|
||||||
panelClass: 'fm-dialog-panel'
|
panelClass: 'fm-dialog-panel'
|
||||||
@@ -155,7 +164,12 @@ export class ClientFamilyMembersStepComponent implements OnInit {
|
|||||||
|
|
||||||
editFamilyMember(member: any, index: number) {
|
editFamilyMember(member: any, index: number) {
|
||||||
const ref = this.dialog.open(ClientFamilyMemberDialogComponent, {
|
const ref = this.dialog.open(ClientFamilyMemberDialogComponent, {
|
||||||
data: { context: 'Edit', member, options: this.clientTemplate.familyMemberOptions },
|
data: {
|
||||||
|
context: 'Edit',
|
||||||
|
member,
|
||||||
|
options: this.clientTemplate.familyMemberOptions,
|
||||||
|
existingMembers: this.clientFamilyMembers
|
||||||
|
},
|
||||||
width: '640px',
|
width: '640px',
|
||||||
maxWidth: '95vw',
|
maxWidth: '95vw',
|
||||||
panelClass: 'fm-dialog-panel'
|
panelClass: 'fm-dialog-panel'
|
||||||
|
|||||||
@@ -13,6 +13,15 @@
|
|||||||
<div class="welcome-greeting">
|
<div class="welcome-greeting">
|
||||||
<h2>
|
<h2>
|
||||||
{{ 'labels.text.Welcome' | translate }}, <strong>{{ username }}</strong>
|
{{ 'labels.text.Welcome' | translate }}, <strong>{{ username }}</strong>
|
||||||
|
@if (dscMapped) {
|
||||||
|
<span class="dsc-badge" [matTooltip]="'DSC verified · serial ' + dscSerial" matTooltipPosition="right">
|
||||||
|
<span class="dsc-badge__shield">
|
||||||
|
<fa-icon icon="shield-alt"></fa-icon>
|
||||||
|
<span class="dsc-badge__check"><fa-icon icon="check"></fa-icon></span>
|
||||||
|
</span>
|
||||||
|
<span class="dsc-badge__label">DSC Verified</span>
|
||||||
|
</span>
|
||||||
|
}
|
||||||
</h2>
|
</h2>
|
||||||
<p class="welcome-sub">{{ tenant | titlecase }} · CBSNexora Core Banking Platform</p>
|
<p class="welcome-sub">{{ tenant | titlecase }} · CBSNexora Core Banking Platform</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -54,6 +54,10 @@ $accent: #0ea5e9;
|
|||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: rgb(255 255 255 / 90%);
|
color: rgb(255 255 255 / 90%);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 6px;
|
||||||
|
|
||||||
strong {
|
strong {
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
@@ -62,6 +66,70 @@ $accent: #0ea5e9;
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ── DSC Verified badge (welcome banner) ── */
|
||||||
|
.dsc-badge {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
margin-left: 10px;
|
||||||
|
padding: 4px 12px 4px 6px;
|
||||||
|
background: linear-gradient(135deg, rgb(34 197 94 / 18%) 0%, rgb(34 197 94 / 8%) 100%);
|
||||||
|
border: 1px solid rgb(74 222 128 / 35%);
|
||||||
|
border-radius: 999px;
|
||||||
|
font-size: 12px;
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
color: #bbf7d0;
|
||||||
|
cursor: default;
|
||||||
|
transition:
|
||||||
|
transform 0.18s ease,
|
||||||
|
background 0.18s ease;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
transform: translateY(-1px);
|
||||||
|
background: linear-gradient(135deg, rgb(34 197 94 / 28%) 0%, rgb(34 197 94 / 14%) 100%);
|
||||||
|
}
|
||||||
|
|
||||||
|
&__shield {
|
||||||
|
position: relative;
|
||||||
|
width: 26px;
|
||||||
|
height: 26px;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
background: rgb(22 163 74 / 90%);
|
||||||
|
border-radius: 6px;
|
||||||
|
color: #fff;
|
||||||
|
font-size: 13px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
box-shadow: 0 1px 3px rgb(15 118 50 / 35%);
|
||||||
|
}
|
||||||
|
|
||||||
|
&__check {
|
||||||
|
position: absolute;
|
||||||
|
right: -4px;
|
||||||
|
bottom: -4px;
|
||||||
|
width: 14px;
|
||||||
|
height: 14px;
|
||||||
|
background: #16a34a;
|
||||||
|
color: #fff;
|
||||||
|
border: 2px solid #1a5276; /* matches the banner's right edge so the ring blends in */
|
||||||
|
border-radius: 50%;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
font-size: 8px;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__label {
|
||||||
|
color: #ecfdf5;
|
||||||
|
text-transform: uppercase;
|
||||||
|
font-size: 10.5px;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.welcome-sub {
|
.welcome-sub {
|
||||||
margin: 4px 0 0;
|
margin: 4px 0 0;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
|||||||
@@ -25,11 +25,13 @@ import { AuthenticationService } from '../core/authentication/authentication.ser
|
|||||||
import { PopoverService } from '../configuration-wizard/popover/popover.service';
|
import { PopoverService } from '../configuration-wizard/popover/popover.service';
|
||||||
import { ConfigurationWizardService } from '../configuration-wizard/configuration-wizard.service';
|
import { ConfigurationWizardService } from '../configuration-wizard/configuration-wizard.service';
|
||||||
import { SettingsService } from 'app/settings/settings.service';
|
import { SettingsService } from 'app/settings/settings.service';
|
||||||
|
import { DscService } from 'app/users/dsc/dsc.service';
|
||||||
|
|
||||||
/** Custom Components */
|
/** Custom Components */
|
||||||
import { NextStepDialogComponent } from '../configuration-wizard/next-step-dialog/next-step-dialog.component';
|
import { NextStepDialogComponent } from '../configuration-wizard/next-step-dialog/next-step-dialog.component';
|
||||||
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
|
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
|
||||||
import { MatAutocompleteTrigger, MatAutocomplete, MatOption } from '@angular/material/autocomplete';
|
import { MatAutocompleteTrigger, MatAutocomplete, MatOption } from '@angular/material/autocomplete';
|
||||||
|
import { MatTooltip } from '@angular/material/tooltip';
|
||||||
import { AsyncPipe, DatePipe, TitleCasePipe } from '@angular/common';
|
import { AsyncPipe, DatePipe, TitleCasePipe } from '@angular/common';
|
||||||
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||||
|
|
||||||
@@ -45,6 +47,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
|||||||
FaIconComponent,
|
FaIconComponent,
|
||||||
MatAutocompleteTrigger,
|
MatAutocompleteTrigger,
|
||||||
MatAutocomplete,
|
MatAutocomplete,
|
||||||
|
MatTooltip,
|
||||||
AsyncPipe,
|
AsyncPipe,
|
||||||
DatePipe,
|
DatePipe,
|
||||||
TitleCasePipe
|
TitleCasePipe
|
||||||
@@ -58,6 +61,7 @@ export class HomeComponent implements OnInit, AfterViewInit {
|
|||||||
private configurationWizardService = inject(ConfigurationWizardService);
|
private configurationWizardService = inject(ConfigurationWizardService);
|
||||||
private popoverService = inject(PopoverService);
|
private popoverService = inject(PopoverService);
|
||||||
private settingsService = inject(SettingsService);
|
private settingsService = inject(SettingsService);
|
||||||
|
private dscService = inject(DscService);
|
||||||
|
|
||||||
/** Username of authenticated user. */
|
/** Username of authenticated user. */
|
||||||
username: string;
|
username: string;
|
||||||
@@ -65,6 +69,10 @@ export class HomeComponent implements OnInit, AfterViewInit {
|
|||||||
tenant: string;
|
tenant: string;
|
||||||
/** Today's date */
|
/** Today's date */
|
||||||
today = new Date();
|
today = new Date();
|
||||||
|
/** True when the signed-in user has at least one ACTIVE DSC certificate mapped. */
|
||||||
|
dscMapped = false;
|
||||||
|
/** Masked serial of the ACTIVE DSC, surfaced in the welcome badge tooltip. */
|
||||||
|
dscSerial = '';
|
||||||
/** Activity Form. */
|
/** Activity Form. */
|
||||||
activityForm: any;
|
activityForm: any;
|
||||||
/** Search Text. */
|
/** Search Text. */
|
||||||
@@ -95,6 +103,7 @@ export class HomeComponent implements OnInit, AfterViewInit {
|
|||||||
this.username = credentials.username;
|
this.username = credentials.username;
|
||||||
this.tenant = this.tenantIdentifier();
|
this.tenant = this.tenantIdentifier();
|
||||||
this.setFilteredActivities();
|
this.setFilteredActivities();
|
||||||
|
this.loadDscStatus();
|
||||||
if (!this.authenticationService.hasDialogBeenShown()) {
|
if (!this.authenticationService.hasDialogBeenShown()) {
|
||||||
this.dialog.open(WarningDialogComponent, {
|
this.dialog.open(WarningDialogComponent, {
|
||||||
disableClose: false,
|
disableClose: false,
|
||||||
@@ -104,6 +113,26 @@ export class HomeComponent implements OnInit, AfterViewInit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Surface a small "DSC verified" badge in the welcome banner when the
|
||||||
|
* signed-in user has at least one ACTIVE DSC certificate. Silent on
|
||||||
|
* error / when nothing is mapped — the badge simply doesn't render.
|
||||||
|
*/
|
||||||
|
private loadDscStatus(): void {
|
||||||
|
this.dscService.listMyDscs().subscribe({
|
||||||
|
next: (dscs) => {
|
||||||
|
const active = (dscs || []).find((d) => (d?.certStatus || '').toUpperCase() === 'ACTIVE');
|
||||||
|
if (active) {
|
||||||
|
this.dscMapped = true;
|
||||||
|
this.dscSerial = active.dscSerialNoMasked || active.dscSerialNoFull || '';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: () => {
|
||||||
|
// Silent — endpoint may be unavailable; we just don't show the badge.
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets filtered activities for autocomplete.
|
* Sets filtered activities for autocomplete.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user