Skip to content

Commit fc3bdd6

Browse files
authored
fix: registered external resouces should keep singleton ref (#1118)
* fix: registered external resouces should keep singleton ref
1 parent a38876a commit fc3bdd6

18 files changed

+215
-179
lines changed

package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@
7777
"new-release": "npm run release, note that yarn is not supported with release-it and will throw an error"
7878
},
7979
"dependencies": {
80-
"@slickgrid-universal/common": "~3.6.0",
81-
"@slickgrid-universal/custom-footer-component": "~3.6.0",
82-
"@slickgrid-universal/empty-warning-component": "~3.6.0",
83-
"@slickgrid-universal/event-pub-sub": "~3.6.0",
84-
"@slickgrid-universal/pagination-component": "~3.6.0",
85-
"@slickgrid-universal/row-detail-view-plugin": "~3.6.0",
80+
"@slickgrid-universal/common": "~3.7.0",
81+
"@slickgrid-universal/custom-footer-component": "~3.7.0",
82+
"@slickgrid-universal/empty-warning-component": "~3.7.0",
83+
"@slickgrid-universal/event-pub-sub": "~3.7.0",
84+
"@slickgrid-universal/pagination-component": "~3.7.0",
85+
"@slickgrid-universal/row-detail-view-plugin": "~3.7.0",
8686
"aurelia-event-aggregator": "^1.0.3",
8787
"aurelia-framework": "^1.4.1",
8888
"aurelia-i18n": "^4.0.4",
@@ -97,13 +97,13 @@
9797
"@fnando/sparkline": "^0.3.10",
9898
"@popperjs/core": "^2.11.8",
9999
"@release-it/conventional-changelog": "^8.0.1",
100-
"@slickgrid-universal/composite-editor-component": "~3.6.0",
101-
"@slickgrid-universal/custom-tooltip-plugin": "~3.6.0",
102-
"@slickgrid-universal/excel-export": "~3.6.0",
103-
"@slickgrid-universal/graphql": "~3.6.0",
104-
"@slickgrid-universal/odata": "~3.6.0",
105-
"@slickgrid-universal/rxjs-observable": "~3.6.0",
106-
"@slickgrid-universal/text-export": "~3.6.0",
100+
"@slickgrid-universal/composite-editor-component": "~3.7.0",
101+
"@slickgrid-universal/custom-tooltip-plugin": "~3.7.0",
102+
"@slickgrid-universal/excel-export": "~3.7.0",
103+
"@slickgrid-universal/graphql": "~3.7.0",
104+
"@slickgrid-universal/odata": "~3.7.0",
105+
"@slickgrid-universal/rxjs-observable": "~3.7.0",
106+
"@slickgrid-universal/text-export": "~3.7.0",
107107
"@types/bluebird": "^3.5.42",
108108
"@types/dompurify": "^3.0.5",
109109
"@types/fnando__sparkline": "^0.3.7",

src/aurelia-slickgrid/custom-elements/__tests__/aurelia-slickgrid.spec.ts

+9-4
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,8 @@ describe('Aurelia-Slickgrid Component instantiated via Constructor', () => {
777777
const mockColDefs = [{ id: 'gender', field: 'gender', editor: { model: Editors.text, collectionAsync: of(mockCollection) } }] as Column[];
778778

779779
const rxjsMock = new RxJsResourceStub();
780-
customElement.gridOptions = { registerExternalResources: [rxjsMock] } as unknown as GridOption;
780+
customElement.gridOptions = { externalResources: [rxjsMock] } as unknown as GridOption;
781+
customElement.registerExternalResources([rxjsMock], true);
781782
customElement.columnDefinitions = mockColDefs;
782783
customElement.columnDefinitionsChanged();
783784
customElement.initialization(slickEventHandler);
@@ -1022,7 +1023,8 @@ describe('Aurelia-Slickgrid Component instantiated via Constructor', () => {
10221023
const sortServiceSpy = jest.spyOn(sortServiceStub, 'addRxJsResource');
10231024
const paginationServiceSpy = jest.spyOn(paginationServiceStub, 'addRxJsResource');
10241025

1025-
customElement.gridOptions = { registerExternalResources: [rxjsMock] } as unknown as GridOption;
1026+
customElement.gridOptions = { externalResources: [rxjsMock] } as unknown as GridOption;
1027+
customElement.registerExternalResources([rxjsMock], true);
10261028
customElement.initialization(slickEventHandler);
10271029

10281030
expect(backendUtilitySpy).toHaveBeenCalled();
@@ -1304,7 +1306,8 @@ describe('Aurelia-Slickgrid Component instantiated via Constructor', () => {
13041306
jest.spyOn((customElement.gridOptions as any).backendServiceApi.service, 'buildQuery').mockReturnValue(query);
13051307
const backendExecuteSpy = jest.spyOn(backendUtilityServiceStub, 'executeBackendProcessesCallback');
13061308

1307-
customElement.gridOptions.registerExternalResources = [rxjsMock];
1309+
customElement.gridOptions.externalResources = [rxjsMock];
1310+
customElement.registerExternalResources([rxjsMock], true);
13081311
customElement.gridOptions.backendServiceApi!.service.options = { executeProcessCommandOnInit: true };
13091312
customElement.initialization(slickEventHandler);
13101313

@@ -1394,7 +1397,9 @@ describe('Aurelia-Slickgrid Component instantiated via Constructor', () => {
13941397
jest.spyOn(customElement.gridOptions.backendServiceApi!.service, 'buildQuery').mockReturnValue(query);
13951398
const backendErrorSpy = jest.spyOn(backendUtilityServiceStub, 'onBackendError');
13961399

1397-
customElement.gridOptions.registerExternalResources = [rxjsMock];
1400+
customElement.gridOptions.externalResources = [rxjsMock];
1401+
customElement.resetExternalResources();
1402+
customElement.registerExternalResources([rxjsMock], true);
13981403
customElement.gridOptions.backendServiceApi!.service.options = { executeProcessCommandOnInit: true };
13991404
customElement.initialization(slickEventHandler);
14001405

0 commit comments

Comments
 (0)