Skip to content

Commit c24fc6a

Browse files
authored
Merge branch 'master' into bug/tor/portalValueNotCleared
2 parents 2583c55 + 365bab1 commit c24fc6a

File tree

5 files changed

+24
-14
lines changed

5 files changed

+24
-14
lines changed

packages/angular-sdk-components/src/lib/_components/infra/navbar/navbar.component.html

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,15 @@
3636
</mat-list-item>
3737
</mat-list>
3838
<div class="psdk-nav-divider"></div>
39-
<div>
40-
<mat-list id="profile">
41-
<mat-list-item [matMenuTriggerFor]="menu" class="psdk-profile-list-item">
42-
<div class="flex-box">
43-
<div class="psdk-nav-oper-avatar">{{ portalOperatorInitials$ }}</div>
44-
<span class="psdk-nav-button-span">{{ portalOperator$ }}</span>
45-
</div>
46-
</mat-list-item>
47-
<mat-menu #menu="matMenu">
48-
<button mat-menu-item (click)="navPanelLogoutClick()">{{ localizedVal('Log off', localeCategory) }}</button>
49-
</mat-menu>
50-
</mat-list>
51-
</div>
39+
<mat-list id="profile" class="psdk-logout-button">
40+
<mat-list-item [matMenuTriggerFor]="menu" class="psdk-profile-list-item">
41+
<div class="flex-box">
42+
<div class="psdk-nav-oper-avatar">{{ portalOperatorInitials$ }}</div>
43+
<span class="psdk-nav-button-span">{{ portalOperator$ }}</span>
44+
</div>
45+
</mat-list-item>
46+
<mat-menu #menu="matMenu">
47+
<button mat-menu-item (click)="navPanelLogoutClick()">{{ localizedVal('Log off', localeCategory) }}</button>
48+
</mat-menu>
49+
</mat-list>
5250
</div>

packages/angular-sdk-components/src/lib/_components/infra/navbar/navbar.component.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,3 +163,8 @@ mat-list-item {
163163
height: 24px;
164164
border-radius: 50%;
165165
}
166+
167+
.psdk-logout-button {
168+
flex: 1;
169+
align-content: flex-end;
170+
}

packages/angular-sdk-components/src/lib/_components/infra/reference/reference.component.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ export class ReferenceComponent {
7171
pageReference: context && context.startsWith('@CLASS') ? '' : context
7272
});
7373

74+
if (referenceConfig.inheritedProps && referenceConfig.inheritedProps.length > 0) {
75+
const inheritedProps = inPConn.getInheritedProps();
76+
referenceConfig.inheritedProps = Object.keys(inheritedProps).map(prop => ({ prop, value: inheritedProps[prop] }));
77+
}
78+
7479
// Get the PConnect object from the created component
7580
const newCompPConnect = viewComponent.getPConnect();
7681

packages/angular-sdk-components/src/lib/_components/template/list-view/list-view.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ interface ListViewProps {
4646
displayAs?: string;
4747
showRecords: boolean;
4848
viewName?: string;
49+
localeReference?: any;
4950
}
5051

5152
export class Group {
@@ -516,6 +517,7 @@ export class ListViewComponent implements OnInit, OnDestroy {
516517
const arReturn = arFields;
517518
arReturn.forEach((field, i) => {
518519
field.config = { ...field.config, ...fields[i], name: fields[i].id };
520+
field.config.label = PCore.getLocaleUtils().getLocaleValue(field.config.label, this.configProps$.localeReference);
519521
});
520522
return arReturn;
521523
}

packages/angular-sdk-components/src/lib/_components/widget/file-utility/file-utility.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525

2626
.psdk-modal-file-selector {
27-
border: 1px dashed var(--app-neutral-dark-color);
27+
border: 1px dashed var(--mat-sys-neutral-variant20);
2828
width: 100%;
2929
padding: 0.3rem;
3030
text-align: center;

0 commit comments

Comments
 (0)