Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/components/crud-field/crud-field.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ import { getNgxSelectOptionsModal } from '../modal/modal.component';
import { ActionRoles, SelectFieldInterfaces } from '../../engine/constants';
import { IconComponent } from '../icon/icon.component';
import { getModelAndRepository } from '../../engine/helpers';
import { Validator } from '@decaf-ts/decorator-validation';

/**
* @description A dynamic form field component for CRUD operations.
Expand Down Expand Up @@ -804,6 +803,7 @@ export class CrudFieldComponent
*/
async openSelectOptions(event: Event, selectInterface: SelectInterface): Promise<void> {
if (selectInterface === SelectFieldInterfaces.MODAL) {
this.updateOn = 'blur';
event.preventDefault();
event.stopImmediatePropagation();
const loading = await this.loadingController.create({} as LoadingOptions);
Expand Down
13 changes: 8 additions & 5 deletions src/lib/components/list/list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -967,11 +967,14 @@ export class ListComponent extends NgxComponentDirective implements OnInit, OnDe
refreshEventEmit(data?: KeyValue[]): void {
if (!data) data = this.items;
this.skeletonData = new Array(1);
this.refreshEvent.emit({
name: ComponentEventNames.Refresh,
data: data || [],
component: this.componentName,
});
// Avoid emitting refresh events when the component is a child of a modal to prevent
if (!this.isModalChild) {
this.refreshEvent.emit({
name: ComponentEventNames.Refresh,
data: data || [],
component: this.componentName,
});
}
}

/**
Expand Down
Loading