fix: reverts private widgets feature

app/client/src/entities/DataTree/dataTreeFactory.ts

@@ -39,11 +39,6 @@ export enum EvaluationSubstitutionType {
   SMART_SUBSTITUTE = "SMART_SUBSTITUTE",
 }
 
-// Private widgets do not get evaluated
-// For example, for widget Button1 in a List widget List1, List1.template.Button1.text gets evaluated,
-// so there is no need to evaluate Button1.text
-export type PrivateWidgets = Record<string, true>;
-
 export interface DataTreeAction
   extends Omit<ActionDataWithMeta, "data" | "config"> {
   data: ActionResponse["body"];
@@ -86,7 +81,6 @@ export interface DataTreeWidget extends WidgetProps {
   validationPaths: Record<string, ValidationConfig>;
   ENTITY_TYPE: ENTITY_TYPE.WIDGET;
   logBlackList: Record<string, true>;
-  privateWidgets: PrivateWidgets;
 }
 
 export interface DataTreeAppsmith extends Omit<AppDataState, "store"> {

app/client/src/entities/DataTree/dataTreeWidget.test.ts

@@ -251,7 +251,6 @@ describe("generateDataTreeWidget", () => {
       defaultProps: {
         text: "defaultText",
       },
-      privateWidgets: {},
     };
 
     const result = generateDataTreeWidget(widget, widgetMetaProps);

app/client/src/entities/DataTree/dataTreeWidget.ts

@@ -78,8 +78,5 @@ export const generateDataTreeWidget = (
     triggerPaths,
     validationPaths,
     ENTITY_TYPE: ENTITY_TYPE.WIDGET,
-    privateWidgets: {
-      ...widget.privateWidgets,
-    },
   };
 };

app/client/src/sagas/PostEvaluationSagas.ts

@@ -3,7 +3,6 @@ import { DataTree } from "entities/DataTree/dataTreeFactory";
 import {
   DataTreeDiff,
   DataTreeDiffEvent,
-  getDataTreeWithoutPrivateWidgets,
   getEntityNameAndPropertyPath,
   isAction,
   isJSAction,
@@ -368,13 +367,7 @@ export function* updateTernDefinitions(
   }
   if (shouldUpdate) {
     const start = performance.now();
-    // remove private widgets from dataTree used for autocompletion
-    const treeWithoutPrivateWidgets = getDataTreeWithoutPrivateWidgets(
-      dataTree,
-    );
-    const { def, entityInfo } = dataTreeTypeDefCreator(
-      treeWithoutPrivateWidgets,
-    );
+    const { def, entityInfo } = dataTreeTypeDefCreator(dataTree);
     TernServer.updateDef("DATA_TREE", def, entityInfo);
     const end = performance.now();
     log.debug("Tern", { updates });

app/client/src/selectors/editorSelectors.tsx

@@ -402,7 +402,6 @@ const createLoadingWidget = (
     validationPaths: {},
     logBlackList: {},
     isLoading: true,
-    privateWidgets: {},
   };
 };
 

app/client/src/utils/DSLMigrations.ts

@@ -45,7 +45,6 @@ import { migrateCheckboxGroupWidgetInlineProperty } from "./migrations/CheckboxG
 import { migrateMapWidgetIsClickedMarkerCentered } from "./migrations/MapWidget";
 import { DSLWidget } from "widgets/constants";
 import { migrateRecaptchaType } from "./migrations/ButtonWidgetMigrations";
-import { PrivateWidgets } from "entities/DataTree/dataTreeFactory";
 
 /**
  * adds logBlackList key for all list widget children
@@ -91,12 +90,12 @@ const addLogBlackListToAllListWidgetChildren = (
  * @param currentDSL
  * @returns
  */
-const addPrivateWidgetsToAllListWidgets = (
+export const addPrivateWidgetsToAllListWidgets = (
   currentDSL: ContainerWidgetProps<WidgetProps>,
 ) => {
   currentDSL.children = currentDSL.children?.map((child: WidgetProps) => {
     if (child.type === "LIST_WIDGET") {
-      const privateWidgets: PrivateWidgets = {};
+      const privateWidgets: Record<string, true> = {};
       Object.keys(child.template).forEach((entityName) => {
         privateWidgets[entityName] = true;
       });

app/client/src/utils/DSLMigrationsUtils.test.ts

@@ -1,12 +1,11 @@
-import { transformDSL } from "./DSLMigrations";
-import { LATEST_PAGE_VERSION, RenderModes } from "constants/WidgetConstants";
+import { addPrivateWidgetsToAllListWidgets } from "./DSLMigrations";
+import { RenderModes } from "constants/WidgetConstants";
 import { ContainerWidgetProps } from "widgets/ContainerWidget/widget";
 import { WidgetProps } from "widgets/BaseWidget";
 
 describe("correctly migrate dsl", () => {
   it("AddsPrivateWidgetsToAllListWidgets", () => {
     const currentVersion = 49;
-    const nextVersion = LATEST_PAGE_VERSION;
     const currentDSL: ContainerWidgetProps<WidgetProps> = {
       backgroundColor: "none",
       bottomRow: 740,
@@ -586,7 +585,7 @@ describe("correctly migrate dsl", () => {
       backgroundColor: "none",
       bottomRow: 740,
       canExtend: true,
-      version: nextVersion,
+      version: currentVersion,
       children: [
         {
           widgetName: "Input1",
@@ -1156,14 +1155,13 @@ describe("correctly migrate dsl", () => {
       snapRows: 125,
       topRow: 0,
       type: "CANVAS_WIDGET",
-      version: nextVersion,
       widgetId: "0",
       widgetName: "MainContainer",
       renderMode: RenderModes.CANVAS,
       isLoading: false,
     };
 
-    const actualNextDsl = transformDSL(currentDSL, false);
+    const actualNextDsl = addPrivateWidgetsToAllListWidgets(currentDSL);
 
     expect(actualNextDsl).toEqual(expectedNextDSL);
   });

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

@@ -12,7 +12,6 @@ import {
   omit,
   floor,
   isEmpty,
-  isEqual,
 } from "lodash";
 import memoizeOne from "memoize-one";
 import shallowEqual from "shallowequal";
@@ -38,15 +37,8 @@ import derivedProperties from "./parseDerivedProperties";
 import { DSLWidget } from "widgets/constants";
 import { entityDefinitions } from "utils/autocomplete/EntityDefinitions";
 import { escapeSpecialChars } from "../../WidgetUtils";
-import { PrivateWidgets } from "entities/DataTree/dataTreeFactory";
 
 const LIST_WIDGEY_PAGINATION_HEIGHT = 36;
-
-/* in the List Widget, "children.0.children.0.children.0.children" is the path to the list of all
-  widgets present in the List Widget
-*/
-const PATH_TO_ALL_WIDGETS_IN_LIST_WIDGET =
-  "children.0.children.0.children.0.children";
 class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
   state = {
     page: 1,
@@ -81,11 +73,7 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
     this.generateChildrenDefaultPropertiesMap(this.props);
     this.generateChildrenMetaPropertiesMap(this.props);
     this.generateChildrenEntityDefinitions(this.props);
-
-    // add privateWidgets to ListWidget
-    this.addPrivateWidgetsForChildren(this.props);
   }
-
   /**
    * generates the children entity definitions for children
    *
@@ -124,21 +112,6 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
     }
   }
 
-  // updates the "privateWidgets" field of the List Widget
-  addPrivateWidgetsForChildren(props: ListWidgetProps<WidgetProps>) {
-    const privateWidgets: PrivateWidgets = {};
-    const listWidgetChildren: WidgetProps[] = get(
-      props,
-      PATH_TO_ALL_WIDGETS_IN_LIST_WIDGET,
-    );
-    if (!listWidgetChildren) return;
-    listWidgetChildren.map((child) => {
-      privateWidgets[child.widgetName] = true;
-    });
-
-    super.updateWidgetProperty("privateWidgets", privateWidgets);
-  }
-
   generateChildrenDefaultPropertiesMap = (
     props: ListWidgetProps<WidgetProps>,
   ) => {
@@ -200,16 +173,6 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
   };
 
   componentDidUpdate(prevProps: ListWidgetProps<WidgetProps>) {
-    const currentListWidgetChildren: WidgetProps[] = get(
-      this.props,
-      PATH_TO_ALL_WIDGETS_IN_LIST_WIDGET,
-    );
-
-    const previousListWidgetChildren: WidgetProps[] = get(
-      prevProps,
-      PATH_TO_ALL_WIDGETS_IN_LIST_WIDGET,
-    );
-
     if (
       xor(
         Object.keys(get(prevProps, "template", {})),
@@ -269,11 +232,6 @@ class ListWidget extends BaseWidget<ListWidgetProps<WidgetProps>, WidgetState> {
         },
       );
     }
-
-    // Update privateWidget field if there is a change in the List widget children
-    if (!isEqual(currentListWidgetChildren, previousListWidgetChildren)) {
-      this.addPrivateWidgetsForChildren(this.props);
-    }
   }
 
   static getDefaultPropertiesMap(): Record<string, string> {

app/client/src/workers/DataTreeEvaluator.ts

@@ -22,7 +22,6 @@ import {
   DataTreeWidget,
   ENTITY_TYPE,
   EvaluationSubstitutionType,
-  PrivateWidgets,
 } from "entities/DataTree/dataTreeFactory";
 import {
   addDependantsOfNestedPropertyPaths,
@@ -48,7 +47,6 @@ import {
   getParams,
   updateJSCollectionInDataTree,
   removeFunctionsAndVariableJSCollection,
-  isPrivateEntityPath,
 } from "workers/evaluationUtils";
 import _ from "lodash";
 import { applyChange, Diff, diff } from "deep-diff";
@@ -85,7 +83,6 @@ export default class DataTreeEvaluator {
   widgetConfigMap: WidgetTypeConfigMap = {};
   evalTree: DataTree = {};
   allKeys: Record<string, true> = {};
-  privateWidgets: PrivateWidgets = {};
   oldUnEvalTree: DataTree = {};
   errors: EvalError[] = [];
   resolvedFunctions: Record<string, any> = {};
@@ -486,17 +483,6 @@ export default class DataTreeEvaluator {
     return dependencyMap;
   }
 
-  getPrivateWidgets(dataTree: DataTree): PrivateWidgets {
-    let privateWidgets: PrivateWidgets = {};
-    Object.keys(dataTree).forEach((entityName) => {
-      const entity = dataTree[entityName];
-      if (isWidget(entity) && !_.isEmpty(entity.privateWidgets)) {
-        privateWidgets = { ...privateWidgets, ...entity.privateWidgets };
-      }
-    });
-    return privateWidgets;
-  }
-
   listEntityDependencies(
     entity: DataTreeWidget | DataTreeAction | DataTreeJSAction,
     entityName: string,
@@ -582,13 +568,9 @@ export default class DataTreeEvaluator {
     sortedDependencies: Array<string>,
   ): DataTree {
     const tree = _.cloneDeep(oldUnevalTree);
-    this.privateWidgets = this.getPrivateWidgets(oldUnevalTree);
     try {
       return sortedDependencies.reduce(
         (currentTree: DataTree, fullPropertyPath: string) => {
-          // do not evaluate private entities
-          if (isPrivateEntityPath(this.privateWidgets, fullPropertyPath))
-            return currentTree;
           const { entityName, propertyPath } = getEntityNameAndPropertyPath(
             fullPropertyPath,
           );

app/client/src/workers/evaluation.test.ts

@@ -225,7 +225,6 @@ const BASE_WIDGET: DataTreeWidget = {
   triggerPaths: {},
   validationPaths: {},
   ENTITY_TYPE: ENTITY_TYPE.WIDGET,
-  privateWidgets: {},
 };
 
 const BASE_ACTION: DataTreeAction = {