refactor: rename other names in code

iobuhov · iobuhov · commit d94800e17c81 · 2026-03-23T10:20:12.000+01:00
diff --git a/packages/pluggableWidgets/datagrid-web/src/Datagrid.editorConfig.ts b/packages/pluggableWidgets/datagrid-web/src/Datagrid.editorConfig.ts
@@ -69,7 +69,7 @@ export function getProperties(values: DatagridPreviewProps, defaultProperties: P
 
     if (values.pagination === "buttons") {
         hidePropertyIn(defaultProperties, values, "showNumberOfRows");
-        hidePropertyIn(defaultProperties, values, "loadedRowsValue");
+        hidePropertyIn(defaultProperties, values, "dynamicItemCount");
 
         if (values.useCustomPagination === false) {
             hidePropertyIn(defaultProperties, values, "customPagination");
diff --git a/packages/pluggableWidgets/datagrid-web/src/Datagrid.xml b/packages/pluggableWidgets/datagrid-web/src/Datagrid.xml
@@ -342,7 +342,7 @@
                         <attributeType name="Integer" />
                     </attributeTypes>
                 </property>
-                <property key="loadedRowsValue" type="attribute" required="false">
+                <property key="dynamicItemCount" type="attribute" required="false">
                     <caption>Loaded rows</caption>
                     <description>Read-only attribute reflecting the number of rows currently loaded.</description>
                     <attributeTypes>
diff --git a/packages/pluggableWidgets/datagrid-web/typings/DatagridProps.d.ts b/packages/pluggableWidgets/datagrid-web/typings/DatagridProps.d.ts
@@ -127,7 +127,7 @@ export interface DatagridContainerProps {
     dynamicPageSize?: EditableValue<Big>;
     dynamicPage?: EditableValue<Big>;
     totalCountValue?: EditableValue<Big>;
-    loadedRowsValue?: EditableValue<Big>;
+    dynamicItemCount?: EditableValue<Big>;
     showEmptyPlaceholder: ShowEmptyPlaceholderEnum;
     emptyPlaceholder?: ReactNode;
     rowClass?: ListExpressionValue<string>;
@@ -194,7 +194,7 @@ export interface DatagridPreviewProps {
     dynamicPageSize: string;
     dynamicPage: string;
     totalCountValue: string;
-    loadedRowsValue: string;
+    dynamicItemCount: string;
     showEmptyPlaceholder: ShowEmptyPlaceholderEnum;
     emptyPlaceholder: { widgetCount: number; renderer: ComponentType<{ children: ReactNode; caption?: string }> };
     rowClass: string;
diff --git a/packages/pluggableWidgets/datagrid-web/typings/MainGateProps.ts b/packages/pluggableWidgets/datagrid-web/typings/MainGateProps.ts
@@ -42,7 +42,6 @@ export type MainGateProps = Pick<
     | "storeFiltersInPersonalization"
     | "style"
     | "totalCountValue"
-    | "loadedRowsValue"
     | "useCustomPagination"
     | "customPagination"
 >;
diff --git a/packages/pluggableWidgets/gallery-web/src/Gallery.editorConfig.ts b/packages/pluggableWidgets/gallery-web/src/Gallery.editorConfig.ts
@@ -37,7 +37,7 @@ export function getProperties(values: GalleryPreviewProps, defaultProperties: Pr
 
     if (values.pagination === "buttons") {
         hidePropertyIn(defaultProperties, values, "showTotalCount");
-        hidePropertyIn(defaultProperties, values, "loadedRowsValue");
+        hidePropertyIn(defaultProperties, values, "dynamicItemCount");
     } else {
         hidePropertyIn(defaultProperties, values, "showPagingButtons");
 
diff --git a/packages/pluggableWidgets/gallery-web/src/Gallery.xml b/packages/pluggableWidgets/gallery-web/src/Gallery.xml
@@ -185,7 +185,7 @@
                         <attributeType name="Integer" />
                     </attributeTypes>
                 </property>
-                <property key="loadedRowsValue" type="attribute" required="false">
+                <property key="dynamicItemCount" type="attribute" required="false">
                     <caption>Loaded items</caption>
                     <description>Read-only attribute reflecting the number of items currently loaded.</description>
                     <attributeTypes>
diff --git a/packages/pluggableWidgets/gallery-web/src/typings/GalleryGateProps.ts b/packages/pluggableWidgets/gallery-web/src/typings/GalleryGateProps.ts
@@ -30,7 +30,7 @@ export type GalleryGateProps = Pick<
     | "content"
     | "ariaLabelItem"
     | "totalCountValue"
-    | "loadedRowsValue"
+    | "dynamicItemCount"
     | "clearSelectionButtonLabel"
     | "selectedCountTemplateSingular"
     | "selectedCountTemplatePlural"
diff --git a/packages/pluggableWidgets/gallery-web/typings/GalleryProps.d.ts b/packages/pluggableWidgets/gallery-web/typings/GalleryProps.d.ts
@@ -58,7 +58,7 @@ export interface GalleryContainerProps {
     dynamicPageSize?: EditableValue<Big>;
     dynamicPage?: EditableValue<Big>;
     totalCountValue?: EditableValue<Big>;
-    loadedRowsValue?: EditableValue<Big>;
+    dynamicItemCount?: EditableValue<Big>;
     showEmptyPlaceholder: ShowEmptyPlaceholderEnum;
     emptyPlaceholder?: ReactNode;
     itemClass?: ListExpressionValue<string>;
@@ -114,7 +114,7 @@ export interface GalleryPreviewProps {
     dynamicPageSize: string;
     dynamicPage: string;
     totalCountValue: string;
-    loadedRowsValue: string;
+    dynamicItemCount: string;
     showEmptyPlaceholder: ShowEmptyPlaceholderEnum;
     emptyPlaceholder: { widgetCount: number; renderer: ComponentType<{ children: ReactNode; caption?: string }> };
     itemClass: string;
diff --git a/packages/shared/widget-plugin-grid/src/interfaces/GridPageControl.ts b/packages/shared/widget-plugin-grid/src/interfaces/GridPageControl.ts
@@ -2,5 +2,5 @@ export interface GridPageControl {
     setPage(page: number): void;
     setPageSize(pageSize: number): void;
     setTotalCount(totalCount: number): void;
-    setLoadedRows?(loadedRows: number): void;
+    setItemCount?(itemCount: number): void;
 }
diff --git a/packages/shared/widget-plugin-grid/src/pagination/DynamicPagination.feature.ts b/packages/shared/widget-plugin-grid/src/pagination/DynamicPagination.feature.ts
@@ -14,7 +14,7 @@ type FeatureGateProps = {
     dynamicPage?: EditableValue<Big>;
     dynamicPageSize?: EditableValue<Big>;
     totalCountValue?: EditableValue<Big>;
-    loadedRowsValue?: EditableValue<Big>;
+    dynamicItemCount?: EditableValue<Big>;
 };
 
 export class DynamicPaginationFeature implements SetupComponent {
@@ -118,15 +118,15 @@ export class DynamicPaginationFeature implements SetupComponent {
     }
 
     /**
-     * Syncs internal itemCount state to the loadedRowsValue attribute.
+     * Syncs internal itemCount state to the dynamicItemCount attribute.
      * Skips sentinel value (-1) when count isn't yet available.
      */
     private syncItemCountToAttribute(): () => void {
         return reaction(
             () => this.itemCount.get(),
             count => {
                 if (count < 0) return;
-                this.service.setLoadedRows?.(count);
+                this.service.setItemCount?.(count);
             },
             { name: "[@reaction] syncItemCountToAttribute", fireImmediately: true }
         );
diff --git a/packages/shared/widget-plugin-grid/src/pagination/PageControl.service.ts b/packages/shared/widget-plugin-grid/src/pagination/PageControl.service.ts
@@ -11,7 +11,7 @@ export class PageControlService implements GridPageControl {
             dynamicPage?: EditableValue<Big>;
             dynamicPageSize?: EditableValue<Big>;
             totalCountValue?: EditableValue<Big>;
-            loadedRowsValue?: EditableValue<Big>;
+            dynamicItemCount?: EditableValue<Big>;
         }>,
         private setPageSizeAction: SetPageSizeAction,
         private setPageAction: SetPageAction
@@ -21,7 +21,7 @@ export class PageControlService implements GridPageControl {
             setPageSize: action,
             setPage: action,
             setTotalCount: action,
-            setLoadedRows: action
+            setItemCount: action
         });
     }
 
@@ -40,8 +40,8 @@ export class PageControlService implements GridPageControl {
         value.setValue(new Big(count));
     }
 
-    setLoadedRows(count: number): void {
-        const value = this.gate.props.loadedRowsValue;
+    setItemCount(count: number): void {
+        const value = this.gate.props.dynamicItemCount;
         if (!value || value.readOnly) return;
         if (value.value?.eq(count)) return;
         value.setValue(new Big(count));
diff --git a/packages/shared/widget-plugin-grid/src/pagination/__tests__/DynamicPagination.feature.spec.ts b/packages/shared/widget-plugin-grid/src/pagination/__tests__/DynamicPagination.feature.spec.ts
@@ -10,7 +10,7 @@ type GateProps = {
     dynamicPage?: EditableValue<Big>;
     dynamicPageSize?: EditableValue<Big>;
     totalCountValue?: EditableValue<Big>;
-    loadedRowsValue?: EditableValue<Big>;
+    dynamicItemCount?: EditableValue<Big>;
 };
 
 type AtomsFixture = {
@@ -19,14 +19,14 @@ type AtomsFixture = {
     totalCount: IObservableValue<number>;
     currentPage: IObservableValue<number>;
     pageSize: IObservableValue<number>;
-    loadedRows: IObservableValue<number>;
+    itemCount: IObservableValue<number>;
 };
 
 type AttributesFixture = {
     page: EditableValue<Big>;
     pageSize: EditableValue<Big>;
     totalCount: EditableValue<Big>;
-    loadedRows: EditableValue<Big>;
+    itemCount: EditableValue<Big>;
 };
 
 type FeatureConfig = {
@@ -53,7 +53,7 @@ function createMockService(): jest.Mocked<GridPageControl> {
         setPage: jest.fn(),
         setPageSize: jest.fn(),
         setTotalCount: jest.fn(),
-        setLoadedRows: jest.fn()
+        setItemCount: jest.fn()
     };
 }
 
@@ -64,7 +64,7 @@ function createAtoms(overrides?: Partial<Record<keyof AtomsFixture, number>>): A
         totalCount: observable.box(overrides?.totalCount ?? 0),
         currentPage: observable.box(overrides?.currentPage ?? 0),
         pageSize: observable.box(overrides?.pageSize ?? 10),
-        loadedRows: observable.box(overrides?.loadedRows ?? 0)
+        itemCount: observable.box(overrides?.itemCount ?? 0)
     };
 }
 
@@ -73,7 +73,7 @@ function createAttributes(overrides?: Partial<AttributesFixture>): AttributesFix
         page: overrides?.page ?? editable<Big>(),
         pageSize: overrides?.pageSize ?? editable<Big>(),
         totalCount: overrides?.totalCount ?? editable<Big>(),
-        loadedRows: overrides?.loadedRows ?? editable<Big>()
+        itemCount: overrides?.itemCount ?? editable<Big>()
     };
 }
 
@@ -87,7 +87,7 @@ function createFeature(
         dynamicPage: attributes.page,
         dynamicPageSize: attributes.pageSize,
         totalCountValue: attributes.totalCount,
-        loadedRowsValue: attributes.loadedRows
+        dynamicItemCount: attributes.itemCount
     });
 
     const feature = new DynamicPaginationFeature(
@@ -97,7 +97,7 @@ function createFeature(
         atoms.dynamicPageSize,
         atoms.totalCount,
         atoms.currentPage,
-        atoms.loadedRows,
+        atoms.itemCount,
         gate,
         service
     );
@@ -171,9 +171,9 @@ describe("DynamicPaginationFeature", () => {
             expect(lastArgToNumber(attributes.page.setValue as jest.MockedFunction<any>)).toBe(4);
         });
 
-        it("syncs loadedRows to service immediately", () => {
-            runInAction(() => atoms.loadedRows.set(77));
-            expect(service.setLoadedRows).toHaveBeenCalledWith(77);
+        it("syncs itemCount to service immediately", () => {
+            runInAction(() => atoms.itemCount.set(77));
+            expect(service.setItemCount).toHaveBeenCalledWith(77);
         });
     });
 
@@ -210,14 +210,14 @@ describe("DynamicPaginationFeature", () => {
             expect(service.setTotalCount).not.toHaveBeenCalled();
         });
 
-        it("ignores negative loadedRows", () => {
-            runInAction(() => atoms.loadedRows.set(-1));
-            expect(service.setLoadedRows).not.toHaveBeenCalledWith(-1);
+        it("ignores negative itemCount", () => {
+            runInAction(() => atoms.itemCount.set(-1));
+            expect(service.setItemCount).not.toHaveBeenCalledWith(-1);
         });
     });
 
     describe("Configuration", () => {
-        it("skips page/pageSize sync when disabled, but still syncs totalCount/loadedRows", () => {
+        it("skips page/pageSize sync when disabled, but still syncs totalCount/itemCount", () => {
             service = createMockService();
             atoms = createAtoms();
             attributes = createAttributes();
@@ -236,7 +236,7 @@ describe("DynamicPaginationFeature", () => {
                 atoms.dynamicPage.set(2);
                 atoms.dynamicPageSize.set(25);
                 atoms.totalCount.set(300);
-                atoms.loadedRows.set(40);
+                atoms.itemCount.set(40);
             });
 
             jest.advanceTimersByTime(250);
@@ -246,7 +246,7 @@ describe("DynamicPaginationFeature", () => {
             expect(attributes.page.setValue).not.toHaveBeenCalled();
             expect(attributes.pageSize.setValue).not.toHaveBeenCalled();
             expect(service.setTotalCount).toHaveBeenCalledWith(300);
-            expect(service.setLoadedRows).toHaveBeenCalledWith(40);
+            expect(service.setItemCount).toHaveBeenCalledWith(40);
         });
     });
 
@@ -273,15 +273,15 @@ describe("DynamicPaginationFeature", () => {
                 dynamicPage: attributes.page,
                 dynamicPageSize: attributes.pageSize,
                 totalCountValue: attributes.totalCount,
-                loadedRowsValue: attributes.loadedRows
+                dynamicItemCount: attributes.itemCount
             });
 
             runInAction(() =>
                 gate.setProps({
                     dynamicPage: attributes.page,
                     dynamicPageSize: attributes.pageSize,
                     totalCountValue: attributes.totalCount,
-                    loadedRowsValue: attributes.loadedRows
+                    dynamicItemCount: attributes.itemCount
                 })
             );
 
@@ -627,10 +627,10 @@ describe("DynamicPaginationFeature", () => {
             expect(service.setTotalCount).toHaveBeenCalledWith(100);
         });
 
-        it("does not debounce loadedRows (immediate sync)", () => {
-            runInAction(() => atoms.loadedRows.set(50));
+        it("does not debounce itemCount (immediate sync)", () => {
+            runInAction(() => atoms.itemCount.set(50));
             // No timer advancement needed
-            expect(service.setLoadedRows).toHaveBeenCalledWith(50);
+            expect(service.setItemCount).toHaveBeenCalledWith(50);
         });
     });
 });
diff --git a/packages/shared/widget-plugin-grid/src/pagination/__tests__/PageControl.service.spec.ts b/packages/shared/widget-plugin-grid/src/pagination/__tests__/PageControl.service.spec.ts
@@ -9,7 +9,7 @@ type GateProps = {
     dynamicPage?: EditableValue<Big>;
     dynamicPageSize?: EditableValue<Big>;
     totalCountValue?: EditableValue<Big>;
-    loadedRowsValue?: EditableValue<Big>;
+    dynamicItemCount?: EditableValue<Big>;
 };
 
 function makeGate(props: Partial<GateProps> = {}): DerivedPropsGate<any> {
@@ -70,25 +70,25 @@ describe("PageControlService", () => {
         });
     });
 
-    describe("setLoadedRows", () => {
-        it("writes loadedRowsValue when attribute is mapped", () => {
+    describe("setItemCount", () => {
+        it("writes dynamicItemCount when attribute is mapped", () => {
             const attr = new EditableValueBuilder<Big>().build();
-            const service = new PageControlService(makeGate({ loadedRowsValue: attr }), setPageSize, setPage);
+            const service = new PageControlService(makeGate({ dynamicItemCount: attr }), setPageSize, setPage);
 
-            service.setLoadedRows(77);
+            service.setItemCount(77);
             expect(argToNumber(attr.setValue as jest.MockedFunction<any>)).toBe(77);
         });
 
-        it("does not throw when loadedRowsValue attribute is not mapped", () => {
+        it("does not throw when dynamicItemCount attribute is not mapped", () => {
             const service = new PageControlService(makeGate(), setPageSize, setPage);
-            expect(() => service.setLoadedRows(10)).not.toThrow();
+            expect(() => service.setItemCount(10)).not.toThrow();
         });
 
-        it("skips write when loadedRowsValue attribute is readOnly", () => {
+        it("skips write when dynamicItemCount attribute is readOnly", () => {
             const attr = new EditableValueBuilder<Big>().isReadOnly().build();
-            const service = new PageControlService(makeGate({ loadedRowsValue: attr }), setPageSize, setPage);
+            const service = new PageControlService(makeGate({ dynamicItemCount: attr }), setPageSize, setPage);
 
-            service.setLoadedRows(10);
+            service.setItemCount(10);
             expect(attr.setValue).not.toHaveBeenCalled();
         });
     });

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ export interface GridPageControl {`
`2`	`2`	`setPage(page: number): void;`
`3`	`3`	`setPageSize(pageSize: number): void;`
`4`	`4`	`setTotalCount(totalCount: number): void;`
`5`		`- setLoadedRows?(loadedRows: number): void;`
	`5`	`+ setItemCount?(itemCount: number): void;`
`6`	`6`	`}`