Skip to content

Corrected a filter preparation logic for tables on API types pages #414

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

Merged
thekevinm merged 2 commits into from
May 21, 2025
Merged

Corrected a filter preparation logic for tables on API types pages #414

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa7d46d
Merge pull request #412 from dreamfactorysoftware/develop
thekevinm May 14, 2025
8b096e7
Adjust filter preparation logic to correct its behaviour on the API t…
vitaliihra May 21, 2025
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
5 changes: 1 addition & 4 deletions src/app/adf-services/df-manage-services/df-manage-services-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,10 @@ export class DfManageServicesTableComponent extends DfManageTableComponent<Servi
refresh?: true
): void {
if (this.serviceTypes && this.serviceTypes.length !== 0) {
filter = `${filter ? `${filter} and ` : ''}(type in ("${this.serviceTypes
filter = `${filter ? `(${filter}) and ` : ''}(type in ("${this.serviceTypes
.map(src => src.name)
.join('","')}"))`;
}
filter = `${filter ? `${filter} and ` : ''}(created_by_id is${
!this.system ? ' not ' : ' '
}null)`;

this.serviceService
.getAll<GenericListResponse<Service>>({
Expand Down