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

feat: one two button dialog #81

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
84ecba1
button-dialog compontent implemented with tests
markuczy Dec 4, 2023
ba0f3e0
lint
markuczy Dec 4, 2023
98d36c6
review fix
markuczy Dec 11, 2023
7867f4f
build fix
markuczy Dec 11, 2023
550b739
refactored button-dialog component
markuczy Dec 12, 2023
1da69c5
added possibility to project host inline
markuczy Dec 13, 2023
3c1c9fa
adjusted template and buttons interfaces
markuczy Dec 19, 2023
4af130d
naming fixes
markuczy Dec 19, 2023
e0ce47e
feat: PortalDialogService base usage
markuczy Jan 23, 2024
d14fb0f
feat: initialization of dialog implemented and tested
markuczy Jan 24, 2024
85919bb
feat: portal-dialog-service works with DialogResult interface
markuczy Jan 24, 2024
2868173
feat: PoratlDialogService works with DialogButtonClicked interface
markuczy Jan 24, 2024
e863787
feat: PortalDialogService works with ButtonDisabled interfaces
markuczy Jan 24, 2024
00ef37b
feat: PortalDialogService open tested with complex component
markuczy Jan 24, 2024
4913a28
fix: renamed function and changed test name
markuczy Jan 24, 2024
8385357
Merge branch 'main' into feat/P002271-5729-one-two-button-dialog
markuczy Jan 24, 2024
854c4ec
fix: cleanup naming and imports
markuczy Jan 24, 2024
a413f7d
test: aligned tests for button dialog and removed unnecessary code fr…
markuczy Jan 29, 2024
89556ea
fix: primary and secondary buttons disabled flag is observable now
markuczy Jan 29, 2024
762c400
refactor: created helper methods and renamed components
markuczy Jan 29, 2024
4a6944c
refactor: renamed dialog-host files to dialog-message-content
markuczy Jan 29, 2024
c90ff63
refactor: adjusted button-dialog harness to fetch its body more clear
markuczy Jan 29, 2024
b6e952f
fix: fixed Component interface to check the result of dialog opening
markuczy Jan 29, 2024
1e70183
refactor: showCloseButton parameter changed to showXButton
markuczy Jan 30, 2024
4f33482
feat: documentation for openDialog
markuczy Jan 30, 2024
b70b763
fix: fixed parameters annotation
markuczy Jan 30, 2024
779b427
Merge branch 'main' into feat/P002271-5729-one-two-button-dialog
markuczy Jan 30, 2024
95d7850
feat: documentation enchanced and translations used
markuczy Jan 30, 2024
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
4 changes: 4 additions & 0 deletions libs/portal-integration-angular/assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,9 @@
},
"OCX_HELP_ITEM_EDITOR": {
"SAVE_ERROR": "Das Formular ist nicht gültig. Der Hilfeartikel kann nicht aktualisiert werden."
},
"OCX_BUTTON_DIALOG": {
"CONFIRM": "Bestätigen",
"CANCEL": "Absagen"
}
}
4 changes: 4 additions & 0 deletions libs/portal-integration-angular/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,9 @@
},
"OCX_HELP_ITEM_EDITOR": {
"SAVE_ERROR": "Form is not valid. Cannot update the Help Item."
},
"OCX_BUTTON_DIALOG": {
"CONFIRM": "Confirm",
"CANCEL": "Cancel"
}
}
3 changes: 3 additions & 0 deletions libs/portal-integration-angular/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ export * from './lib/core/components/custom-group-column-selector/custom-group-c
export * from './lib/core/components/data-list-grid-sorting/data-list-grid-sorting.component'
export * from './lib/core/components/group-by-count-diagram/group-by-count-diagram.component'
export * from './lib/core/components/diagram/diagram.component'
export * from './lib/core/components/button-dialog/button-dialog.component'
export * from './lib/core/components/button-dialog/dialog-message-content/dialog-message-content.component'
export * from './lib/core/components/search-config/search-config.component'
export * from './lib/core/components/loading-indicator/loading-indicator.component'
export * from './lib/core/components/content-container/content-container.component'
Expand Down Expand Up @@ -94,6 +96,7 @@ export * from './lib/model/column-type.model'
export * from './lib/model/data-sort-direction'
export * from './lib/model/breadcrumb-menu-item.model'
export * from './lib/model/data-action'
export * from './lib/model/button-dialog'
export * from './lib/model/diagram-type'
export * from './lib/model/config-key.model'
export * from './lib/model/search-config'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +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>
Loading
Loading