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

Basic doclink contains ui but need to fix the dropdown

Browse Source
This commit is contained in:
shamoon 2024-09-08 11:06:54 -07:00
parent c4842954d8
commit 8e5cc66dae
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
View File

@ -78,6 +78,10 @@
@case (CustomFieldQueryOperator.LessThan) { @case (CustomFieldQueryOperator.LessThan) {
<ng-container *ngTemplateOutlet="comparisonValueTemplate; context: { atom: atom }"></ng-container> <ng-container *ngTemplateOutlet="comparisonValueTemplate; context: { atom: atom }"></ng-container>
} }
@case (CustomFieldQueryOperator.Contains) {
<!-- TODO: needs visual work -->
<pngx-input-document-link [(ngModel)]="atom.value" [horizontal]="true"></pngx-input-document-link>
}
@default { @default {
<input class="w-25 form-control rounded-end" type="text" [(ngModel)]="atom.value" [disabled]="disabled"> <input class="w-25 form-control rounded-end" type="text" [(ngModel)]="atom.value" [disabled]="disabled">
} }

25
src-ui/src/app/data/custom-field-query.ts
View File

@ -115,10 +115,8 @@ export const CUSTOM_FIELD_QUERY_VALUE_TYPES_BY_OPERATOR = {
[CustomFieldQueryOperator.LessThanOrEqual]: 'string|number', [CustomFieldQueryOperator.LessThanOrEqual]: 'string|number',
[CustomFieldQueryOperator.GreaterThan]: 'number', [CustomFieldQueryOperator.GreaterThan]: 'number',
[CustomFieldQueryOperator.LessThan]: 'number', [CustomFieldQueryOperator.LessThan]: 'number',
// TODO: Implement these [CustomFieldQueryOperator.Contains]: 'array',
// [CustomFieldQueryOperator.In]: 'array', // [CustomFieldQueryOperator.In]: 'array', // TODO: Implement
// [CustomFieldQueryOperator.Contains]: 'string',
// [CustomFieldQueryOperator.Range]: 'array',
} }
export const CUSTOM_FIELD_QUERY_MAX_DEPTH = 4 export const CUSTOM_FIELD_QUERY_MAX_DEPTH = 4
@ -132,7 +130,9 @@ export enum CustomFieldQueryElementType {
export class CustomFieldQueryElement { export class CustomFieldQueryElement {
public readonly type: CustomFieldQueryElementType public readonly type: CustomFieldQueryElementType
public changed: Subject<CustomFieldQueryElement> public changed: Subject<CustomFieldQueryElement>
protected valueModelChanged: Subject<string | CustomFieldQueryElement[]> protected valueModelChanged: Subject<
string | string[] | number[] | CustomFieldQueryElement[]
>
public depth: number = 0 public depth: number = 0
public id: string = uuidv4() public id: string = uuidv4()
@ -163,12 +163,15 @@ export class CustomFieldQueryElement {
return this._operator return this._operator
} }
protected _value: string | CustomFieldQueryElement[] = null protected _value: string | string[] | number[] | CustomFieldQueryElement[] =
public set value(value: string | CustomFieldQueryElement[]) { null
public set value(
value: string | string[] | number[] | CustomFieldQueryElement[]
) {
this._value = value this._value = value
this.valueModelChanged.next(value) this.valueModelChanged.next(value)
} }
public get value(): string | CustomFieldQueryElement[] { public get value(): string | string[] | number[] | CustomFieldQueryElement[] {
return this._value return this._value
} }
} }
@ -205,7 +208,9 @@ export class CustomFieldQueryAtom extends CustomFieldQueryElement {
this.value = null this.value = null
} }
break break
// TODO: Implement all case 'array':
this.value = []
break
default: default:
this.value = null this.value = null
break break
@ -249,7 +254,7 @@ export class CustomFieldQueryAtom extends CustomFieldQueryElement {
} }
public override serialize() { public override serialize() {
return [this._field, this._operator, this._value.toString()] return [this._field, this._operator, this._value]
} }
} }