po-ui · jnrpalma · Mar 25, 2024 · Mar 19, 2024 · Mar 20, 2024 · Mar 25, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [17.2.0](https://github.com/po-ui/po-angular/compare/v17.1.1...v17.2.0) (2024-03-25)
+
+### Bug Fixes
+
+* **dynamic-view:** correção campos duplicados ([b4ee54a](https://github.com/po-ui/po-angular/commit/b4ee54ae0c7529a1918d5ad5b50e86021c7f2a0c))
+
 ## [17.1.1](https://github.com/po-ui/po-angular/compare/v17.1.0...v17.1.1) (2024-03-18)
 
 ### Bug Fixes

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "po-ui-sources",
-  "version": "17.1.1",
+  "version": "17.2.0",
   "description": "PO UI",
   "homepage": "https://po-ui.io",
   "license": "MIT",
@@ -74,7 +74,7 @@
     "@angular/router": "~17.2.4",
     "@capacitor/core": "5.7.2",
     "@capacitor/network": "^5.0.7",
-    "@po-ui/style": "17.1.1",
+    "@po-ui/style": "17.2.0",
     "capitalize": "^2.0.4",
     "colors": "1.4.0",
     "core-js": "3.33.3",

diff --git a/...s/ui/src/lib/components/po-dynamic/po-dynamic-view/po-dynamic-view-base.component.spec.ts b/...s/ui/src/lib/components/po-dynamic/po-dynamic-view/po-dynamic-view-base.component.spec.ts
@@ -410,6 +410,129 @@ describe('PoDynamicViewBaseComponent:', () => {
         })
       ));
 
+      it('should return ordering field if have duplicated order', () => {
+        const fields: Array<PoDynamicViewField> = [
+          { property: 'test 1', order: 1 },
+          { property: 'test 0', order: 1 },
+          { property: 'test 2', order: 2 },
+          { property: 'test 3' },
+          { property: 'test 4' },
+          { property: 'test 5' }
+        ];
+
+        const expectedFields = [
+          { property: 'test 1', order: 1 },
+          { property: 'test 0', order: 1 },
+          { property: 'test 2', order: 2 },
+          { property: 'test 3', order: 3 },
+          { property: 'test 4', order: 4 },
+          { property: 'test 5', order: 5 }
+        ];
+
+        component.fields = [...fields];
+
+        const newFields = component['getConfiguredFields']();
+
+        expectArraysSameOrdering(newFields, expectedFields);
+      });
+
+      it('should return ordering field with the order', () => {
+        const fields: Array<PoDynamicViewField> = [
+          { property: 'test 1' },
+          { property: 'test 0' },
+          { property: 'test 2' },
+          { property: 'test 3' },
+          { property: 'test 4' },
+          { property: 'test 5' }
+        ];
+
+        const expectedFields = [
+          { property: 'test 1', order: 1 },
+          { property: 'test 0', order: 2 },
+          { property: 'test 2', order: 3 },
+          { property: 'test 3', order: 4 },
+          { property: 'test 4', order: 5 },
+          { property: 'test 5', order: 6 }
+        ];
+
+        component.fields = [...fields];
+
+        const newFields = component['getConfiguredFields']();
+
+        expectArraysSameOrdering(newFields, expectedFields);
+      });
+
+      it('should return ordering fields with property searchService using service type with delay', fakeAsync(
+        inject([DynamicViewService], (dynamicService: DynamicViewService) => {
+          component.service = dynamicService;
+          const fields: Array<PoDynamicViewField> = [
+            { property: 'test 1' },
+            { property: 'test 0', searchService: new TestServiceWithDelay(), fieldLabel: 'name', fieldValue: 'id' },
+            { property: 'test 2', searchService: 'url.com' },
+            { property: 'test 3', searchService: 'url.com' },
+            { property: 'test 4' },
+            { property: 'test 5' }
+          ];
+          component.value[fields[1].property] = '123';
+          component.value[fields[2].property] = [{ test: 123 }];
+          component.value[fields[3].property] = { test: 123 };
+
+          const expectedFields = [
+            { property: 'test 1', order: 1 },
+            { property: 'test 0', order: 2 },
+            { property: 'test 2', order: 3 },
+            { property: 'test 3', order: 4 },
+            { property: 'test 4', order: 5 },
+            { property: 'test 5', order: 6 }
+          ];
+
+          component.fields = [...fields];
+
+          const newFields = component['getConfiguredFields']();
+          tick(2000);
+
+          expectArraysSameOrdering(newFields, expectedFields);
+        })
+      ));
+
+      it('should return ordering fields with property optionsService using service type with delay', fakeAsync(
+        inject([DynamicViewService], (dynamicService: DynamicViewService) => {
+          component.service = dynamicService;
+          const fields: Array<PoDynamicViewField> = [
+            { property: 'test 1' },
+            {
+              property: 'test 0',
+              optionsService: new TestComboServiceWithDelay(),
+              fieldLabel: 'name',
+              fieldValue: 'id'
+            },
+            { property: 'test 2', searchService: 'url.com' },
+            { property: 'test 3', searchService: 'url.com' },
+            { property: 'test 4' },
+            { property: 'test 5' }
+          ];
+          component.value[fields[1].property] = '123';
+          component.value[fields[2].property] = [{ test: 123 }];
+          component.value[fields[3].property] = { test: 123 };
+
+          const expectedFields = [
+            { property: 'test 1', order: 1 },
+            { property: 'test 0', order: 2 },
+            { property: 'test 2', order: 3 },
+            { property: 'test 3', order: 4 },
+            { property: 'test 4', order: 5 },
+            { property: 'test 5', order: 6 }
+          ];
+
+          component.fields = [...fields];
+
+          const newFields = component['getConfiguredFields']();
+          tick(2000);
+
+          expectArraysSameOrdering(newFields, expectedFields);
+        })
+      ));
+
       it('should process fields with optionsService', () => {
         component.fields = [{ property: 'category', optionsService: 'url.optionsService.com' }];
         component.value = { 'category': '123' };
@@ -456,98 +579,6 @@ describe('PoDynamicViewBaseComponent:', () => {
       });
     });
 
-    it('should return ordering field with the order', () => {
-      const fields: Array<PoDynamicViewField> = [
-        { property: 'test 1' },
-        { property: 'test 0' },
-        { property: 'test 2' },
-        { property: 'test 3' },
-        { property: 'test 4' },
-        { property: 'test 5' }
-      ];
-
-      const expectedFields = [
-        { property: 'test 1', order: 1 },
-        { property: 'test 0', order: 2 },
-        { property: 'test 2', order: 3 },
-        { property: 'test 3', order: 4 },
-        { property: 'test 4', order: 5 },
-        { property: 'test 5', order: 6 }
-      ];
-
-      component.fields = [...fields];
-
-      const newFields = component['getConfiguredFields']();
-
-      expectArraysSameOrdering(newFields, expectedFields);
-    });
-
-    it('should return ordering fields with property searchService using service type with delay', fakeAsync(
-      inject([DynamicViewService], (dynamicService: DynamicViewService) => {
-        component.service = dynamicService;
-        const fields: Array<PoDynamicViewField> = [
-          { property: 'test 1' },
-          { property: 'test 0', searchService: new TestServiceWithDelay(), fieldLabel: 'name', fieldValue: 'id' },
-          { property: 'test 2', searchService: 'url.com' },
-          { property: 'test 3', searchService: 'url.com' },
-          { property: 'test 4' },
-          { property: 'test 5' }
-        ];
-        component.value[fields[1].property] = '123';
-        component.value[fields[2].property] = [{ test: 123 }];
-        component.value[fields[3].property] = { test: 123 };
-
-        const expectedFields = [
-          { property: 'test 1', order: 1 },
-          { property: 'test 0', order: 2 },
-          { property: 'test 2', order: 3 },
-          { property: 'test 3', order: 4 },
-          { property: 'test 4', order: 5 },
-          { property: 'test 5', order: 6 }
-        ];
-
-        component.fields = [...fields];
-
-        const newFields = component['getConfiguredFields']();
-        tick(2000);
-
-        expectArraysSameOrdering(newFields, expectedFields);
-      })
-    ));
-
-    it('should return ordering fields with property optionsService using service type with delay', fakeAsync(
-      inject([DynamicViewService], (dynamicService: DynamicViewService) => {
-        component.service = dynamicService;
-        const fields: Array<PoDynamicViewField> = [
-          { property: 'test 1' },
-          { property: 'test 0', optionsService: new TestComboServiceWithDelay(), fieldLabel: 'name', fieldValue: 'id' },
-          { property: 'test 2', searchService: 'url.com' },
-          { property: 'test 3', searchService: 'url.com' },
-          { property: 'test 4' },
-          { property: 'test 5' }
-        ];
-        component.value[fields[1].property] = '123';
-        component.value[fields[2].property] = [{ test: 123 }];
-        component.value[fields[3].property] = { test: 123 };
-
-        const expectedFields = [
-          { property: 'test 1', order: 1 },
-          { property: 'test 0', order: 2 },
-          { property: 'test 2', order: 3 },
-          { property: 'test 3', order: 4 },
-          { property: 'test 4', order: 5 },
-          { property: 'test 5', order: 6 }
-        ];
-
-        component.fields = [...fields];
-
-        const newFields = component['getConfiguredFields']();
-        tick(2000);
-
-        expectArraysSameOrdering(newFields, expectedFields);
-      })
-    ));
-
     it('searchById: should return null if value is empty', done => {
       const value = '';
       const field: any = { property: 'test' };

diff --git a/projects/ui/src/lib/components/po-dynamic/po-dynamic-view/po-dynamic-view-base.component.ts b/projects/ui/src/lib/components/po-dynamic/po-dynamic-view/po-dynamic-view-base.component.ts
@@ -138,20 +138,16 @@ export class PoDynamicViewBaseComponent {
     protected multiselectFilterService: PoMultiselectFilterService
   ) {}
 
-  /**
-   * Verifica se já existe algum outro campo com a order da posição dele no array,
-   * se houver ele adiciona +1 até achar uma proxima posição
-   */
-  protected getOrdertoField(field: PoDynamicViewField, index: number) {
+  protected getFieldOrder(field: PoDynamicViewField, index: number) {
     const position = index + 1;
-    return this.fields.findIndex(e => e.order === position) > -1 ? this.getOrdertoField(field, position) : position;
+    return this.fields.findIndex(e => e.order === position) > -1 ? this.getFieldOrder(field, position) : position;
   }
 
   protected getConfiguredFields(useSearchService = true) {
     const newFields = [];
 
     this.fields.forEach((field, index) => {
-      field.order = field.order || this.getOrdertoField(field, index);
+      field.order = field.order || this.getFieldOrder(field, index);
 
       if (!isVisibleField(field)) {
         return;
@@ -167,8 +163,8 @@ export class PoDynamicViewBaseComponent {
         (!Array.isArray(this.value[field.property]) && this.value[field.property] && useSearchService);
 
       if (hasValue) {
-        const tempField = this.returnValues({ ...field }, '');
-        newFields.push(this.createField(tempField));
+        const _field = this.returnValues({ ...field }, '');
+        newFields.push(_field);
 
         if (field.searchService) {
           if (typeof field.searchService === 'object') {
@@ -195,8 +191,7 @@ export class PoDynamicViewBaseComponent {
           }
         }
 
-        const indexUpdated = field.order;
-        this.createFieldWithService(field, newFields, indexUpdated);
+        this.createFieldWithService(field, newFields, _field);
       }
     });
 
@@ -240,13 +235,14 @@ export class PoDynamicViewBaseComponent {
     return this.returnValues(field, value);
   }
 
-  private createFieldWithService(field: PoDynamicViewField, newFields?, index?) {
+  private createFieldWithService(field: PoDynamicViewField, newFields?, oldField?) {
     const property = field.property;
 
     this.searchById(this.value[property], field).subscribe(response => {
       const value = response;
       const allValues = this.returnValues(field, value);
-      newFields.splice(index - 1, 1, allValues);
+      const oldFieldIndex = newFields.indexOf(newFields.find(field => field === oldField));
+      newFields.splice(oldFieldIndex, 1, allValues);
       sortFields(newFields);
     });
   }

diff --git a/projects/ui/src/lib/components/po-page/po-page-slide/po-page-slide.component.spec.ts b/projects/ui/src/lib/components/po-page/po-page-slide/po-page-slide.component.spec.ts
@@ -1,4 +1,4 @@
-import { Component, DebugElement, ViewChild } from '@angular/core';
+import { Component, DebugElement, ElementRef, ViewChild } from '@angular/core';
 import { ComponentFixture, fakeAsync, flush, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
@@ -238,4 +238,18 @@ describe('PoPageSlideComponent', () => {
     component.close();
     expect(component['sourceElement'].focus).toHaveBeenCalled();
   });
+
+  it('should have pageContent.nativeElement defined', () => {
+    const div = document.createElement('div');
+    div.setAttribute('tabindex', '-1');
+
+    const mockElementRef = {
+      nativeElement: div
+    } as ElementRef;
+
+    component.pageContent = mockElementRef;
+    component['initFocus']();
+
+    expect(component.pageContent.nativeElement).toBeDefined();
+  });
 });
diff --git a/projects/ui/src/lib/components/po-page/po-page-slide/po-page-slide.component.ts b/projects/ui/src/lib/components/po-page/po-page-slide/po-page-slide.component.ts
@@ -118,7 +118,6 @@ export class PoPageSlideComponent extends PoPageSlideBaseComponent {
       this.firstElement.focus();
     } else {
       const elements = getFocusableElements(this.pageContent.nativeElement);
-      /* istanbul ignore next */
       const element = elements[0] || this.pageContent.nativeElement;
       element.focus();
     }