MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

remove service as component input > include in parent providers instead

This commit is contained in:
mchouliara 2024-09-06 13:59:21 +03:00
parent d87c46445c
commit bfd44d5dfd
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.html
View File

@ -132,7 +132,14 @@
</div> </div>
<div [id]="'preview_container'+ form.get('id').value" class="row"> <div [id]="'preview_container'+ form.get('id').value" class="row">
<div *ngIf="previewFieldSet && showPreview && firstField?.get('data')?.get('fieldType')?.value" class="col-12" [@fade-in-fast]> <div *ngIf="previewFieldSet && showPreview && firstField?.get('data')?.get('fieldType')?.value" class="col-12" [@fade-in-fast]>
<app-description-form-field-set class="w-100" [canAnnotate]="false" [propertiesFormGroup]="previewPropertiesFormGroup" [fieldSet]="previewFieldSet" [visibilityRulesService]="visibilityRulesService" [numbering]="numbering" [hideAnnotations]="true" [validationErrorModel]="validationErrorModel"></app-description-form-field-set> <app-description-form-field-set class="w-100"
[canAnnotate]="false"
[propertiesFormGroup]="previewPropertiesFormGroup"
[fieldSet]="previewFieldSet"
[numbering]="numbering"
[hideAnnotations]="true"
[validationErrorModel]="validationErrorModel"
></app-description-form-field-set>
</div> </div>
</div> </div>
</div> </div>

4
frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.ts
View File

@ -28,7 +28,8 @@ import { ReferenceType } from '@app/core/model/reference-type/reference-type';
selector: 'app-description-template-editor-field-set-component', selector: 'app-description-template-editor-field-set-component',
templateUrl: './description-template-editor-field-set.component.html', templateUrl: './description-template-editor-field-set.component.html',
styleUrls: ['./description-template-editor-field-set.component.scss'], styleUrls: ['./description-template-editor-field-set.component.scss'],
animations: [GENERAL_ANIMATIONS] animations: [GENERAL_ANIMATIONS],
providers: [VisibilityRulesService]
}) })
export class DescriptionTemplateEditorFieldSetComponent extends BaseComponent implements OnInit { export class DescriptionTemplateEditorFieldSetComponent extends BaseComponent implements OnInit {
@ -196,7 +197,6 @@ export class DescriptionTemplateEditorFieldSetComponent extends BaseComponent im
const previewProperties = descriptionEditorModel.properties.buildForm({visibilityRulesService: this.visibilityRulesService}) as UntypedFormGroup; const previewProperties = descriptionEditorModel.properties.buildForm({visibilityRulesService: this.visibilityRulesService}) as UntypedFormGroup;
this.previewPropertiesFormGroup = previewProperties.get("fieldSets").get(fieldSet.id) as UntypedFormGroup; this.previewPropertiesFormGroup = previewProperties.get("fieldSets").get(fieldSet.id) as UntypedFormGroup;
this.previewFieldSet = fieldSet; this.previewFieldSet = fieldSet;
this.visibilityRulesService.setContext(mockDescription.descriptionTemplate.definition, previewProperties); this.visibilityRulesService.setContext(mockDescription.descriptionTemplate.definition, previewProperties);
} }

4
frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.ts
View File

@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, input, Input, SimpleChanges } from '@angular/core';
import { UntypedFormArray, UntypedFormGroup } from '@angular/forms'; import { UntypedFormArray, UntypedFormGroup } from '@angular/forms';
import { MatDialog } from "@angular/material/dialog"; import { MatDialog } from "@angular/material/dialog";
import { DescriptionTemplateFieldSet } from '@app/core/model/description-template/description-template'; import { DescriptionTemplateFieldSet } from '@app/core/model/description-template/description-template';
@ -42,7 +42,6 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
} }
isVisibleByVisibilityService: boolean = true; isVisibleByVisibilityService: boolean = true;
@Input() visibilityRulesService: VisibilityRulesService;
@Input() path: String; @Input() path: String;
@Input() descriptionTemplateId: String; @Input() descriptionTemplateId: String;
@Input() isChild: Boolean = false; @Input() isChild: Boolean = false;
@ -65,6 +64,7 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
private descriptionFormService: DescriptionFormService, private descriptionFormService: DescriptionFormService,
private uiNotificationService: UiNotificationService, private uiNotificationService: UiNotificationService,
private language: TranslateService, private language: TranslateService,
public visibilityRulesService: VisibilityRulesService
) { ) {
super(); super();
} }