Revert "Temporary marked folder members as strings"

This reverts commit f7101f3.

Author: KSDaemon

packages/cubejs-playground/src/QueryBuilderV2/components/SidePanelCubeItem.tsx

@@ -147,9 +147,7 @@ export function SidePanelCubeItem(props: CubeListItemProps) {
   const [openHierarchies, setOpenHierarchies] = useState<string[]>([]);
 
   const folderMembers = folders.reduce((acc, folder) => {
-    // FIXME: Temporary marked folder members as strings
-    // It should be aware of recursive folders structure
-    return acc.concat(folder.members as string[]);
+    return acc.concat(folder.members);
   }, [] as string[]);
   const hierarchyMembers = hierarchies.reduce((acc, hierarchy) => {
     return acc.concat(hierarchy.levels);

packages/cubejs-playground/src/QueryBuilderV2/hooks/query-builder.ts

@@ -1286,32 +1286,30 @@ export function useQueryBuilder(props: UseQueryBuilderProps) {
 
           const folderStats = stats.folders[folderName];
 
-          // FIXME: Temporary marked folder members as strings
-          // It should be aware of recursive folders structure
           folder.members.forEach((memberName) => {
-            if (stats.dimensions.includes(memberName as string)) {
-              if (!folderStats.dimensions.includes(memberName as string)) {
-                folderStats.dimensions.push(memberName as string);
+            if (stats.dimensions.includes(memberName)) {
+              if (!folderStats.dimensions.includes(memberName)) {
+                folderStats.dimensions.push(memberName);
               }
-            } else if (stats.measures.includes(memberName as string)) {
-              if (!folderStats.measures.includes(memberName as string)) {
-                folderStats.measures.push(memberName as string);
+            } else if (stats.measures.includes(memberName)) {
+              if (!folderStats.measures.includes(memberName)) {
+                folderStats.measures.push(memberName);
               }
-            } else if (stats.segments.includes(memberName as string)) {
-              if (!folderStats.segments.includes(memberName as string)) {
-                folderStats.segments.push(memberName as string);
+            } else if (stats.segments.includes(memberName)) {
+              if (!folderStats.segments.includes(memberName)) {
+                folderStats.segments.push(memberName);
               }
-            } else if (stats.hierarchies[memberName as string]) {
+            } else if (stats.hierarchies[memberName]) {
               // add all selected dimensions from the hierarchy
-              stats.hierarchies[memberName as string].forEach((levelMemberName) => {
+              stats.hierarchies[memberName].forEach((levelMemberName) => {
                 if (!folderStats.dimensions.includes(levelMemberName)) {
                   folderStats.dimensions.push(levelMemberName);
                 }
               });
             }
 
-            if (grouping.includes(memberName as string)) {
-              folderStats.grouping.push(memberName as string);
+            if (grouping.includes(memberName)) {
+              folderStats.grouping.push(memberName);
             }
           });
         });