Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add ms-select-vanilla missing type & improve pkg exports #1314

Merged
merged 2 commits into from
Nov 13, 2023
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
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@
},
"dependencies": {
"@ngx-translate/core": ">=15.0.0 <16.0.0",
"@slickgrid-universal/common": "~3.5.0",
"@slickgrid-universal/custom-footer-component": "~3.5.0",
"@slickgrid-universal/empty-warning-component": "~3.5.0",
"@slickgrid-universal/event-pub-sub": "~3.4.0",
"@slickgrid-universal/pagination-component": "~3.5.0",
"@slickgrid-universal/row-detail-view-plugin": "~3.5.0",
"@slickgrid-universal/rxjs-observable": "~3.5.0",
"@slickgrid-universal/common": "~3.5.1",
"@slickgrid-universal/custom-footer-component": "~3.5.1",
"@slickgrid-universal/empty-warning-component": "~3.5.1",
"@slickgrid-universal/event-pub-sub": "~3.5.1",
"@slickgrid-universal/pagination-component": "~3.5.1",
"@slickgrid-universal/row-detail-view-plugin": "~3.5.1",
"@slickgrid-universal/rxjs-observable": "~3.5.1",
"dequal": "^2.0.3",
"dompurify": "^3.0.6",
"rxjs": "^7.8.1",
Expand Down Expand Up @@ -86,12 +86,12 @@
"@ng-select/ng-select": "^11.2.0",
"@ngx-translate/http-loader": "^8.0.0",
"@release-it/conventional-changelog": "^7.0.2",
"@slickgrid-universal/composite-editor-component": "~3.5.0",
"@slickgrid-universal/custom-tooltip-plugin": "~3.5.0",
"@slickgrid-universal/excel-export": "~3.5.0",
"@slickgrid-universal/graphql": "~3.5.0",
"@slickgrid-universal/odata": "~3.5.0",
"@slickgrid-universal/text-export": "~3.5.0",
"@slickgrid-universal/composite-editor-component": "~3.5.1",
"@slickgrid-universal/custom-tooltip-plugin": "~3.5.1",
"@slickgrid-universal/excel-export": "~3.5.1",
"@slickgrid-universal/graphql": "~3.5.1",
"@slickgrid-universal/odata": "~3.5.1",
"@slickgrid-universal/text-export": "~3.5.1",
"@types/dompurify": "^3.0.5",
"@types/flatpickr": "^3.1.2",
"@types/fnando__sparkline": "^0.3.7",
Expand All @@ -109,12 +109,12 @@
"font-awesome": "^4.7.0",
"jest": "^29.7.0",
"jest-extended": "^4.0.2",
"jest-preset-angular": "^13.1.3",
"jest-preset-angular": "^13.1.4",
"moment-mini": "^2.29.4",
"ng-packagr": "^16.2.3",
"ngx-bootstrap": "^11.0.2",
"npm-run-all2": "^6.1.1",
"release-it": "^16.2.1",
"release-it": "^17.0.0",
"rimraf": "^5.0.5",
"rxjs": "^7.8.1",
"sass": "^1.69.5",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
jest.mock('@slickgrid-universal/common/dist/commonjs/formatters/formatterUtilities');
import 'jest-extended';
import { ApplicationRef, ChangeDetectorRef, ElementRef } from '@angular/core';
import { TestBed } from '@angular/core/testing';
import { TranslateService, TranslateModule } from '@ngx-translate/core';
import {
autoAddEditorFormatterToColumnsWithEditor,
BackendService,
BackendServiceApi,
BackendUtilityService,
Expand Down Expand Up @@ -39,7 +39,6 @@ import {
TreeDataService,
SlickGroupItemMetadataProvider
} from '@slickgrid-universal/common';
import * as formatterUtilities from '@slickgrid-universal/common/dist/commonjs/formatters/formatterUtilities';
import { SlickFooterComponent } from '@slickgrid-universal/custom-footer-component';
import { EventPubSubService } from '@slickgrid-universal/event-pub-sub';
import { SlickEmptyWarningComponent } from '@slickgrid-universal/empty-warning-component';
Expand All @@ -54,6 +53,11 @@ import { GridOption } from '../../models';
import { MockSlickEvent, MockSlickEventHandler } from '../../../../../../test/mockSlickEvent';
import { RxJsResourceStub } from '../../../../../../test/rxjsResourceStub';

jest.mock('@slickgrid-universal/common', () => ({
...(jest.requireActual('@slickgrid-universal/common') as any),
autoAddEditorFormatterToColumnsWithEditor: jest.fn(),
}));

declare const Slick: any;
const slickEventHandler = new MockSlickEventHandler();
jest.mock('flatpickr', () => { });
Expand Down Expand Up @@ -538,7 +542,7 @@ describe('Angular-Slickgrid Custom Component instantiated via Constructor', () =
component.ngAfterViewInit();

expect(component).toBeTruthy();
// expect(formatterUtilities.autoAddEditorFormatterToColumnsWithEditor).toHaveBeenCalledWith([{ id: 'name', field: 'name', editor: undefined, internalColumnEditor: {} }], customEditableInputFormatter);
expect(autoAddEditorFormatterToColumnsWithEditor).toHaveBeenCalledWith([{ id: 'name', field: 'name', editor: undefined, internalColumnEditor: {} }], customEditableInputFormatter);
});
});

Expand All @@ -565,7 +569,6 @@ describe('Angular-Slickgrid Custom Component instantiated via Constructor', () =
const autosizeSpy = jest.spyOn(mockGrid, 'autosizeColumns');
const updateSpy = jest.spyOn(component, 'updateColumnDefinitionsList');
const renderSpy = jest.spyOn(extensionServiceStub, 'renderColumnHeaders');
const autoAddFormatterSpy = jest.spyOn(formatterUtilities, 'autoAddEditorFormatterToColumnsWithEditor');
const mockColDefs = [{ id: 'name', field: 'name', editor: undefined, internalColumnEditor: {} }];

component.ngAfterViewInit();
Expand All @@ -577,7 +580,7 @@ describe('Angular-Slickgrid Custom Component instantiated via Constructor', () =
expect(autosizeSpy).toHaveBeenCalled();
expect(updateSpy).toHaveBeenCalledWith(mockColDefs);
expect(renderSpy).toHaveBeenCalledWith(mockColDefs, true);
// expect(autoAddFormatterSpy).toHaveBeenCalledWith([{ id: 'name', field: 'name', editor: undefined, internalColumnEditor: {} }], customEditableInputFormatter);
expect(autoAddEditorFormatterToColumnsWithEditor).toHaveBeenCalledWith([{ id: 'name', field: 'name', editor: undefined, internalColumnEditor: {} }], customEditableInputFormatter);
});
});

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { ApplicationRef, Component } from '@angular/core';
import { Column, OnSelectedRowsChangedEventArgs, SharedService, SlickEventHandler, SlickGrid, SlickNamespace, } from '@slickgrid-universal/common';
import { Column, OnSelectedRowsChangedEventArgs, SharedService, SlickEventHandler, SlickGrid, SlickNamespace, SlickRowSelectionModel, } from '@slickgrid-universal/common';
import { EventPubSubService } from '@slickgrid-universal/event-pub-sub';
import { SlickRowSelectionModel } from '@slickgrid-universal/common/dist/commonjs/extensions/slickRowSelectionModel';
import { of } from 'rxjs';

import { GridOption } from '../../models/gridOption.interface';
Expand All @@ -11,6 +10,21 @@ import { RxJsResourceStub } from '../../../../../../test/rxjsResourceStub';
import { SlickRowDetailView } from '../slickRowDetailView';
jest.mock('@slickgrid-universal/row-detail-view-plugin');

jest.mock('@slickgrid-universal/common', () => ({
...(jest.requireActual('@slickgrid-universal/common') as any),
SlickRowSelectionModel: jest.fn().mockImplementation(() => ({
constructor: jest.fn(),
init: jest.fn(),
destroy: jest.fn(),
dispose: jest.fn(),
getSelectedRows: jest.fn(),
setSelectedRows: jest.fn(),
getSelectedRanges: jest.fn(),
setSelectedRanges: jest.fn(),
onSelectedRangesChanged: new Slick.Event(),
})),
}));

declare const Slick: SlickNamespace;
const ROW_DETAIL_CONTAINER_PREFIX = 'container_';
const PRELOAD_CONTAINER_PREFIX = 'container_loading';
Expand Down Expand Up @@ -67,22 +81,6 @@ const gridStub = {
onSort: new Slick.Event(),
} as unknown as SlickGrid;

const mockRowSelectionModel = {
constructor: jest.fn(),
init: jest.fn(),
destroy: jest.fn(),
dispose: jest.fn(),
getSelectedRows: jest.fn(),
setSelectedRows: jest.fn(),
getSelectedRanges: jest.fn(),
setSelectedRanges: jest.fn(),
onSelectedRangesChanged: new Slick.Event(),
} as unknown as SlickRowSelectionModel;

jest.mock('@slickgrid-universal/common/dist/commonjs/extensions/slickRowSelectionModel', () => ({
SlickRowSelectionModel: jest.fn().mockImplementation(() => mockRowSelectionModel),
}));

@Component({ template: `<h4>Loading...</h4>` })
class TestPreloadComponent { }

Expand Down
Loading