Skip to content

Commit 263fdae

Browse files
Alvaro Camillo Netojhosefmarks
Alvaro Camillo Neto
authored and
jhosefmarks
committed
fix(page-dynamic-search): alterado nome de interface PoPageDynamicSearchOption
A interface genérica PoPageDynamicOption foi substituída por uma interface mais específica PoPageDynamicSearchOption pois existem diferenças entre os difererente componentes de PageDynamic.
1 parent b27501a commit 263fdae

File tree

6 files changed

+46
-54
lines changed

6 files changed

+46
-54
lines changed

‎projects/templates/src/lib/components/po-page-dynamic-search/po-page-dynamic-search-base.component.ts‎

Lines changed: 36 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,47 @@
1-
import { EventEmitter, Input, Output } from "@angular/core";
1+
import { EventEmitter, Input, Output } from '@angular/core';
22

3-
import {
4-
PoBreadcrumb,
5-
PoDynamicFormField,
6-
PoLanguageService,
7-
PoPageAction
8-
} from "@portinari/portinari-ui";
3+
import { PoBreadcrumb, PoDynamicFormField, PoLanguageService, PoPageAction } from '@portinari/portinari-ui';
94

10-
import { poLocaleDefault } from "../../utils/util";
5+
import { poLocaleDefault } from '../../utils/util';
116

12-
import { PoPageDynamicSearchLiterals } from "./po-page-dynamic-search-literals.interface";
13-
import { poAdvancedFiltersLiteralsDefault } from "./po-advanced-filter/po-advanced-filter-base.component";
14-
import { PoAdvancedFilterLiterals } from "./po-advanced-filter/po-advanced-filter-literals.interface";
15-
import { PoPageDynamicSearchOptions } from "./po-page-dynamic-search-options.interface";
7+
import { PoPageDynamicSearchLiterals } from './po-page-dynamic-search-literals.interface';
8+
import { poAdvancedFiltersLiteralsDefault } from './po-advanced-filter/po-advanced-filter-base.component';
9+
import { PoAdvancedFilterLiterals } from './po-advanced-filter/po-advanced-filter-literals.interface';
10+
import { PoPageDynamicSearchOptions } from './po-page-dynamic-search-options.interface';
1611

1712
export const poPageDynamicSearchLiteralsDefault = {
18-
en: <PoPageDynamicSearchLiterals>{
19-
disclaimerGroupTitle: "Displaying results filtered by:",
13+
en: <PoPageDynamicSearchLiterals> {
14+
disclaimerGroupTitle: 'Displaying results filtered by:',
2015
filterTitle: poAdvancedFiltersLiteralsDefault.en.title,
2116
filterCancelLabel: poAdvancedFiltersLiteralsDefault.en.cancelLabel,
2217
filterConfirmLabel: poAdvancedFiltersLiteralsDefault.en.confirmLabel,
23-
quickSearchLabel: "Quick search:",
24-
searchPlaceholder: "Search"
18+
quickSearchLabel: 'Quick search:',
19+
searchPlaceholder: 'Search'
2520
},
26-
es: <PoPageDynamicSearchLiterals>{
27-
disclaimerGroupTitle: "Presentando resultados filtrados por:",
21+
es: <PoPageDynamicSearchLiterals> {
22+
disclaimerGroupTitle: 'Presentando resultados filtrados por:',
2823
filterTitle: poAdvancedFiltersLiteralsDefault.es.title,
2924
filterCancelLabel: poAdvancedFiltersLiteralsDefault.es.cancelLabel,
3025
filterConfirmLabel: poAdvancedFiltersLiteralsDefault.es.confirmLabel,
31-
quickSearchLabel: "Búsqueda rápida:",
32-
searchPlaceholder: "Buscar"
26+
quickSearchLabel: 'Búsqueda rápida:',
27+
searchPlaceholder: 'Buscar',
3328
},
34-
pt: <PoPageDynamicSearchLiterals>{
35-
disclaimerGroupTitle: "Apresentando resultados filtrados por:",
29+
pt: <PoPageDynamicSearchLiterals> {
30+
disclaimerGroupTitle: 'Apresentando resultados filtrados por:',
3631
filterTitle: poAdvancedFiltersLiteralsDefault.pt.title,
3732
filterCancelLabel: poAdvancedFiltersLiteralsDefault.pt.cancelLabel,
3833
filterConfirmLabel: poAdvancedFiltersLiteralsDefault.pt.confirmLabel,
39-
quickSearchLabel: "Pesquisa rápida:",
40-
searchPlaceholder: "Pesquisar"
34+
quickSearchLabel: 'Pesquisa rápida:',
35+
searchPlaceholder: 'Pesquisar'
4136
},
42-
ru: <PoPageDynamicSearchLiterals>{
43-
disclaimerGroupTitle: "Отображение результатов, отфильтрованных по:",
37+
ru: <PoPageDynamicSearchLiterals> {
38+
disclaimerGroupTitle: 'Отображение результатов, отфильтрованных по:',
4439
filterTitle: poAdvancedFiltersLiteralsDefault.ru.title,
4540
filterCancelLabel: poAdvancedFiltersLiteralsDefault.ru.cancelLabel,
4641
filterConfirmLabel: poAdvancedFiltersLiteralsDefault.ru.confirmLabel,
47-
quickSearchLabel: "Быстрый поиск:",
48-
searchPlaceholder: "исследование"
49-
}
42+
quickSearchLabel: 'Быстрый поиск:',
43+
searchPlaceholder: 'исследование'
44+
},
5045
};
5146

5247
/**
@@ -56,6 +51,7 @@ export const poPageDynamicSearchLiteralsDefault = {
5651
* e exiba as informações.
5752
*/
5853
export class PoPageDynamicSearchBaseComponent {
54+
5955
private _filters: Array<PoDynamicFormField> = [];
6056
private _literals: PoPageDynamicSearchLiterals;
6157

@@ -64,10 +60,10 @@ export class PoPageDynamicSearchBaseComponent {
6460
private language: string;
6561

6662
/** Nesta propriedade deve ser definido um array de objetos que implementam a interface `PoPageAction`. */
67-
@Input("p-actions") actions?: Array<PoPageAction> = [];
63+
@Input('p-actions') actions?: Array<PoPageAction> = [];
6864

6965
/** Objeto com propriedades do breadcrumb. */
70-
@Input("p-breadcrumb") breadcrumb?: PoBreadcrumb = { items: [] };
66+
@Input('p-breadcrumb') breadcrumb?: PoBreadcrumb = { items: [] };
7167

7268
/**
7369
* @optional
@@ -107,7 +103,7 @@ export class PoPageDynamicSearchBaseComponent {
107103
*
108104
* > O valor padrão será traduzido de acordo com o idioma configurado no [`PoI18nService`](/documentation/po-i18n) ou *browser*.
109105
*/
110-
@Input("p-literals") set literals(value: PoPageDynamicSearchLiterals) {
106+
@Input('p-literals') set literals(value: PoPageDynamicSearchLiterals) {
111107
if (value instanceof Object && !(value instanceof Array)) {
112108
this._literals = {
113109
...poPageDynamicSearchLiteralsDefault[poLocaleDefault],
@@ -132,7 +128,7 @@ export class PoPageDynamicSearchBaseComponent {
132128
*
133129
* Lista dos campos usados na busca avançada. Caso o mesmo não seja passado a busca avançada não será exibida.
134130
*/
135-
@Input("p-filters") set filters(filters: Array<PoDynamicFormField>) {
131+
@Input('p-filters') set filters(filters: Array<PoDynamicFormField>) {
136132
this._filters = Array.isArray(filters) ? [...filters] : [];
137133
}
138134

@@ -147,13 +143,13 @@ export class PoPageDynamicSearchBaseComponent {
147143
* - `string`: *Endpoint* usado pelo componente para requisição via `POST`.
148144
* - `function`: Método que será executado.
149145
*
150-
* O retorno desta função deve ser do tipo `PoPageDynamicOptions`,
146+
* O retorno desta função deve ser do tipo `PoPageDynamicSearchOptions`,
151147
* onde o usuário poderá customizar novos filtros, breadcrumb, title e actions
152148
*
153149
* Por exemplo:
154150
*
155151
* ```
156-
* getPageOptions(): PoPageDynamicOptions {
152+
* getPageOptions(): PoPageDynamicSearchOptions {
157153
* return {
158154
* actions: [
159155
* { label: 'Find on Google' },
@@ -170,10 +166,10 @@ export class PoPageDynamicSearchBaseComponent {
170166
* [p-load]="onLoadOptions.bind(this)"
171167
* ```
172168
*/
173-
@Input("p-load") onLoad: string | (() => PoPageDynamicOptions);
169+
@Input('p-load') onLoad: string | (() => PoPageDynamicSearchOptions);
174170

175171
/** Título da página. */
176-
@Input("p-title") title: string;
172+
@Input('p-title') title: string;
177173

178174
/**
179175
* @description
@@ -182,19 +178,13 @@ export class PoPageDynamicSearchBaseComponent {
182178
*
183179
* > Campos não preenchidos não irão aparecer no objeto passado por parâmetro.
184180
*/
185-
@Output("p-advanced-search") advancedSearch?: EventEmitter<
186-
any
187-
> = new EventEmitter();
181+
@Output('p-advanced-search') advancedSearch?: EventEmitter<any> = new EventEmitter();
188182

189183
/** Evento disparado ao remover um ou todos os disclaimers pelo usuário. */
190-
@Output("p-change-disclaimers") changeDisclaimers?: EventEmitter<
191-
any
192-
> = new EventEmitter();
184+
@Output('p-change-disclaimers') changeDisclaimers?: EventEmitter<any> = new EventEmitter();
193185

194186
/** Evento disparado ao realizar uma busca pelo campo de pesquisa rápida, o mesmo será chamado repassando o valor digitado. */
195-
@Output("p-quick-search") quickSearch?: EventEmitter<
196-
string
197-
> = new EventEmitter();
187+
@Output('p-quick-search') quickSearch?: EventEmitter<string> = new EventEmitter();
198188

199189
constructor(languageService: PoLanguageService) {
200190
this.language = languageService.getShortLanguage();

‎projects/templates/src/lib/components/po-page-dynamic-table/interfaces/po-page-dynamic-table-options.interface.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { PoBreadcrumb } from '@portinari/portinari-ui';
2+
23
import { PoPageDynamicTableField } from './po-page-dynamic-table-field.interface';
34
import { PoPageDynamicTableActions } from './po-page-dynamic-table-actions.interface';
45

@@ -20,7 +21,6 @@ export interface PoPageDynamicTableOptions {
2021

2122
/**
2223
* Ações que o usuário poderá executar na página através de botões.
23-
*
2424
*/
2525
actions?: PoPageDynamicTableActions;
2626

projects/templates/src/lib/components/po-page-dynamic-table/tests/po-page-dynamic-list-base.component.spec.ts renamed to projects/templates/src/lib/components/po-page-dynamic-table/po-page-dynamic-list-base.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { PoPageDynamicListBaseComponent } from '../po-page-dynamic-list-base.component';
1+
import { PoPageDynamicListBaseComponent } from './po-page-dynamic-list-base.component';
22

3-
import { expectPropertiesValues } from '../../../util-test/util-expect.spec';
3+
import { expectPropertiesValues } from '../../util-test/util-expect.spec';
44

55
describe('PoPageDynamicListBaseComponent:', () => {
66
const component = new PoPageDynamicListBaseComponent();

‎projects/templates/src/lib/components/po-page-dynamic-table/po-page-dynamic-list-base.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Input } from '@angular/core';
33
import { PoBreadcrumb } from '@portinari/portinari-ui';
44

55
import { convertToBoolean } from '../../utils/util';
6+
67
import { PoPageDynamicTableField } from './interfaces/po-page-dynamic-table-field.interface';
78

89
export class PoPageDynamicListBaseComponent {

projects/templates/src/lib/components/po-page-dynamic-table/tests/po-page-dynamic-table.component.spec.ts renamed to projects/templates/src/lib/components/po-page-dynamic-table/po-page-dynamic-table.component.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import { of } from 'rxjs';
88

99
import { PoDialogModule, PoNotificationModule, PoTableColumnSort, PoTableColumnSortType } from '@portinari/portinari-ui';
1010

11-
import * as utilsFunctions from '../../../utils/util';
12-
import { configureTestSuite, expectPropertiesValues } from '../../../util-test/util-expect.spec';
13-
import { PoPageDynamicDetailComponent } from '../../po-page-dynamic-detail/po-page-dynamic-detail.component';
11+
import * as utilsFunctions from '../../utils/util';
12+
import { configureTestSuite, expectPropertiesValues } from '../../util-test/util-expect.spec';
13+
import { PoPageDynamicDetailComponent } from '../po-page-dynamic-detail/po-page-dynamic-detail.component';
1414

15-
import { PoPageDynamicTableComponent } from '../po-page-dynamic-table.component';
15+
import { PoPageDynamicTableComponent } from './po-page-dynamic-table.component';
1616

1717
describe('PoPageDynamicTableComponent:', () => {
1818
let component: PoPageDynamicTableComponent;

‎projects/templates/src/lib/components/po-page-dynamic-table/po-page-dynamic-table.component.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { ActivatedRoute, Route, Router } from '@angular/router';
22
import { Component, Input, OnInit, OnDestroy } from '@angular/core';
3+
34
import { Subscription, Observable, EMPTY, throwError, concat } from 'rxjs';
45
import { tap } from 'rxjs/operators';
56

@@ -99,7 +100,7 @@ export const poPageDynamicTableLiteralsDefault = {
99100
* }
100101
* ```
101102
*
102-
* Para carregar com um recurso já existente, deve-se ser incluído um parâmetro na rota chamado `id`:
103+
* Para carregar com um recurso já existente, deve ser incluído um parâmetro na rota chamado `id`:
103104
*
104105
* ```
105106
* {

0 commit comments

Comments
 (0)