refactor derived properties

app/client/src/modules/ui-builder/ui/wds/WDSTableWidget/widget/index.tsx

@@ -43,7 +43,6 @@ import {
   PaginationDirection,
   TABLE_COLUMN_ORDER_KEY,
 } from "../constants";
-import derivedProperties from "./parseDerivedProperties";
 import {
   deleteLocalTableColumnOrderByWidgetId,
   generateLocalNewColumnOrderFromStickyValue,
@@ -61,7 +60,7 @@ import {
 } from "./utilities";
 import type { BatchPropertyUpdatePayload } from "actions/controlActions";
 import equal from "fast-deep-equal/es6";
-import { sanitizeKey } from "widgets/WidgetUtils";
+import { parseDerivedProperties, sanitizeKey } from "widgets/WidgetUtils";
 import {
   PlainTextCell,
   URLCell,
@@ -82,6 +81,7 @@ import * as config from "../config";
 import { getAnvilWidgetDOMId } from "layoutSystems/common/utils/LayoutElementPositionsObserver/utils";
 import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
 import { klonaRegularWithTelemetry } from "utils/helpers";
+import derivedPropertyFns from "./derived";
 
 const ReactTableComponent = lazy(async () =>
   retryPromise(async () => import("../component")),
@@ -194,20 +194,22 @@ export class WDSTableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
   }
 
   static getDerivedPropertiesMap() {
+    const parsedDerivedProperties = parseDerivedProperties(derivedPropertyFns);
+
     return {
-      selectedRow: `{{(()=>{${derivedProperties.getSelectedRow}})()}}`,
-      triggeredRow: `{{(()=>{${derivedProperties.getTriggeredRow}})()}}`,
-      selectedRows: `{{(()=>{${derivedProperties.getSelectedRows}})()}}`,
+      selectedRow: `{{(()=>{${parsedDerivedProperties.getSelectedRow}})()}}`,
+      triggeredRow: `{{(()=>{${parsedDerivedProperties.getTriggeredRow}})()}}`,
+      selectedRows: `{{(()=>{${parsedDerivedProperties.getSelectedRows}})()}}`,
       triggerRowSelection: "{{!!this.onRowSelected}}",
-      processedTableData: `{{(()=>{${derivedProperties.getProcessedTableData}})()}}`,
-      orderedTableColumns: `{{(()=>{${derivedProperties.getOrderedTableColumns}})()}}`,
-      filteredTableData: `{{(()=>{ ${derivedProperties.getFilteredTableData}})()}}`,
-      updatedRows: `{{(()=>{ ${derivedProperties.getUpdatedRows}})()}}`,
-      updatedRowIndices: `{{(()=>{ ${derivedProperties.getUpdatedRowIndices}})()}}`,
-      updatedRow: `{{(()=>{ ${derivedProperties.getUpdatedRow}})()}}`,
-      pageOffset: `{{(()=>{${derivedProperties.getPageOffset}})()}}`,
-      isEditableCellsValid: `{{(()=>{ ${derivedProperties.getEditableCellValidity}})()}}`,
-      tableHeaders: `{{(()=>{${derivedProperties.getTableHeaders}})()}}`,
+      processedTableData: `{{(()=>{${parsedDerivedProperties.getProcessedTableData}})()}}`,
+      orderedTableColumns: `{{(()=>{${parsedDerivedProperties.getOrderedTableColumns}})()}}`,
+      filteredTableData: `{{(()=>{ ${parsedDerivedProperties.getFilteredTableData}})()}}`,
+      updatedRows: `{{(()=>{ ${parsedDerivedProperties.getUpdatedRows}})()}}`,
+      updatedRowIndices: `{{(()=>{ ${parsedDerivedProperties.getUpdatedRowIndices}})()}}`,
+      updatedRow: `{{(()=>{ ${parsedDerivedProperties.getUpdatedRow}})()}}`,
+      pageOffset: `{{(()=>{${parsedDerivedProperties.getPageOffset}})()}}`,
+      isEditableCellsValid: `{{(()=>{ ${parsedDerivedProperties.getEditableCellValidity}})()}}`,
+      tableHeaders: `{{(()=>{${parsedDerivedProperties.getTableHeaders}})()}}`,
     };
   }
 

app/client/src/widgets/DatePickerWidget2/widget/index.tsx

@@ -20,7 +20,8 @@ import {
 import type { DatePickerType } from "../constants";
 import { TimePrecision } from "../constants";
 import { DateFormatOptions } from "./constants";
-import derivedProperties from "./parseDerivedProperties";
+import derivedPropertyFns from "./derived";
+import { parseDerivedProperties } from "widgets/WidgetUtils";
 import { isAutoLayout } from "layoutSystems/autolayout/utils/flexWidgetUtils";
 import type {
   AnvilConfig,
@@ -632,8 +633,10 @@ class DatePickerWidget extends BaseWidget<DatePickerWidget2Props, WidgetState> {
   }
 
   static getDerivedPropertiesMap(): DerivedPropertiesMap {
+    const parsedDerivedProperties = parseDerivedProperties(derivedPropertyFns);
+
     return {
-      isValid: `{{(()=>{${derivedProperties.isValidDate}})()}}`,
+      isValid: `{{(()=>{${parsedDerivedProperties.isValidDate}})()}}`,
       selectedDate: `{{ this.value ? moment(this.value).toISOString() : "" }}`,
       formattedDate: `{{ this.value ? moment(this.value).format(this.dateFormat) : "" }}`,
     };

app/client/src/widgets/ListWidget/widget/index.tsx

@@ -67,7 +67,8 @@ import ListPagination, {
   ServerSideListPagination,
 } from "../component/ListPagination";
 import IconSVG from "../icon.svg";
-import derivedProperties from "./parseDerivedProperties";
+import derivedPropertyFns from "./derived";
+import { parseDerivedProperties } from "widgets/WidgetUtils";
 import {
   PropertyPaneContentConfig,
   PropertyPaneStyleConfig,
@@ -606,11 +607,13 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
   }
 
   static getDerivedPropertiesMap() {
+    const parsedDerivedProperties = parseDerivedProperties(derivedPropertyFns);
+
     return {
-      pageSize: `{{(()=>{${derivedProperties.getPageSize}})()}}`,
-      selectedItem: `{{(()=>{${derivedProperties.getSelectedItem}})()}}`,
-      items: `{{(() => {${derivedProperties.getItems}})()}}`,
-      childAutoComplete: `{{(() => {${derivedProperties.getChildAutoComplete}})()}}`,
+      pageSize: `{{(()=>{${parsedDerivedProperties.getPageSize}})()}}`,
+      selectedItem: `{{(()=>{${parsedDerivedProperties.getSelectedItem}})()}}`,
+      items: `{{(() => {${parsedDerivedProperties.getItems}})()}}`,
+      childAutoComplete: `{{(() => {${parsedDerivedProperties.getChildAutoComplete}})()}}`,
     };
   }