[Feat] #7118, #7778: add popup, change manager name, provide optional responsible persons #3472
Conversation
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
yuliiakaras
requested review from
Lokankara,
bzhn,
kovalsofiia1 and
kryzanivska-nastya
Lokankara
approved these changes
Nov 27, 2024
| @@ -703,7 +701,7 @@ export class UbsAdminOrderComponent implements OnInit, OnDestroy, AfterContentCh | |||
| this.isFormResetted = true; | |||
| } else { | |||
| exportDetaisFields.forEach((el) => exportDetails.get(el).setValidators([Validators.required])); | |||
| responsiblePersonNames.forEach((el) => responsiblePersons.get(el).setValidators([Validators.required])); | |||
| responsiblePersons.get('responsibleCaller')?.setValidators([Validators.required]); | |||
| } | |||
| this.statusCanceledOrDone(); | |||
| } | |||
There was a problem hiding this comment.
Expected 1 arguments, but got 0:
this.destroy$.next();
| return false; | ||
| } | ||
|
|
||
| if (requiredFields.includes(controlName)) { |
There was a problem hiding this comment.
'if' statement can be simplified
| } | ||
| ]; | ||
| } | ||
|
|
||
| ngOnDestroy(): void { | ||
| this.destroy$.next(); |
There was a problem hiding this comment.
Expected 1 arguments, but got 0.
| this.save(); | ||
| return; | ||
| } | ||
| const isCancelOption = ['Canceled', 'Скасовано'].includes(this.newOption); |
There was a problem hiding this comment.
By using the enums OrderStatusEn and OrderStatusUa and isStatusOption to categorize status options, the logic becomes more scalable and easier to maintain
private isStatusOption(...options: string[]): boolean {
return options.includes(this.newOption);
}
| } else if (isCancelOption) { | ||
| this.openCancelPopUp(); | ||
| } else if (this.checkStatus && this.showPopUp) { | ||
| this.checkIfStatusConfirmed(); |
There was a problem hiding this comment.
we can simplify this condition by not creating checkIfStatusConfirmed.
const isConfirmedOption = this.isStatusOption(OrderStatusEn.CONFIRMED, OrderStatusUa.CONFIRMED);
...
} else if (this.checkStatus && this.showPopUp && !isConfirmedOption) {
this.openPopUp();
} else {
this.save();
}
Lokankara
approved these changes
Nov 27, 2024
| @@ -1,6 +1,6 @@ | |||
| import { async, ComponentFixture, TestBed } from '@angular/core/testing'; | |||
There was a problem hiding this comment.
'async' is deprecated, use waitForAsync()
kovalsofiia1
approved these changes
Nov 30, 2024
hnativlyubomyr
approved these changes
Dec 2, 2024
hnativlyubomyr
deleted the
feat/#7118-add-popup-change-name-change-adjustment-form
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#7778
#7118