Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: additional fixes for v5 #331

Merged
merged 14 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion libs/angular-accelerator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"chart.js": "^4.4.3",
"d3-scale-chromatic": "^3.1.0",
"rxjs": "~7.8.1",
"primeng": "^17.18.2"
"primeng": "^17.18.6"
},
"dependencies": {},
"exports": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ export class DiagramComponent implements OnInit, OnChanges {
@Input() sumKey = 'OCX_DIAGRAM.SUM'
private _diagramType: DiagramType = DiagramType.PIE
selectedDiagramType: DiagramLayouts | undefined
public chartType: 'bar' | 'line' | 'scatter' | 'bubble' | 'pie' | 'doughnut' | 'polarArea' | 'radar' | undefined =
'pie'
public chartType: 'bar' | 'line' | 'scatter' | 'bubble' | 'pie' | 'doughnut' | 'polarArea' | 'radar' = 'pie'
@Input()
get diagramType(): DiagramType {
return this._diagramType
Expand Down Expand Up @@ -121,7 +120,7 @@ export class DiagramComponent implements OnInit, OnChanges {

private diagramTypeToChartType(
value: DiagramType
): 'bar' | 'line' | 'scatter' | 'bubble' | 'pie' | 'doughnut' | 'polarArea' | 'radar' | undefined {
): 'bar' | 'line' | 'scatter' | 'bubble' | 'pie' | 'doughnut' | 'polarArea' | 'radar' {
if (value === DiagramType.PIE) return 'pie'
else if (value === DiagramType.HORIZONTAL_BAR || value === DiagramType.VERTICAL_BAR) return 'bar'
return 'pie'
Expand Down
2 changes: 1 addition & 1 deletion libs/angular-testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "5.1.3",
"peerDependencies": {
"@angular/cdk": "^18.0.5",
"primeng": "^17.18.2"
"primeng": "^17.18.6"
},
"dependencies": {},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion libs/portal-integration-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"fast-deep-equal": "^3.1.3",
"msw": "^2.3.1",
"rxjs": "~7.8.1",
"primeng": "^17.18.2",
"primeng": "^17.18.6",
"zod": "^3.23.8",
"@ngx-translate/http-loader": "^8.0.0",
"@angular-architects/module-federation": "^18.0.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
optionLabel="icon"
(onChange)="viewModeChange($event.value)"
>
<ng-template let-item>
<ng-template let-item pTemplate>
<i [class]="item.icon" [title]="item.title || (item.titleKey | translate)"></i>
</ng-template>
</p-selectButton>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export class DataViewControlsComponent implements OnInit, OnChanges {

@Output() sortChange: EventEmitter<string> = new EventEmitter()
@Output() filterChange: EventEmitter<string> = new EventEmitter()
@Output() dataViewChange: EventEmitter<string> = new EventEmitter()
@Output() dataViewChange: EventEmitter<'list' | 'grid'> = new EventEmitter()
@Output() sortDirectionChange: EventEmitter<boolean> = new EventEmitter()
@Output() columnsChange: EventEmitter<string[]> = new EventEmitter()

Expand Down Expand Up @@ -258,7 +258,7 @@ export class DataViewControlsComponent implements OnInit, OnChanges {
})
}

viewModeChange(event: { icon: PrimeIcon; mode: string }): void {
viewModeChange(event: { icon: PrimeIcon; mode: 'list' | 'grid' }): void {
this.dataViewChange.emit(event.mode)
this.enableToggleColumnButton(event.mode)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
border-radius: var(--border-radius);
padding: var(--breadcrumb-padding);

ul {
ol {
li {
.p-menuitem-link {
transition: var(--list-item-transition);
Expand All @@ -23,7 +23,7 @@
}
}

&.p-breadcrumb-chevron {
&.p-menuitem-separator {
margin: 0 $inlineSpacing 0 $inlineSpacing;
color: var(--text-secondary-color);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@

.p-menuitem-link-active {
background: var(--menuitem-active-bg);
border-left: 4px solid var(--primary-color);

.p-menuitem-text {
color: var(--text-color);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.p-panelmenu {
.p-panelmenu-header {
> a {
.p-panelmenu-header-action {
padding: var(--accordion-header-padding);
border: var(--accordion-header-border);
color: var(--text-color);
Expand All @@ -9,7 +9,7 @@
border-radius: var(--border-radius);
transition: var(--list-item-transition);

.p-panelmenu-icon {
chevronrighticon, chevrondownicon {
margin-right: var(--inline-spacing);
}

Expand Down Expand Up @@ -69,7 +69,7 @@
.p-menuitem-link {
@include menuitem-link();

.p-panelmenu-icon {
chevronrighticon, chevrondownicon {
margin-right: var(--inline-spacing);
}
}
Expand All @@ -85,7 +85,7 @@

@if $accordionSpacing == 0 {
.p-panelmenu-header {
> a {
.p-panelmenu-header-action {
border-radius: 0;
}
}
Expand All @@ -96,7 +96,7 @@

&:not(:first-child) {
.p-panelmenu-header {
> a {
.p-panelmenu-header-action {
border-top: 0 none;
}

Expand All @@ -111,7 +111,7 @@

&:first-child {
.p-panelmenu-header {
> a {
.p-panelmenu-header-action {
border-top-right-radius: var(--border-radius);
border-top-left-radius: var(--border-radius);
}
Expand All @@ -120,7 +120,7 @@

&:last-child {
.p-panelmenu-header:not(.p-highlight) {
> a {
.p-panelmenu-header-action {
border-bottom-right-radius: var(--border-radius);
border-bottom-left-radius: var(--border-radius);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
background-color: transparent;
border: 0 none;

span {
calendaricon {
color: var(--emphasis-medium);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

.p-panelmenu-header {
.p-panelmenu-icon {
chevronrighticon, chevrondownicon {
order: 1;
margin-left: auto;
margin-right: 0;
Expand All @@ -32,7 +32,7 @@
}

&:not(.p-highlight) {
.p-panelmenu-header-link {
.p-panelmenu-header-action {
&:focus {
background: var(--accordion-header-hover-bg);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,18 @@
border: none;

&.p-menubar .p-menubar-root-list > .p-menuitem {
> .p-menuitem-link {
.p-menuitem-text,
.p-menuitem-icon,
.p-submenu-icon {
color: var(--topbar-item-text-color);
}

&:not(.p-disabled):hover {
background: var(--topbar-item-text-hover-bg-color);
transition: background-color var(--transition-duration);
> .p-menuitem-content {
.p-menuitem-link {
.p-menuitem-text,
.p-menuitem-icon,
.p-submenu-icon {
color: var(--topbar-item-text-color);
}

&:not(.p-disabled):hover {
background: var(--topbar-item-text-hover-bg-color);
transition: background-color var(--transition-duration);
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion libs/shell-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@onecx/angular-integration-interface": "^5",
"@onecx/angular-remote-components": "^5",
"@onecx/portal-integration-angular": "^5",
"primeng": "17.18.2"
"primeng": "^17.18.6"
},
"dependencies": {},
"type": "commonjs",
Expand Down
9 changes: 5 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"ngx-color": "^9.0.0",
"primeflex": "^3.3.1",
"primeicons": "^7.0.0",
"primeng": "17.18.2",
"primeng": "17.18.6",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"rxjs": "7.8.1",
Expand Down
Loading