refactor: change interface names

Author: iobuhov

packages/pluggableWidgets/datagrid-web/test-ct/preview.spec.tsx

@@ -1,9 +1,9 @@
-import { DatasourceController } from "@mendix/widget-plugin-grid/query/DatasourceController";
+import { DatasourceService } from "@mendix/widget-plugin-grid/main";
 import { computed, makeObservable } from "mobx";
 
 export class DerivedLoaderController {
     constructor(
-        private datasourceController: DatasourceController,
+        private datasourceService: DatasourceService,
         private refreshIndicator: boolean
     ) {
         makeObservable(this, {
@@ -13,7 +13,7 @@ export class DerivedLoaderController {
     }
 
     get isRefreshing(): boolean {
-        const { isSilentRefresh, isRefreshing } = this.datasourceController;
+        const { isSilentRefresh, isRefreshing } = this.datasourceService;
         return !isSilentRefresh && isRefreshing;
     }
 

packages/pluggableWidgets/gallery-web/src/controllers/DerivedLoaderController.ts

@@ -1,6 +1,6 @@
-import { DatasourceController } from "@mendix/widget-plugin-grid/query/DatasourceController";
+import { DatasourceService } from "@mendix/widget-plugin-grid/main";
 import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch";
-import { ReactiveController, ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
+import { SetupComponent, SetupComponentHost } from "@mendix/widget-plugin-mobx-kit/main";
 import { SortInstruction } from "@mendix/widget-plugin-sorting/types/store";
 
 import { FilterCondition } from "mendix/filters";
@@ -14,18 +14,18 @@ interface ObservableSortStore {
     sortOrder: SortInstruction[] | undefined;
 }
 
-export class QueryParamsController implements ReactiveController {
-    private readonly _query: DatasourceController;
+export class QueryParamsController implements SetupComponent {
+    private readonly _query: DatasourceService;
     private readonly _filtersHost: ObservableFilterStore;
     private readonly _sortHost: ObservableSortStore;
 
     constructor(
-        host: ReactiveControllerHost,
-        query: DatasourceController,
+        host: SetupComponentHost,
+        query: DatasourceService,
         filters: ObservableFilterStore,
         sort: ObservableSortStore
     ) {
-        host.addController(this);
+        host.add(this);
 
         this._query = query;
         this._filtersHost = filters;

packages/pluggableWidgets/gallery-web/src/controllers/QueryParamsController.ts

@@ -1,5 +1,4 @@
-import { ReactiveController, ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
-import { QueryController } from "./query-controller";
+import { QueryService } from "@mendix/widget-plugin-grid/main";
 
 type PaginationEnum = "buttons" | "virtualScrolling" | "loadMore";
 
@@ -16,19 +15,18 @@ interface StaticProps {
 
 /** NOTE: Use gate for dynamic props */
 type PaginationControllerSpec = StaticProps & {
-    query: QueryController;
+    query: QueryService;
 };
 
-export class PaginationController implements ReactiveController {
+export class PaginationController {
     private readonly _pageSize: number;
-    private readonly _query: QueryController;
+    private readonly _query: QueryService;
     readonly pagination: PaginationEnum;
     readonly paginationKind: PaginationKind;
     readonly showPagingButtons: ShowPagingButtonsEnum;
     readonly showTotalCount: boolean;
 
-    constructor(host: ReactiveControllerHost, spec: PaginationControllerSpec) {
-        host.addController(this);
+    constructor(spec: PaginationControllerSpec) {
         this._pageSize = spec.pageSize;
         this._query = spec.query;
         this.pagination = spec.pagination;
@@ -76,11 +74,9 @@ export class PaginationController implements ReactiveController {
             this._query.requestTotalCount(true);
         }
 
-        this._query.setPageSize(this.pageSize);
+        this._query.setBaseLimit(this.pageSize);
     }
 
-    setup(): void {}
-
     setPage = (computePage: (prevPage: number) => number): void => {
         const newPage = computePage(this.currentPage);
         if (this.isLimitBased) {

packages/shared/widget-plugin-grid/src/query/PaginationController.ts renamed to packages/pluggableWidgets/gallery-web/src/services/PaginationController.ts

@@ -1,6 +1,5 @@
 import { PlainJs } from "@mendix/filter-commons/typings/settings";
-import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/props-gate";
-import { ReactiveController, ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
+import { DerivedPropsGate, SetupComponent, SetupComponentHost } from "@mendix/widget-plugin-mobx-kit/main";
 import { EditableValue } from "mendix";
 import { computed, makeObservable } from "mobx";
 import { ObservableStorage } from "src/typings/storage";
@@ -9,11 +8,11 @@ type Gate = DerivedPropsGate<{
     stateStorageAttr: EditableValue<string>;
 }>;
 
-export class AttributeStorage implements ObservableStorage, ReactiveController {
+export class AttributeStorage implements ObservableStorage, SetupComponent {
     private readonly _gate: Gate;
 
-    constructor(host: ReactiveControllerHost, gate: Gate) {
-        host.addController(this);
+    constructor(host: SetupComponentHost, gate: Gate) {
+        host.add(this);
 
         this._gate = gate;
         makeObservable<this, "_attribute">(this, {

packages/pluggableWidgets/gallery-web/src/stores/AttributeStorage.ts

@@ -1,6 +1,6 @@
 import { PlainJs, Serializable } from "@mendix/filter-commons/typings/settings";
 import { disposeBatch } from "@mendix/widget-plugin-mobx-kit/disposeBatch";
-import { ReactiveControllerHost } from "@mendix/widget-plugin-mobx-kit/reactive-controller";
+import { SetupComponent, SetupComponentHost } from "@mendix/widget-plugin-mobx-kit/main";
 import { action, comparer, computed, makeObservable, reaction } from "mobx";
 import { ObservableStorage } from "src/typings/storage";
 
@@ -12,7 +12,7 @@ interface GalleryPersistentStateControllerSpec {
     storeSort: boolean;
 }
 
-export class GalleryPersistentStateController {
+export class GalleryPersistentStateController implements SetupComponent {
     private readonly _storage: ObservableStorage;
     private readonly _filtersHost: Serializable;
     private readonly _sortHost: Serializable;
@@ -21,8 +21,8 @@ export class GalleryPersistentStateController {
 
     readonly schemaVersion: number = 1;
 
-    constructor(host: ReactiveControllerHost, spec: GalleryPersistentStateControllerSpec) {
-        host.addController(this);
+    constructor(host: SetupComponentHost, spec: GalleryPersistentStateControllerSpec) {
+        host.add(this);
         this._storage = spec.storage;
         this._filtersHost = spec.filtersHost;
         this._sortHost = spec.sortHost;

packages/pluggableWidgets/gallery-web/src/stores/GalleryPersistentStateController.ts

@@ -1,19 +1,17 @@
 import { createContextWithStub, FilterAPI } from "@mendix/widget-plugin-filtering/context";
 import { CombinedFilter } from "@mendix/widget-plugin-filtering/stores/generic/CombinedFilter";
 import { CustomFilterHost } from "@mendix/widget-plugin-filtering/stores/generic/CustomFilterHost";
-import { DatasourceController } from "@mendix/widget-plugin-grid/query/DatasourceController";
-import { PaginationController } from "@mendix/widget-plugin-grid/query/PaginationController";
-import { RefreshController } from "@mendix/widget-plugin-grid/query/RefreshController";
+import { DatasourceService, RefreshController } from "@mendix/widget-plugin-grid/main";
 import { SelectionCountStore } from "@mendix/widget-plugin-grid/selection/stores/SelectionCountStore";
-import { BaseControllerHost } from "@mendix/widget-plugin-mobx-kit/BaseControllerHost";
-import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/props-gate";
+import { DerivedPropsGate, SetupHost } from "@mendix/widget-plugin-mobx-kit/main";
 import { generateUUID } from "@mendix/widget-plugin-platform/framework/generate-uuid";
 import { SortAPI } from "@mendix/widget-plugin-sorting/react/context";
 import { SortStoreHost } from "@mendix/widget-plugin-sorting/stores/SortStoreHost";
 import { DynamicValue, EditableValue, ListValue, SelectionMultiValue, SelectionSingleValue } from "mendix";
 import { PaginationEnum, StateStorageTypeEnum } from "../../typings/GalleryProps";
 import { DerivedLoaderController } from "../controllers/DerivedLoaderController";
 import { QueryParamsController } from "../controllers/QueryParamsController";
+import { PaginationController } from "../services/PaginationController";
 import { ObservableStorage } from "../typings/storage";
 import { AttributeStorage } from "./AttributeStorage";
 import { BrowserStorage } from "./BrowserStorage";
@@ -45,8 +43,8 @@ type GalleryStoreSpec = StaticProps & {
     gate: GalleryPropsGate;
 };
 
-export class GalleryStore extends BaseControllerHost {
-    private readonly _query: DatasourceController;
+export class GalleryStore extends SetupHost {
+    private readonly _query: DatasourceService;
     private readonly _filtersHost: CustomFilterHost;
     private readonly _sortHost: SortStoreHost;
     private _storage: ObservableStorage | null = null;
@@ -64,9 +62,9 @@ export class GalleryStore extends BaseControllerHost {
 
         this.name = spec.name;
 
-        this._query = new DatasourceController(this, spec.gate);
+        this._query = new DatasourceService(this, spec.gate);
 
-        this.paging = new PaginationController(this, {
+        this.paging = new PaginationController({
             query: this._query,
             pageSize: spec.pageSize,
             pagination: spec.pagination,

packages/pluggableWidgets/gallery-web/src/stores/GalleryStore.ts

@@ -1,5 +1,5 @@
 import { GateProvider } from "@mendix/widget-plugin-mobx-kit/GateProvider";
-import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/props-gate";
+import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/main";
 import { useConst } from "@mendix/widget-plugin-mobx-kit/react/useConst";
 import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup";
 import { ActionValue, EditableValue } from "mendix";

packages/shared/widget-plugin-dropdown-filter/src/containers/EnumFilterContainer.tsx

@@ -1,22 +1,21 @@
-import { RefSelectController } from "../controllers/RefSelectController";
+import { useOnScrollBottom } from "@mendix/widget-plugin-hooks/useOnScrollBottom";
+import { GateProvider } from "@mendix/widget-plugin-mobx-kit/GateProvider";
+import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/main";
+import { useConst } from "@mendix/widget-plugin-mobx-kit/react/useConst";
+import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup";
+import { ActionValue, EditableValue } from "mendix";
+import { observer } from "mobx-react-lite";
+import { CSSProperties, ReactElement, useEffect } from "react";
 import { RefComboboxController } from "../controllers/RefComboboxController";
+import { RefSelectController } from "../controllers/RefSelectController";
 import { RefTagPickerController } from "../controllers/RefTagPickerController";
-import { Select } from "../controls/select/Select";
 import { Combobox } from "../controls/combobox/Combobox";
+import { Select } from "../controls/select/Select";
 import { TagPicker } from "../controls/tag-picker/TagPicker";
+import { useFrontendType } from "../helpers/useFrontendType";
 import { usePickerJSActions } from "../helpers/usePickerJSActions";
 import { RefFilterStore } from "../stores/RefFilterStore";
-import { ActionValue, EditableValue } from "mendix";
-import { observer } from "mobx-react-lite";
-import { CSSProperties, ReactElement, useEffect } from "react";
-
-import { useFrontendType } from "../helpers/useFrontendType";
-import { useOnScrollBottom } from "@mendix/widget-plugin-hooks/useOnScrollBottom";
 import { SelectedItemsStyleEnum, SelectionMethodEnum } from "../typings/widget";
-import { useSetup } from "@mendix/widget-plugin-mobx-kit/react/useSetup";
-import { useConst } from "@mendix/widget-plugin-mobx-kit/react/useConst";
-import { GateProvider } from "@mendix/widget-plugin-mobx-kit/GateProvider";
-import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/props-gate";
 
 export interface RefFilterContainerProps {
     ariaLabel: string;

packages/shared/widget-plugin-dropdown-filter/src/containers/RefFilterContainer.tsx

@@ -1,4 +1,4 @@
-import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/props-gate";
+import { DerivedPropsGate } from "@mendix/widget-plugin-mobx-kit/main";
 import { ActionValue, EditableValue } from "mendix";
 import { OptionsSerializer } from "../stores/OptionsSerializer";
 import { IJSActionsControlled, ResetHandler, SetValueHandler } from "../typings/IJSActionsControlled";