From 9ccae4d2c7cf7a6a6a1439066c04c2beeafabfce Mon Sep 17 00:00:00 2001 From: Kristan Ntavidi Date: Wed, 5 May 2021 13:04:30 +0300 Subject: [PATCH] Admin template Editor. Temporary patch. Make value unrequired in visibility rules. --- .../admin/rule-editor-model.ts | 2 +- ...rofile-editor-composite-field.component.ts | 26 +++---------------- .../dataset-profile-editor-field.component.ts | 2 ++ 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/rule-editor-model.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/rule-editor-model.ts index 6e878666c..e945cc8c6 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/rule-editor-model.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/rule-editor-model.ts @@ -23,7 +23,7 @@ export class RuleEditorModel extends BaseFormModel { // sourceField: [this.sourceField], target: [{ value: this.target, disabled: (disabled && !skipDisable.includes('RuleEditorModel.target')) }, [Validators.required]], ruleStyle: [{ value: this.ruleStyle, disabled: (disabled && !skipDisable.includes('RuleEditorModel.ruleStyle')) }], - value: [{ value: this.value, disabled: (disabled && !skipDisable.includes('RuleEditorModel.value')) }, [Validators.required]], + value: [{ value: this.value, disabled: (disabled && !skipDisable.includes('RuleEditorModel.value')) }], ruleType: [{ value: this.ruleType, disabled: (disabled && !skipDisable.includes('RuleEditorModel.ruleType')) }], valueType: [{ value: this.valueType, disabled: (disabled && !skipDisable.includes('RuleEditorModel.valueType')) }] }); diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts index 2262dad65..4e3762bec 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/composite-field/dataset-profile-editor-composite-field.component.ts @@ -1,5 +1,5 @@ -import { ChangeDetectorRef, Component, Input, OnChanges, OnInit } from '@angular/core'; -import { AbstractControl, FormArray, FormControl, FormGroup, ValidationErrors, ValidatorFn, Validators } from '@angular/forms'; +import { Component, Input, OnChanges, OnInit } from '@angular/core'; +import { FormArray, FormControl, FormGroup} from '@angular/forms'; import { FieldEditorModel } from '../../../admin/field-editor-model'; import { Guid } from '@common/types/guid'; import { RuleEditorModel } from '../../../admin/rule-editor-model'; @@ -12,26 +12,7 @@ import { ConfirmationDialogComponent } from '@common/modules/confirmation-dialog import { TranslateService } from '@ngx-translate/core'; import { ViewStyleType } from '../field/view-style-enum'; import { EnumUtils } from '@app/core/services/utilities/enum-utils.service'; -import { BooleanDecisionFieldDataEditorModel } from '../../../admin/field-data/boolean-decision-field-data-editor-model'; -import { CheckBoxFieldDataEditorModel } from '../../../admin/field-data/check-box-field-data-editor-model'; -import { WordListFieldDataEditorModel } from '../../../admin/field-data/word-list-field-data-editor-model'; -import { AutoCompleteFieldDataEditorModel } from '../../../admin/field-data/auto-complete-field-data-editor-model'; -import { ResearchersAutoCompleteFieldDataEditorModel } from '../../../admin/field-data/researchers-auto-complete-field-data-editor-model'; -import { FreeTextFieldDataEditorModel } from '../../../admin/field-data/free-text-field-data-editor-model'; -import { RadioBoxFieldDataEditorModel } from '../../../admin/field-data/radio-box-field-data-editor-model'; -import { TextAreaFieldDataEditorModel } from '../../../admin/field-data/text-area-field-data-editor-model'; -import { DatePickerDataEditorModel } from '../../../admin/field-data/date-picker-data-editor-models'; -import { ExternalDatasetsDataEditorModel } from '../../../admin/field-data/external-datasets-data-editor-models'; -import { DataRepositoriesDataEditorModel } from '../../../admin/field-data/data-repositories-data-editor-models'; -import { RegistriesDataEditorModel } from '../../../admin/field-data/registries-data-editor-models'; -import { ServicesDataEditorModel } from '../../../admin/field-data/services-data-editor-models'; -import { TagsDataEditorModel } from '../../../admin/field-data/tags-data-editor-models'; -import { DatasetsAutoCompleteFieldDataEditorModel } from '../../../admin/field-data/datasets-autocomplete-field-data-editor-mode'; -import { DatasetIdentifierDataEditorModel } from '../../../admin/field-data/dataset-identifier-data-editor-models'; -import { CurrencyDataEditorModel } from '../../../admin/field-data/currency-data-editor-models'; -import { ValidationDataEditorModel } from '../../../admin/field-data/validation-data-editor-models'; import { DatasetProfileService } from '@app/core/services/dataset-profile/dataset-profile.service'; -import { OrganizationsDataEditorModel } from '../../../admin/field-data/organizations-data-editor-models'; import { EditorCustomValidators } from '../../custom-validators/editor-custom-validators'; import { Field, FieldSet } from '@app/core/model/admin/dataset-profile/dataset-profile'; import { DatasetProfileComboBoxType } from '@app/core/common/enum/dataset-profile-combo-box-type'; @@ -40,8 +21,7 @@ import { AutoCompleteFieldData, BooleanDecisionFieldData, CheckBoxFieldData, Cur import { CompositeField } from '@app/core/model/dataset-profile-definition/composite-field'; import {Field as FieldDefinition} from '@app/core/model/dataset-profile-definition/field'; import { Subject } from 'rxjs'; -import { debounce, debounceTime } from 'rxjs/operators'; -import { setUncaughtExceptionCaptureCallback } from 'process'; +import { debounceTime } from 'rxjs/operators'; import { GENERAL_ANIMATIONS } from '../../animations/animations'; @Component({ diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts index 8b48265d9..18382a245 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts @@ -390,6 +390,8 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements case this.viewTypeEnum.Select: case this.viewTypeEnum.CheckBox: case this.viewTypeEnum.DatePicker: + case this.viewTypeEnum.DataRepositories://TODO FURTHER NOTICE + case this.viewTypeEnum.ExternalDatasets://TODO FURTHER NOTICE return true; }