lgcosta/paperless-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Default to exists, styling tweaks

Browse Source
This commit is contained in:
shamoon 2024-09-02 09:06:30 -07:00
parent b1eda49d80
commit 2a3d909ab2
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.html
View File

@ -4,7 +4,7 @@
<div class="d-none d-sm-inline">&nbsp;{{title}}</div> <div class="d-none d-sm-inline">&nbsp;{{title}}</div>
</button> </button>
<div class="dropdown-menu px-3 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown_{{name}}"> <div class="dropdown-menu px-3 shadow" ngbDropdownMenu attr.aria-labelledby="dropdown_{{name}}">
<div class="btn-group mb-2 w-100"> <div class="btn-group my-2 w-100">
<button type="button" class="btn btn-sm btn-outline-primary" (click)="addAtom()" [disabled]="disabled"> <button type="button" class="btn btn-sm btn-outline-primary" (click)="addAtom()" [disabled]="disabled">
<i-bs name="plus"></i-bs>&nbsp;Add query <i-bs name="plus"></i-bs>&nbsp;Add query
</button> </button>
@ -42,12 +42,12 @@
bindLabel="name" bindLabel="name"
bindValue="id" bindValue="id"
></ng-select> ></ng-select>
<select class="w-25 form-control" [(ngModel)]="query.operator" [disabled]="disabled"> <select class="w-25 form-select" [(ngModel)]="query.operator" [disabled]="disabled">
<option *ngFor="let operator of getOperatorsForField(query.field)" [ngValue]="operator">{{operator}}</option> <option *ngFor="let operator of getOperatorsForField(query.field)" [ngValue]="operator">{{operator}}</option>
</select> </select>
@switch (query.operator) { @switch (query.operator) {
@case ('exists') { @case ('exists') {
<select class="w-25 form-control" [(ngModel)]="query.value" [disabled]="disabled"> <select class="w-25 form-select" [(ngModel)]="query.value" [disabled]="disabled">
<option value="true" i18n>true</option> <option value="true" i18n>true</option>
<option value="false" i18n>false</option> <option value="false" i18n>false</option>
</select> </select>
@ -66,8 +66,6 @@
<label class="btn btn-outline-primary" for="logicalOperatorAnd_{{query.field}}" i18n>And</label> <label class="btn btn-outline-primary" for="logicalOperatorAnd_{{query.field}}" i18n>And</label>
<input [(ngModel)]="query.operator" type="radio" class="btn-check" id="logicalOperatorOr_{{query.field}}" name="logicalOperatorOr_{{query.field}}" value="OR"> <input [(ngModel)]="query.operator" type="radio" class="btn-check" id="logicalOperatorOr_{{query.field}}" name="logicalOperatorOr_{{query.field}}" value="OR">
<label class="btn btn-outline-primary" for="logicalOperatorOr_{{query.field}}" i18n>Or</label> <label class="btn btn-outline-primary" for="logicalOperatorOr_{{query.field}}" i18n>Or</label>
<input [(ngModel)]="query.operator" type="radio" class="btn-check" id="logicalOperatorNot_{{query.field}}" name="logicalOperatorNot_{{query.field}}" value="NOT">
<label class="btn btn-outline-primary" for="logicalOperatorNot_{{query.field}}" i18n>Not</label>
</div> </div>
<div class="list-group list-group-flush"> <div class="list-group list-group-flush">
@for (subquery of query.value; track subquery; let i = $index) { @for (subquery of query.value; track subquery; let i = $index) {

10
src-ui/src/app/components/common/custom-fields-lookup-dropdown/custom-fields-lookup-dropdown.component.ts
View File

@ -111,10 +111,18 @@ export class CustomFieldQueriesModel {
} }
} }
public addQuery(query: CustomFieldQueryAtom = new CustomFieldQueryAtom()) { public addQuery(
query: CustomFieldQueryAtom = new CustomFieldQueryAtom([
null,
'exists',
'true',
])
) {
if (this.queries.length > 0) { if (this.queries.length > 0) {
if (this.queries[0].type === CustomFieldQueryComponentType.Expression) { if (this.queries[0].type === CustomFieldQueryComponentType.Expression) {
;(this.queries[0].value as Array<any>).push(query) ;(this.queries[0].value as Array<any>).push(query)
} else {
this.queries.push(query)
} }
} else { } else {
this.queries.push(query) this.queries.push(query)