fixes

Author: vasilev-alex

packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts

@@ -242,7 +242,17 @@ export class CubeEvaluator extends CubeSymbols {
           const filteredHierarchies = hierarchies
             .filter(it => includedHierarchyNames.includes(it.name))
             .map(it => {
-              const levels = it.levels.filter(level => includedMemberPaths.includes(level));
+              const levels = it.levels.filter(level => {
+                const member = cube.includedMembers.find(m => m.memberPath === level);
+                if (member && member.type !== 'dimensions') {
+                  const memberName = level.split('.')[1] || level;
+                  errorReporter.error(`Only dimensions can be part of a hierarchy. Please remove the '${memberName}' member from the '${it.name}' hierarchy.`);
+                } else if (member) {
+                  return includedMemberPaths.includes(level);
+                }
+
+                return null;
+              }).filter(Boolean);
 
               return {
                 ...it,

packages/cubejs-schema-compiler/src/compiler/CubeSymbols.js

@@ -324,7 +324,6 @@ export class CubeSymbols {
           errorReporter.error(`Paths aren't allowed in cube excludes but '${exclude}' provided as exclude member`);
         }
 
-        // const resolvedMember = this.symbols[cubeReference]?.cubeObj()?.[type]?.[exclude];
         const resolvedMember = this.getResolvedMember(type, cubeReference, exclude);
         return resolvedMember ? {
           member: `${fullPath}.${exclude}`

packages/cubejs-schema-compiler/src/compiler/CubeToMetaTransformer.js

@@ -108,6 +108,7 @@ export class CubeToMetaTransformer {
         )(cube.segments || {}),
         hierarchies: (cube.hierarchies || []).map((it) => ({
           ...it,
+          public: it.public ?? true,
           name: `${cube.name}.${it.name}`,
         })),
         folders: (cube.folders || []).map((it) => ({

packages/cubejs-schema-compiler/test/unit/fixtures/hierarchy-with-measure.yml

@@ -0,0 +1,35 @@
+cubes:
+  - name: orders
+    sql: SELECT * FROM orders
+    measures:
+      - name: count
+        sql: id
+        type: count
+    dimensions:
+      - name: id
+        sql: id
+        type: number
+        primary_key: true
+
+      - name: status
+        sql: status
+        type: string
+
+      - name: city
+        sql: city
+        type: string
+    hierarchies:
+      - name: correct_hierarchy
+        levels:
+          - status
+          - city
+      - name: orders_hierarchy
+        levels:
+          - "{CUBE}.status"
+          - count
+
+views:
+  - name: test_view
+    cubes:
+      - join_path: orders
+        includes: "*"

packages/cubejs-schema-compiler/test/unit/hierarchies.test.ts

@@ -4,7 +4,7 @@ import path from 'path';
 import { prepareYamlCompiler } from './PrepareCompiler';
 
 describe('Cube hierarchies', () => {
-  it('hierarchies defined on a view only', async () => {
+  it('base cases', async () => {
     const modelContent = fs.readFileSync(
       path.join(process.cwd(), '/test/unit/fixtures/hierarchies2.yml'),
       'utf8'
@@ -21,13 +21,15 @@ describe('Cube hierarchies', () => {
     expect(ordersView.config.hierarchies).toEqual([
       {
         name: 'orders_users_view.orders_hierarchy',
+        public: true,
         levels: [
           'orders_users_view.status',
           'orders_users_view.number'
         ],
       },
       {
         name: 'orders_users_view.some_other_hierarchy',
+        public: true,
         title: 'Some other hierarchy',
         levels: ['orders_users_view.state']
       }
@@ -48,80 +50,14 @@ describe('Cube hierarchies', () => {
     );
     expect(allHierarchyView.config.hierarchies.length).toBe(3);
   });
-  //     const { compiler, metaTransformer } = prepareYamlCompiler(`
-  // views:
-  //   - name: orders_view
-  //     cubes:
-  //       - join_path: orders
-  //         prefix: true
-  //         includes: "*"
-  //       - join_path: users
-  //         prefix: false
-  //         includes:
-  //           - count
-  //           - name: gender
-  //             alias: hello_world
-  //     hierarchies:
-  //     - name: hello
-  //       levels:
-  //         - users.count
-  //         - users.gender
-  //         - orders.count
-  //         - orders.status
-  // cubes:
-  //   - name: orders
-  //     sql: SELECT * FROM orders
-  //     measures:
-  //       - name: count
-  //         type: count
-  //     dimensions:
-  //       - name: id
-  //         sql: id
-  //         type: number
-  //         primary_key: true
 
-  //       - name: status
-  //         sql: status
-  //         type: string
-
-  //   - name: users
-  //     sql: SELECT * FROM users
-  //     measures:
-  //       - name: count
-  //         type: count
-  //     dimensions:
-  //       - name: id
-  //         sql: id
-  //         type: number
-  //         primary_key: true
-
-  //       - name: gender
-  //         sql: gender
-  //         type: string
-
-  //       - name: city
-  //         sql: city
-  //         type: string
-
-  //       - name: status
-  //         sql: status
-  //         type: string
-  //       `);
-
-  //     await compiler.compile();
-
-  //     const ordersView = metaTransformer.cubes.find(it => it.config.name === 'orders_view');
+  it(('hierarchy with measure'), async () => {
+    const modelContent = fs.readFileSync(
+      path.join(process.cwd(), '/test/unit/fixtures/hierarchy-with-measure.yml'),
+      'utf8'
+    );
+    const { compiler } = prepareYamlCompiler(modelContent);
 
-  //     expect(ordersView.config.hierarchies).toEqual([
-  //       {
-  //         name: 'hello',
-  //         levels: [
-  //           'orders_view.count',
-  //           'orders_view.hello_world',
-  //           'orders_view.orders_count',
-  //           'orders_view.orders_status'
-  //         ]
-  //       },
-  //     ]);
-  //   });
+    await expect(compiler.compile()).rejects.toThrow('Only dimensions can be part of a hierarchy. Please remove the \'count\' member from the \'orders_hierarchy\' hierarchy.');
+  });
 });

packages/cubejs-server-core/src/core/CompilerApi.js

@@ -463,6 +463,10 @@ export class CompilerApi {
         for (const segment of cube.config.segments) {
           isMemberVisibleInContext[segment.name] = computeMemberVisibility(segment);
         }
+
+        for (const hierarchy of cube.config.hierarchies) {
+          isMemberVisibleInContext[hierarchy.name] = computeMemberVisibility(hierarchy);
+        }
       }
     }
 
@@ -485,6 +489,7 @@ export class CompilerApi {
           measures: cube.config.measures?.map(visibilityPatcherForCube(cube)),
           dimensions: cube.config.dimensions?.map(visibilityPatcherForCube(cube)),
           segments: cube.config.segments?.map(visibilityPatcherForCube(cube)),
+          hierarchies: cube.config.hierarchies?.map(visibilityPatcherForCube(cube)),
         },
       }));
   }