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.

Sign up for GitHub

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

Jump to bottom

fix(common): fix custom multi file validator #12096

Merged
merged 3 commits into from
Aug 18, 2023
Merged

fix(common): fix custom multi file validator #12096

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1bac6e
fix(common): fix custom multi file validator
Jul 22, 2023
a7c5963
chore(common): use better generic
Jul 23, 2023
ccca642
revert: revert a7c5
Jul 24, 2023
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 packages/common/pipes/file/file-validator.interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export abstract class FileValidator<
* Indicates if this file should be considered valid, according to the options passed in the constructor.
* @param file the file from the request object
*/
abstract isValid(file?: TFile): boolean | Promise<boolean>;
abstract isValid(file?: TFile | TFile[] | Record<string, TFile[]>): boolean | Promise<boolean>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we move this to the L11 instead as

TFile extends IFile | TFile[] | Record<string, TFile[]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@micalevisk I think your idea is good thank you for your answer

Copy link
Member

@micalevisk micalevisk Jul 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually, that won't work the same because we need to use IFile[], not TFile[], as in the current version. I just tested. Also, extends FileValidator<MyFile> looks better than extends FileValidator<MyFile[]>

could you please revert the commit a7c59

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think first commit is ok?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Copy link
Contributor Author

@mohamadrezamomeni mohamadrezamomeni Jul 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@micalevisk i reverted to the a7c59 , is it ok right now?


/**
* Builds an error message in case the validation fails.
Expand Down
Loading