Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.

Commit 288c731

Browse files
committed
fix: Update initialState for users and groups modals
1 parent 7472c30 commit 288c731

5 files changed

Lines changed: 22 additions & 3 deletions

File tree

libs/rucken/ionic/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export * from './lib/components/select-input/select-input.component';
1313
export * from './lib/components/select-input/select-input.module';
1414
export * from './lib/components/select-input/select-input.transformers';
1515
export * from './lib/components/select-input/select-input';
16+
export * from './lib/config/users.config';
1617
export * from './lib/entities/groups/group-modal/group-modal.component';
1718
export * from './lib/entities/groups/group-modal/group-modal.module';
1819
export * from './lib/entities/groups/groups-list/groups-list.component';

libs/rucken/ionic/src/lib/components/select-input/select-input.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ion-select-option
1111
*ngFor="let item of items; trackBy: trackByFn;"
1212
[value]="item.id">
13-
{{titleField?item[titleField]:item | customTranslate:item}}
13+
{{item.title | customTranslate:item}}
1414
</ion-select-option>
1515
</ion-select>
1616
</ng-container>

libs/rucken/ionic/src/lib/components/select-input/select-input.transformers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export function keyToSelectInput(
3939
const transformedItems = options.items.map(
4040
item => ({
4141
id: item[options.idField],
42-
title: item[options.titleField],
42+
title: item[options.titleField] || item,
4343
})
4444
);
4545
const items = keys.map(
@@ -88,7 +88,7 @@ export function selectInputToKey(
8888
const transformedItems = options.items.map(
8989
item => ({
9090
id: item[options.idField],
91-
title: item[options.titleField]
91+
title: item[options.titleField] || item
9292
})
9393
);
9494
const keys = objects.map(

libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list.component.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,15 @@ export class GroupsListComponent extends BaseEntityListComponent<Group> implemen
134134
if (usersListFiltersModal.sortType) {
135135
filter['sort'] = (usersListFiltersModal.sortType.id === 'asc' ? '' : '-') + filter['sort'];
136136
}
137+
if (!this.modalUpdate.initialState) {
138+
this.modalUpdate.initialState = {};
139+
}
140+
if (!this.modalView.initialState) {
141+
this.modalView.initialState = {};
142+
}
143+
if (!this.modalCreate.initialState) {
144+
this.modalCreate.initialState = {};
145+
}
137146
super.onChangeFilter(filter);
138147
}
139148
}

libs/rucken/ionic/src/lib/entities/users/users-list/users-list.component.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,15 @@ export class UsersListComponent extends BaseEntityListComponent<CustomUser> impl
138138
if (usersListFiltersModal.sortType) {
139139
filter['sort'] = (usersListFiltersModal.sortType.id === 'asc' ? '' : '-') + filter['sort'];
140140
}
141+
if (!this.modalUpdate.initialState) {
142+
this.modalUpdate.initialState = {};
143+
}
144+
if (!this.modalView.initialState) {
145+
this.modalView.initialState = {};
146+
}
147+
if (!this.modalCreate.initialState) {
148+
this.modalCreate.initialState = {};
149+
}
141150
super.onChangeFilter(filter);
142151
}
143152

0 commit comments

Comments
 (0)