[AAE-15839] Fix file object input in viewers (#8804)

* [AAE-15839] Fix file object input in viewers * [AAE-15839] Attend review comments * [AAE-15839] Remove duplication * [AAE-15839] Fix package-lock.json * [AAE-15839] Fix package.json * [AAE-15839] Remove duplication * [AAE-15839] Remove duplication
Alfresco · Aug 9, 2023 · 04803c1 · 04803c1
1 parent 1f96c34
commit 04803c1
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 65 deletions.
diff --git a/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.spec.ts b/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.spec.ts
@@ -60,26 +60,27 @@ describe('BaseViewerWidgetComponent', () => {
     });
 
     it('should set the file id corretly when the field value is an array', (done) => {
-        const fakeField = new FormFieldModel(fakeForm, { id: 'fakeField', value: [fakePngAnswer] });
-        widget.field = fakeField;
-
-        fixture.detectChanges();
+        assertFileId([fakePngAnswer], '1933', fakeForm, widget, fixture, done);
+    });
 
-        fixture.whenStable().then(() => {
-            expect(widget.field.value).toBe('1933');
-            done();
-        });
+    it('should set the file id corretly when the field value is an object', (done) => {
+        assertFileId(fakePngAnswer, '1933', fakeForm, widget, fixture, done);
     });
 
     it('should set the file id corretly when the field value is a string', (done) => {
-        const fakeField = new FormFieldModel(fakeForm, { id: 'fakeField', value: 'fakeValue' });
-        widget.field = fakeField;
+        assertFileId('fakeValue', 'fakeValue', fakeForm, widget, fixture, done);
+    });
+});
 
-        fixture.detectChanges();
+function assertFileId(value: any, expectedFileId: string, fakeForm: FormModel, widget: BaseViewerWidgetComponent, fixture: ComponentFixture<BaseViewerWidgetComponent>, done: DoneFn) {
+    const fakeField = new FormFieldModel(fakeForm, { id: 'fakeField', value });
+    widget.field = fakeField;
 
-        fixture.whenStable().then(() => {
-            expect(widget.field.value).toBe('fakeValue');
-            done();
-        });
+    fixture.detectChanges();
+
+    fixture.whenStable().then(() => {
+        expect(widget.field.value).toBe(expectedFileId);
+        done();
     });
-});
+}
+
diff --git a/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.ts b/lib/core/src/lib/form/components/widgets/base-viewer/base-viewer.widget.ts
@@ -19,7 +19,7 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 import { FormService } from '../../../services/form.service';
 import { WidgetComponent } from '../widget.component';
 
- /* eslint-disable @angular-eslint/component-selector */
+/* eslint-disable @angular-eslint/component-selector */
 
 @Component({
     selector: 'base-viewer-widget',
@@ -44,12 +44,13 @@ export class BaseViewerWidgetComponent extends WidgetComponent implements OnInit
     }
 
     ngOnInit(): void {
-        if (this.field &&
-            this.field.value &&
-            Array.isArray(this.field.value) &&
-            this.field.value.length) {
-            const file = this.field.value[0];
-            this.field.value = file.id;
+        if (this.field?.value) {
+            if (Array.isArray(this.field.value) && this.field.value.length > 0) {
+                const file = this.field.value[0];
+                this.field.value = file.id;
+            } else if (typeof this.field.value === 'object' && this.field.value.id) {
+                this.field.value = this.field.value.id;
+            }
         }
     }
 }
diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/file-viewer/file-viewer.widget.ts b/lib/process-services-cloud/src/lib/form/components/widgets/file-viewer/file-viewer.widget.ts
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-import { Component, OnInit, ViewEncapsulation } from '@angular/core';
-import { WidgetComponent, FormService } from '@alfresco/adf-core';
+import { Component, ViewEncapsulation } from '@angular/core';
+import { FormService, BaseViewerWidgetComponent } from '@alfresco/adf-core';
 
- /* eslint-disable @angular-eslint/component-selector */
+/* eslint-disable @angular-eslint/component-selector */
 
 @Component({
     selector: 'file-viewer-widget',
@@ -37,18 +37,8 @@ import { WidgetComponent, FormService } from '@alfresco/adf-core';
     },
     encapsulation: ViewEncapsulation.None
 })
-export class FileViewerWidgetComponent extends WidgetComponent implements OnInit {
+export class FileViewerWidgetComponent extends BaseViewerWidgetComponent {
     constructor(formService: FormService) {
         super(formService);
     }
-
-    ngOnInit(): void {
-        if (this.field &&
-            this.field.value &&
-            Array.isArray(this.field.value) &&
-            this.field.value.length) {
-            const file = this.field.value[0];
-            this.field.value = file.id;
-        }
-    }
 }
diff --git a/...vices-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.ts b/...vices-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { Component, EventEmitter, OnInit, Output, ViewEncapsulation } from '@angular/core';
-import { FormService, WidgetComponent } from '@alfresco/adf-core';
+import { Component, EventEmitter, Output, ViewEncapsulation } from '@angular/core';
+import { BaseViewerWidgetComponent, FormService } from '@alfresco/adf-core';
 import { Node } from '@alfresco/js-api';
 
 /* eslint-disable @angular-eslint/component-selector */
@@ -38,7 +38,7 @@ import { Node } from '@alfresco/js-api';
     },
     encapsulation: ViewEncapsulation.None
 })
-export class PropertiesViewerWidgetComponent extends WidgetComponent implements OnInit {
+export class PropertiesViewerWidgetComponent extends BaseViewerWidgetComponent {
 
     @Output()
     nodeContentLoaded: EventEmitter<Node> = new EventEmitter();
@@ -47,16 +47,6 @@ export class PropertiesViewerWidgetComponent extends WidgetComponent implements
         super(formService);
     }
 
-    ngOnInit(): void {
-        if (this.field &&
-            this.field.value &&
-            Array.isArray(this.field.value) &&
-            this.field.value.length) {
-                const file = this.field.value[0];
-                this.field.value = file.id;
-            }
-    }
-
     onNodeContentLoaded(node: Node) {
         this.nodeContentLoaded.emit(node);
     }

diff --git a/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.ts b/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.ts
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-import { FormService, WidgetComponent } from '@alfresco/adf-core';
-import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { BaseViewerWidgetComponent, FormService } from '@alfresco/adf-core';
+import { Component, ViewEncapsulation } from '@angular/core';
 
- /* eslint-disable @angular-eslint/component-selector */
+/* eslint-disable @angular-eslint/component-selector */
 
 @Component({
     selector: 'file-viewer-widget',
@@ -37,18 +37,8 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core';
     },
     encapsulation: ViewEncapsulation.None
 })
-export class FileViewerWidgetComponent extends WidgetComponent implements OnInit {
+export class FileViewerWidgetComponent extends BaseViewerWidgetComponent {
     constructor(formService: FormService) {
         super(formService);
     }
-
-    ngOnInit(): void {
-        if (this.field &&
-            this.field.value &&
-            Array.isArray(this.field.value) &&
-            this.field.value.length) {
-            const file = this.field.value[0];
-            this.field.value = file.id;
-        }
-    }
 }
diff --git a/package.json b/package.json
@@ -226,4 +226,3 @@
   "module": "./index.js",
   "typings": "./index.d.ts"
 }
-