diff --git a/src-ui/src/app/app-routing.module.ts b/src-ui/src/app/app-routing.module.ts index f65514f74..9d97bcde3 100644 --- a/src-ui/src/app/app-routing.module.ts +++ b/src-ui/src/app/app-routing.module.ts @@ -12,7 +12,7 @@ import { DocumentAsnComponent } from './components/document-asn/document-asn.com import { DocumentDetailComponent } from './components/document-detail/document-detail.component' import { DocumentListComponent } from './components/document-list/document-list.component' import { CorrespondentListComponent } from './components/manage/correspondent-list/correspondent-list.component' -import { CustomFieldsComponent } from './components/manage/custom-fields/custom-fields.component' +import { CustomFieldsListComponent } from './components/manage/custom-fields-list/custom-fields-list.component' import { DocumentTypeListComponent } from './components/manage/document-type-list/document-type-list.component' import { MailComponent } from './components/manage/mail/mail.component' import { SavedViewsComponent } from './components/manage/saved-views/saved-views.component' @@ -239,7 +239,7 @@ export const routes: Routes = [ }, { path: 'customfields', - component: CustomFieldsComponent, + component: CustomFieldsListComponent, canActivate: [PermissionsGuard], data: { requiredPermission: { diff --git a/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.html index b4216e41c..af194c015 100644 --- a/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.html +++ b/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.html @@ -11,7 +11,7 @@ @if (typeFieldDisabled) { - Data type cannot be changed after a field is created + Data type cannot be changed after a field is created }
@switch (objectForm.get('data_type').value) { @@ -39,6 +39,14 @@ } }
+
+ + @if (patternRequired) { + + } + @if (patternRequired) { + + }
diff --git a/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.ts index 384bf7b68..fada6c53e 100644 --- a/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.ts @@ -21,6 +21,7 @@ import { CustomFieldDataType, DATA_TYPE_LABELS, } from 'src/app/data/custom-field' +import { MATCH_NONE } from 'src/app/data/matching-model' import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service' import { UserService } from 'src/app/services/rest/user.service' import { SettingsService } from 'src/app/services/settings.service' @@ -107,6 +108,9 @@ export class CustomFieldEditDialogComponent select_options: new FormArray([]), default_currency: new FormControl(null), }), + matching_algorithm: new FormControl(MATCH_NONE), + match: new FormControl(''), + is_insensitive: new FormControl(true), }) } diff --git a/src-ui/src/app/components/manage/custom-fields-list/custom-fields-list.component.ts b/src-ui/src/app/components/manage/custom-fields-list/custom-fields-list.component.ts new file mode 100644 index 000000000..daa9bb314 --- /dev/null +++ b/src-ui/src/app/components/manage/custom-fields-list/custom-fields-list.component.ts @@ -0,0 +1,72 @@ +import { Component } from '@angular/core' +import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { CustomField, DATA_TYPE_LABELS } from 'src/app/data/custom-field' +import { + CustomFieldQueryLogicalOperator, + CustomFieldQueryOperator, +} from 'src/app/data/custom-field-query' +import { FILTER_CUSTOM_FIELDS_QUERY } from 'src/app/data/filter-rule-type' +import { DocumentListViewService } from 'src/app/services/document-list-view.service' +import { + PermissionsService, + PermissionType, +} from 'src/app/services/permissions.service' +import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service' +import { ToastService } from 'src/app/services/toast.service' +import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component' +import { ManagementListComponent } from '../management-list/management-list.component' + +@Component({ + selector: 'pngx-custom-fields-list', + templateUrl: './../management-list/management-list.component.html', + styleUrls: ['./../management-list/management-list.component.scss'], +}) +export class CustomFieldsListComponent extends ManagementListComponent { + permissionsDisabled = true + + constructor( + customFieldsService: CustomFieldsService, + modalService: NgbModal, + toastService: ToastService, + documentListViewService: DocumentListViewService, + permissionsService: PermissionsService + ) { + super( + customFieldsService, + modalService, + CustomFieldEditDialogComponent, + toastService, + documentListViewService, + permissionsService, + 0, // see filterDocuments override below + $localize`custom field`, + $localize`custom fields`, + PermissionType.CustomField, + [ + { + key: 'data_type', + name: $localize`Data Type`, + valueFn: (field: CustomField) => { + return DATA_TYPE_LABELS.find((l) => l.id === field.data_type).name + }, + }, + ] + ) + } + + filterDocuments(field: CustomField) { + this.documentListViewService.quickFilter([ + { + rule_type: FILTER_CUSTOM_FIELDS_QUERY, + value: JSON.stringify([ + CustomFieldQueryLogicalOperator.Or, + [[field.id, CustomFieldQueryOperator.Exists, true]], + ]), + }, + ]) + } + + getDeleteMessage(object: CustomField) { + return $localize`Do you really want to delete the field "${object.name}"?` + } +} diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.spec.ts b/src-ui/src/app/components/manage/custom-fields-list/custom-fields.component.spec.ts similarity index 98% rename from src-ui/src/app/components/manage/custom-fields/custom-fields.component.spec.ts rename to src-ui/src/app/components/manage/custom-fields-list/custom-fields.component.spec.ts index e94470d64..30ecf9472 100644 --- a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.spec.ts +++ b/src-ui/src/app/components/manage/custom-fields-list/custom-fields.component.spec.ts @@ -28,7 +28,7 @@ import { ToastService } from 'src/app/services/toast.service' import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component' import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component' import { PageHeaderComponent } from '../../common/page-header/page-header.component' -import { CustomFieldsComponent } from './custom-fields.component' +import { CustomFieldsComponent } from './custom-fields-list.component' const fields: CustomField[] = [ { diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.html b/src-ui/src/app/components/manage/custom-fields/custom-fields.component.html deleted file mode 100644 index 185e9da35..000000000 --- a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.scss b/src-ui/src/app/components/manage/custom-fields/custom-fields.component.scss deleted file mode 100644 index dfdd20433..000000000 --- a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.scss +++ /dev/null @@ -1,4 +0,0 @@ -// hide caret on mobile dropdown -.d-block.d-sm-none .dropdown-toggle::after { - display: none; -} diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts b/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts deleted file mode 100644 index b4fd9738d..000000000 --- a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts +++ /dev/null @@ -1,148 +0,0 @@ -import { Component, OnInit } from '@angular/core' -import { - NgbDropdownModule, - NgbModal, - NgbPaginationModule, -} from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' -import { delay, takeUntil, tap } from 'rxjs' -import { CustomField, DATA_TYPE_LABELS } from 'src/app/data/custom-field' -import { - CustomFieldQueryLogicalOperator, - CustomFieldQueryOperator, -} from 'src/app/data/custom-field-query' -import { FILTER_CUSTOM_FIELDS_QUERY } from 'src/app/data/filter-rule-type' -import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' -import { DocumentListViewService } from 'src/app/services/document-list-view.service' -import { PermissionsService } from 'src/app/services/permissions.service' -import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service' -import { DocumentService } from 'src/app/services/rest/document.service' -import { SavedViewService } from 'src/app/services/rest/saved-view.service' -import { SettingsService } from 'src/app/services/settings.service' -import { ToastService } from 'src/app/services/toast.service' -import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component' -import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component' -import { EditDialogMode } from '../../common/edit-dialog/edit-dialog.component' -import { PageHeaderComponent } from '../../common/page-header/page-header.component' -import { LoadingComponentWithPermissions } from '../../loading-component/loading.component' - -@Component({ - selector: 'pngx-custom-fields', - templateUrl: './custom-fields.component.html', - styleUrls: ['./custom-fields.component.scss'], - imports: [ - PageHeaderComponent, - IfPermissionsDirective, - NgbDropdownModule, - NgbPaginationModule, - NgxBootstrapIconsModule, - ], -}) -export class CustomFieldsComponent - extends LoadingComponentWithPermissions - implements OnInit -{ - public fields: CustomField[] = [] - - constructor( - private customFieldsService: CustomFieldsService, - public permissionsService: PermissionsService, - private modalService: NgbModal, - private toastService: ToastService, - private documentListViewService: DocumentListViewService, - private settingsService: SettingsService, - private documentService: DocumentService, - private savedViewService: SavedViewService - ) { - super() - } - - ngOnInit() { - this.reload() - } - - reload() { - this.customFieldsService - .listAll() - .pipe( - takeUntil(this.unsubscribeNotifier), - tap((r) => { - this.fields = r.results - }), - delay(100) - ) - .subscribe(() => { - this.show = true - this.loading = false - }) - } - - editField(field: CustomField) { - const modal = this.modalService.open(CustomFieldEditDialogComponent) - modal.componentInstance.dialogMode = field - ? EditDialogMode.EDIT - : EditDialogMode.CREATE - modal.componentInstance.object = field - modal.componentInstance.succeeded - .pipe(takeUntil(this.unsubscribeNotifier)) - .subscribe((newField) => { - this.toastService.showInfo($localize`Saved field "${newField.name}".`) - this.customFieldsService.clearCache() - this.settingsService.initializeDisplayFields() - this.documentService.reload() - this.reload() - }) - modal.componentInstance.failed - .pipe(takeUntil(this.unsubscribeNotifier)) - .subscribe((e) => { - this.toastService.showError($localize`Error saving field.`, e) - }) - } - - deleteField(field: CustomField) { - const modal = this.modalService.open(ConfirmDialogComponent, { - backdrop: 'static', - }) - modal.componentInstance.title = $localize`Confirm delete field` - modal.componentInstance.messageBold = $localize`This operation will permanently delete this field.` - modal.componentInstance.message = $localize`This operation cannot be undone.` - modal.componentInstance.btnClass = 'btn-danger' - modal.componentInstance.btnCaption = $localize`Proceed` - modal.componentInstance.confirmClicked.subscribe(() => { - modal.componentInstance.buttonsEnabled = false - this.customFieldsService.delete(field).subscribe({ - next: () => { - modal.close() - this.toastService.showInfo($localize`Deleted field "${field.name}"`) - this.customFieldsService.clearCache() - this.settingsService.initializeDisplayFields() - this.documentService.reload() - this.savedViewService.reload() - this.reload() - }, - error: (e) => { - this.toastService.showError( - $localize`Error deleting field "${field.name}".`, - e - ) - }, - }) - }) - } - - getDataType(field: CustomField): string { - return DATA_TYPE_LABELS.find((l) => l.id === field.data_type).name - } - - filterDocuments(field: CustomField) { - this.documentListViewService.quickFilter([ - { - rule_type: FILTER_CUSTOM_FIELDS_QUERY, - value: JSON.stringify([ - CustomFieldQueryLogicalOperator.Or, - [[field.id, CustomFieldQueryOperator.Exists, true]], - ]), - }, - ]) - } -} diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.html b/src-ui/src/app/components/manage/management-list/management-list.component.html index 82fd8502c..a8c6101c1 100644 --- a/src-ui/src/app/components/manage/management-list/management-list.component.html +++ b/src-ui/src/app/components/manage/management-list/management-list.component.html @@ -2,7 +2,7 @@ -