forked from onecx/onecx-portal-ui-libs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/basic-search-to-simple-search-improvements
- Loading branch information
Showing
41 changed files
with
371 additions
and
145 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 24 additions & 24 deletions
48
...al-integration-angular/src/lib/core/components/button-dialog/button-dialog.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,25 @@ | ||
| <div> | ||
| <ng-container #container></ng-container> | ||
| <ng-content></ng-content> | ||
| <div class="w-full flex justify-content-end mb-3"> | ||
| <button | ||
| id="buttonDialogSecondaryButton" | ||
| pButton | ||
| *ngIf="dialogData.config.secondaryButtonIncluded" | ||
| class="mx-2" | ||
| [icon]="dialogData.config.secondaryButtonDetails!.icon !== undefined ? dialogData.config.secondaryButtonDetails!.icon : ''" | ||
| (click)="secondaryButtonAction()" | ||
| [label]="dialogData.config.secondaryButtonDetails!.key | translate:dialogData.config.secondaryButtonDetails?.parameters" | ||
| [disabled]="secondaryButtonDisabled$ | async" | ||
| ></button> | ||
| <button | ||
| id="buttonDialogPrimaryButton" | ||
| pButton | ||
| class="mx-2" | ||
| [icon]="dialogData.config.primaryButtonDetails!.icon !== undefined ? dialogData.config.primaryButtonDetails!.icon : ''" | ||
| (click)="primaryButtonAction()" | ||
| [label]="dialogData.config.primaryButtonDetails!.key | translate:dialogData.config.primaryButtonDetails?.parameters" | ||
| [disabled]="primaryButtonDisabled$ | async" | ||
| ></button> | ||
| </div> | ||
| </div> | ||
| <ng-container #container></ng-container> | ||
| <ng-content></ng-content> | ||
| <div class="w-full flex justify-content-end mb-3"> | ||
| <button | ||
| id="buttonDialogSecondaryButton" | ||
| pButton | ||
| *ngIf="dialogData.config.secondaryButtonIncluded" | ||
| class="mx-2" | ||
| [icon]="dialogData.config.secondaryButtonDetails!.icon !== undefined ? dialogData.config.secondaryButtonDetails!.icon : ''" | ||
| (click)="secondaryButtonAction()" | ||
| [label]="dialogData.config.secondaryButtonDetails!.key | translate:dialogData.config.secondaryButtonDetails?.parameters" | ||
| [disabled]="secondaryButtonDisabled$ | async" | ||
| ></button> | ||
| <button | ||
| id="buttonDialogPrimaryButton" | ||
| pButton | ||
| class="mx-2" | ||
| [icon]="dialogData.config.primaryButtonDetails!.icon !== undefined ? dialogData.config.primaryButtonDetails!.icon : ''" | ||
| (click)="primaryButtonAction()" | ||
| [label]="dialogData.config.primaryButtonDetails!.key | translate:dialogData.config.primaryButtonDetails?.parameters" | ||
| [disabled]="primaryButtonDisabled$ | async" | ||
| ></button> | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 16 additions & 13 deletions
29
...ular/src/lib/core/components/column-group-selection/column-group-selection.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,16 @@ | ||
| <p-dropdown | ||
| id="columnGroupSelectionDropdown" | ||
| *ngIf="(allGroupKeys$ | async)?.length" | ||
| (onClear)="clearGroupSelection()" | ||
| (onChange)="changeGroupSelection($event)" | ||
| [options]="(allGroupKeys$ | async) || []" | ||
| [placeholder]="placeholderKey | translate" | ||
| [showClear]="selectedGroupKey !== defaultGroupKey" | ||
| [(ngModel)]="selectedGroupKey" | ||
| > | ||
| <ng-template let-item pTemplate="item"> {{ item ? (item | translate) : ''}} </ng-template> | ||
| <ng-template let-item pTemplate="selectedItem"> {{ item ? (item | translate) : ''}} </ng-template> | ||
| </p-dropdown> | ||
| <span class="p-float-label"> | ||
| <p-dropdown | ||
| id="columnGroupSelectionDropdown" | ||
| *ngIf="(allGroupKeys$ | async)?.length" | ||
| (onClear)="clearGroupSelection()" | ||
| (onChange)="changeGroupSelection($event)" | ||
| [options]="(allGroupKeys$ | async) || []" | ||
| [placeholder]="placeholderKey | translate" | ||
| [showClear]="selectedGroupKey !== defaultGroupKey" | ||
| [(ngModel)]="selectedGroupKey" | ||
| > | ||
| <ng-template let-item pTemplate="item"> {{ item ? (item | translate) : ''}} </ng-template> | ||
| <ng-template let-item pTemplate="selectedItem"> {{ item ? (item | translate) : ''}} </ng-template> | ||
| </p-dropdown> | ||
| <label for="columnGroupSelectionDropdown">{{ ("OCX_CUSTOM_GROUP_COLUMN_SELECTOR.DROPDOWN_LABEL" | translate) }}</label> | ||
| </span> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
libs/portal-integration-angular/src/lib/core/components/lifecycle/lifecycle.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <p-timeline [value]="steps"> | ||
| <ng-template pTemplate="marker" let-step> | ||
| <span class="p-timeline-event-marker" [ngClass]="activeStepId && activeStepId === step.id ? 'bg-primary' : ''"></span> | ||
| </ng-template> | ||
| <ng-template pTemplate="content" let-step> | ||
| <div class="pb-4 h-full"> | ||
| <div class="card h-full" [ngClass]="activeStepId && activeStepId === step.id ? 'bg-primary' : ''"> | ||
| <p class="font-bold text-xl" [ngClass]="step.details ? 'mb-2' : ''">{{ step.title }}</p> | ||
| <p *ngIf="step.details" [ngClass]="activeStepId && activeStepId === step.id ? '' : 'text-color-secondary'">{{ step.details }}</p> | ||
| </div> | ||
| </div> | ||
| </ng-template> | ||
| </p-timeline> |
Oops, something went wrong.