Skip to content

Commit

Permalink
update (#117)
Browse files Browse the repository at this point in the history
  • Loading branch information
CamilleBlanco authored Aug 29, 2023
1 parent c9a366f commit 443eb5c
Show file tree
Hide file tree
Showing 21 changed files with 219 additions and 43 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<properties>
<jdk.version>11</jdk.version>

<activepivot.version>6.0.1</activepivot.version>
<activeui.version>5.0.20</activeui.version>
<activepivot.version>6.0.6</activepivot.version>
<activeui.version>5.1.5</activeui.version>

<tomcat.version>9.0.31</tomcat.version>
<lombok.version>1.18.18</lombok.version>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/static/activeui/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ var baseUrl = window.location.href.split('/ui')[0];

window.env = {
contentServerUrl: baseUrl,
contentServerVersion: "6.0.0-SNAPSHOT",
contentServerVersion: "6.0.6",
// WARNING: Changing the keys of activePivotServers will break previously saved widgets and dashboards.
// If you must do it, then you also need to update each one's serverKey attribute on your content server.
activePivotServers: {
"MAC": {
url: baseUrl,
version: "6.0.0-SNAPSHOT",
version: "6.0.6",
},
},
};
66 changes: 58 additions & 8 deletions src/main/resources/ui/dashboards/content/aggregate_providers.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@
"mdx" : "SELECT NON EMPTY Order(DrilldownLevel([Owners].[Owner].[ALL].[AllMember]), [Measures].[DirectMemory.SUM], DESC) ON ROWS, NON EMPTY {[Measures].[DirectMemory.SUM], [Measures].[DirectMemory.Ratio]} ON COLUMNS FROM [MemoryCube] CELL PROPERTIES VALUE, FORMATTED_VALUE, BACK_COLOR, FORE_COLOR, FONT_FLAGS",
"updateMode" : "once"
},
"filters" : [ "[Owners].[Owner Type].[ALL].[AllMember].[Cube]" ],
"filters" : [ {
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type",
"members" : [ [ "AllMember", "Cube" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"mapping" : {
"rows" : [ "[Owners].[Owner].[Owner]" ],
Expand Down Expand Up @@ -71,7 +76,12 @@
"mdx" : "SELECT NON EMPTY [Measures].[DirectMemory.SUM] ON COLUMNS, NON EMPTY [Owners].[Owner].[Owner].Members ON ROWS FROM [MemoryCube]",
"updateMode" : "once"
},
"filters" : [ "[Owners].[Owner Type].[ALL].[AllMember].[Cube]" ],
"filters" : [ {
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type",
"members" : [ [ "AllMember", "Cube" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"serverKey" : "MAC",
"widgetKey" : "plotly-line-chart"
Expand Down Expand Up @@ -118,7 +128,12 @@
"mdx" : "SELECT NON EMPTY Order(Crossjoin(Hierarchize(DrilldownLevel([Owners].[Owner].[ALL].[AllMember])), Hierarchize(DrilldownLevel([Aggregate Provider].[ProviderCategory].[ALL].[AllMember])), Hierarchize(DrilldownLevel([Aggregate Provider].[ProviderType].[ALL].[AllMember])), Hierarchize(DrilldownLevel([Components].[Component].[ALL].[AllMember]))), [Measures].[DirectMemory.SUM], DESC) ON ROWS, NON EMPTY {[Measures].[DirectMemory.SUM], [Measures].[DirectMemory.Ratio]} ON COLUMNS FROM [MemoryCube] CELL PROPERTIES VALUE, FORMATTED_VALUE, BACK_COLOR, FORE_COLOR, FONT_FLAGS",
"updateMode" : "once"
},
"filters" : [ "Crossjoin([Owners].[Owner Type].[ALL].[AllMember].[Cube], Except([Aggregate Provider].[ProviderCategory].[ProviderCategory].Members, [Aggregate Provider].[ProviderCategory].[ALL].[AllMember].[N/A]))" ],
"filters" : [ {
"type" : "custom",
"mdx" : "Crossjoin([Owners].[Owner Type].[ALL].[AllMember].[Cube], Except([Aggregate Provider].[ProviderCategory].[ProviderCategory].Members, [Aggregate Provider].[ProviderCategory].[ALL].[AllMember].[N/A]))",
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type"
} ],
"queryContext" : [ ],
"mapping" : {
"rows" : [ "[Owners].[Owner].[Owner]", "[Aggregate Provider].[ProviderCategory].[ProviderCategory]", "[Aggregate Provider].[ProviderType].[ProviderType]", "[Components].[Component].[Component]" ],
Expand Down Expand Up @@ -157,7 +172,12 @@
"mdx" : "SELECT NON EMPTY Crossjoin([Owners].[Owner].[Owner].Members, [Aggregate Provider].[ProviderType].[ProviderType].Members, [Components].[Component].[Component].Members) ON ROWS, NON EMPTY [Measures].[DirectMemory.SUM] ON COLUMNS FROM [MemoryCube]",
"updateMode" : "once"
},
"filters" : [ "Crossjoin([Owners].[Owner Type].[ALL].[AllMember].[Cube], Except([Aggregate Provider].[ProviderCategory].[ProviderCategory].Members, [Aggregate Provider].[ProviderCategory].[ALL].[AllMember].[N/A]))" ],
"filters" : [ {
"type" : "custom",
"mdx" : "Crossjoin([Owners].[Owner Type].[ALL].[AllMember].[Cube], Except([Aggregate Provider].[ProviderCategory].[ProviderCategory].Members, [Aggregate Provider].[ProviderCategory].[ALL].[AllMember].[N/A]))",
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type"
} ],
"queryContext" : [ ],
"serverKey" : "MAC",
"widgetKey" : "plotly-tree-map"
Expand Down Expand Up @@ -204,7 +224,17 @@
"mdx" : "SELECT NON EMPTY Order(Crossjoin(Hierarchize(DrilldownLevel([Owners].[Owner].[ALL].[AllMember])), Hierarchize(Except(DrilldownLevel([Aggregate Provider].[ProviderCategory].[ALL].[AllMember]), [Aggregate Provider].[ProviderCategory].[ALL].[AllMember].[N/A])), Hierarchize(DrilldownLevel([Aggregate Provider].[ProviderType].[ALL].[AllMember])), Hierarchize(DrilldownLevel([Fields].[Field].[ALL].[AllMember]))), [Measures].[DirectMemory.SUM], DESC) ON ROWS, NON EMPTY {[Measures].[DirectMemory.SUM], [Measures].[DirectMemory.Ratio]} ON COLUMNS FROM [MemoryCube] CELL PROPERTIES VALUE, FORMATTED_VALUE, BACK_COLOR, FORE_COLOR, FONT_FLAGS",
"updateMode" : "once"
},
"filters" : [ "[Owners].[Owner Type].[ALL].[AllMember].[Cube]", "[Components].[Component].[ALL].[AllMember].[AGGREGATE_STORE]" ],
"filters" : [ {
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type",
"members" : [ [ "AllMember", "Cube" ] ],
"type" : "members"
}, {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "AGGREGATE_STORE" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"mapping" : {
"rows" : [ "[Owners].[Owner].[Owner]", "[Aggregate Provider].[ProviderCategory].[ProviderCategory]", "[Aggregate Provider].[ProviderType].[ProviderType]", "[Fields].[Field].[Field]" ],
Expand Down Expand Up @@ -242,7 +272,17 @@
"mdx" : "SELECT NON EMPTY [Measures].[DirectMemory.SUM] ON COLUMNS, NON EMPTY Generate(TopCount([Owners].[Owner].[Owner].Members, 6, [Measures].[DirectMemory.SUM]), TopPercent(Crossjoin([Fields].[Field].[Field].Members, [Aggregate Provider].[ProviderType].[ProviderType].Members, [Owners].[Owner].CurrentMember), 95, [Measures].[DirectMemory.SUM])) ON ROWS FROM [MemoryCube]",
"updateMode" : "once"
},
"filters" : [ "[Owners].[Owner Type].[ALL].[AllMember].[Cube]", "[Components].[Component].[ALL].[AllMember].[AGGREGATE_STORE]" ],
"filters" : [ {
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type",
"members" : [ [ "AllMember", "Cube" ] ],
"type" : "members"
}, {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "AGGREGATE_STORE" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"serverKey" : "MAC",
"widgetKey" : "plotly-tree-map"
Expand Down Expand Up @@ -289,7 +329,12 @@
"mdx" : "SELECT NON EMPTY Order(Crossjoin(Hierarchize(DrilldownLevel([Owners].[Owner].[ALL].[AllMember])), Hierarchize(DrilldownLevel([Fields].[Field].[ALL].[AllMember]))), [Measures].[DirectMemory.SUM], DESC) ON ROWS, NON EMPTY {[Measures].[DirectMemory.SUM], [Measures].[DirectMemory.Ratio]} ON COLUMNS FROM [MemoryCube] CELL PROPERTIES VALUE, FORMATTED_VALUE, BACK_COLOR, FORE_COLOR, FONT_FLAGS",
"updateMode" : "once"
},
"filters" : [ "[Components].[Component].[ALL].[AllMember].[LEVEL]" ],
"filters" : [ {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "LEVEL" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"mapping" : {
"rows" : [ "[Owners].[Owner].[Owner]", "[Fields].[Field].[Field]" ],
Expand Down Expand Up @@ -329,7 +374,12 @@
"mdx" : "SELECT NON EMPTY [Measures].[DirectMemory.SUM] ON COLUMNS, NON EMPTY Generate(TopCount([Owners].[Owner].[Owner].Members, 6, [Measures].[DirectMemory.SUM]), TopPercent(Crossjoin([Fields].[Field].[Field].Members, [Owners].[Owner].CurrentMember), 95, [Measures].[DirectMemory.SUM])) ON ROWS FROM [MemoryCube]",
"updateMode" : "once"
},
"filters" : [ "[Components].[Component].[ALL].[AllMember].[LEVEL]" ],
"filters" : [ {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "LEVEL" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"serverKey" : "MAC",
"widgetKey" : "plotly-tree-map"
Expand Down
32 changes: 29 additions & 3 deletions src/main/resources/ui/dashboards/content/common_pitfalls.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@
"direction" : "column"
},
"name" : "Large indexes",
"filters" : [ "[Components].[Component].[ALL].[AllMember].[INDEX]" ],
"filters" : [ {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "INDEX" ] ],
"type" : "members"
} ],
"content" : {
"1" : {
"name" : "Indexes are too large",
Expand Down Expand Up @@ -145,7 +150,12 @@
"direction" : "column"
},
"name" : "Too many members in bitmaps",
"filters" : [ "Crossjoin({[Owners].[Owner Type].[ALL].[AllMember].[Cube], [Owners].[Owner Type].[ALL].[AllMember].[Distributed Cube]}, {Except([Aggregate Provider].[ProviderCategory].[ALL].[AllMember].Children, [Aggregate Provider].[ProviderCategory].[ALL].[AllMember].[N/A])}, [Components].[Component].[ALL].[AllMember].[AGGREGATE_STORE])" ],
"filters" : [ {
"type" : "custom",
"mdx" : "Crossjoin({[Owners].[Owner Type].[ALL].[AllMember].[Cube], [Owners].[Owner Type].[ALL].[AllMember].[Distributed Cube]}, {Except([Aggregate Provider].[ProviderCategory].[ALL].[AllMember].Children, [Aggregate Provider].[ProviderCategory].[ALL].[AllMember].[N/A])}, [Components].[Component].[ALL].[AllMember].[AGGREGATE_STORE])",
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type"
} ],
"content" : {
"1" : {
"name" : "Too many members in bitmap/leaf aggregate providers",
Expand Down Expand Up @@ -232,7 +242,23 @@
"direction" : "column"
},
"name" : "Oversized store chunks",
"filters" : [ "[Owners].[Owner Type].[ALL].[AllMember].[Store]", "Except([Chunks].[Class].Members, [Chunks].[Class].[AllMember].[com.qfs.chunk.direct.impl.DirectChunkPositiveInteger])", "[Components].[Component].[AllMember].[RECORDS]" ],
"filters" : [ {
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type",
"members" : [ [ "AllMember", "Store" ] ],
"type" : "members"
}, {
"dimensionName" : "Chunks",
"hierarchyName" : "Class",
"members" : [ [ "AllMember", "com.qfs.chunk.direct.impl.DirectChunkPositiveInteger" ] ],
"type" : "members",
"isExclusionFilter" : true
}, {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "RECORDS" ] ],
"type" : "members"
} ],
"content" : {
"1" : {
"name" : "Store chunks are oversized",
Expand Down
42 changes: 36 additions & 6 deletions src/main/resources/ui/dashboards/content/dictionaries_indexes.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@
"mdx" : "SELECT NON EMPTY {[Measures].[DirectMemory.SUM], [Measures].[DirectMemory.Ratio]} ON COLUMNS, NON EMPTY Order([Fields].[Field].[Field].Members, [Measures].[DirectMemory.SUM], DESC) ON ROWS FROM [MemoryCube] CELL PROPERTIES BACK_COLOR, FONT_FLAGS, FORE_COLOR, FORMATTED_VALUE, VALUE",
"updateMode" : "once"
},
"filters" : [ "[Components].[Component].[ALL].[AllMember].[DICTIONARY]" ],
"filters" : [ {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "DICTIONARY" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"mapping" : {
"rows" : [ "[Fields].[Field].[Field]" ],
Expand All @@ -62,7 +67,12 @@
"mdx" : "SELECT NON EMPTY TopPercent([Fields].[Field].[Field].Members, 95, [Measures].[DirectMemory.SUM]) ON ROWS, NON EMPTY [Measures].[DirectMemory.SUM] ON COLUMNS FROM [MemoryCube]",
"updateMode" : "once"
},
"filters" : [ "[Components].[Component].[ALL].[AllMember].[DICTIONARY]" ],
"filters" : [ {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "DICTIONARY" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"serverKey" : "MAC",
"widgetKey" : "plotly-tree-map"
Expand Down Expand Up @@ -136,7 +146,12 @@
"mdx" : "SELECT NON EMPTY {[Measures].[DirectMemory.SUM], [Measures].[DirectMemory.Ratio]} ON COLUMNS, NON EMPTY Order([Indices].[Indexed Fields].[Indexed Fields].Members, [Measures].[DirectMemory.SUM], DESC) ON ROWS FROM [MemoryCube] CELL PROPERTIES BACK_COLOR, FONT_FLAGS, FORE_COLOR, FORMATTED_VALUE, VALUE",
"updateMode" : "once"
},
"filters" : [ "[Components].[Component].[ALL].[AllMember].[INDEX]" ],
"filters" : [ {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "INDEX" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"mapping" : {
"rows" : [ "[Indices].[Indexed Fields].[Indexed Fields]" ],
Expand Down Expand Up @@ -164,7 +179,12 @@
"mdx" : "SELECT NON EMPTY [Measures].[DirectMemory.SUM] ON COLUMNS, NON EMPTY TopPercent([Indices].[Indexed Fields].[Indexed Fields].Members, 95, [Measures].[DirectMemory.SUM]) ON ROWS FROM [MemoryCube]",
"updateMode" : "once"
},
"filters" : [ "[Components].[Component].[ALL].[AllMember].[INDEX]" ],
"filters" : [ {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "INDEX" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"serverKey" : "MAC",
"widgetKey" : "plotly-tree-map"
Expand Down Expand Up @@ -229,7 +249,12 @@
"mdx" : "SELECT NON EMPTY {[Measures].[DirectMemory.SUM], [Measures].[DirectMemory.Ratio], [Measures].[DictionarySize.SUM]} ON COLUMNS, NON EMPTY Order(Hierarchize(Crossjoin([Owners].[Owner].[Owner].Members, Hierarchize(DrilldownLevel([Fields].[Field].[ALL].[AllMember])))), [Measures].[DirectMemory.SUM], DESC) ON ROWS FROM [MemoryCube] CELL PROPERTIES VALUE, FORMATTED_VALUE, BACK_COLOR, FORE_COLOR, FONT_FLAGS",
"updateMode" : "once"
},
"filters" : [ "[Components].[Component].[ALL].[AllMember].[DICTIONARY]" ],
"filters" : [ {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "DICTIONARY" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"mapping" : {
"rows" : [ "[Owners].[Owner].[Owner]", "[Fields].[Field].[Field]" ],
Expand All @@ -246,7 +271,12 @@
"mdx" : "SELECT NON EMPTY Order(Crossjoin(Hierarchize(DrilldownLevel([Owners].[Owner].[ALL].[AllMember])), Hierarchize(DrilldownLevel([Indices].[Indexed Fields].[ALL].[AllMember]))), [Measures].[DirectMemory.SUM], DESC) ON ROWS, NON EMPTY {[Measures].[DirectMemory.SUM], [Measures].[DirectMemory.Ratio]} ON COLUMNS FROM [MemoryCube] CELL PROPERTIES VALUE, FORMATTED_VALUE, BACK_COLOR, FORE_COLOR, FONT_FLAGS",
"updateMode" : "once"
},
"filters" : [ "[Components].[Component].[ALL].[AllMember].[INDEX]" ],
"filters" : [ {
"dimensionName" : "Components",
"hierarchyName" : "Component",
"members" : [ [ "AllMember", "INDEX" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"mapping" : {
"rows" : [ "[Owners].[Owner].[Owner]", "[Indices].[Indexed Fields].[Indexed Fields]" ],
Expand Down
28 changes: 24 additions & 4 deletions src/main/resources/ui/dashboards/content/fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@
"mdx" : "SELECT NON EMPTY Order(Crossjoin(Except([Fields].[Field].[Field].Members, [Fields].[Field].[Field].[N/A]), [Owners].[Owner].[Owner].Members), [Measures].[DirectMemory.SUM], DESC) ON ROWS, NON EMPTY {[Measures].[DirectMemory.SUM], [Measures].[DirectMemory.Ratio]} ON COLUMNS FROM [MemoryCube] CELL PROPERTIES VALUE, FORMATTED_VALUE, BACK_COLOR, FORE_COLOR, FONT_FLAGS",
"updateMode" : "once"
},
"filters" : [ "[Owners].[Owner Type].[ALL].[AllMember].[Store]" ],
"filters" : [ {
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type",
"members" : [ [ "AllMember", "Store" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"mapping" : {
"rows" : [ "[Fields].[Field].[Field]", "[Owners].[Owner].[Owner]" ],
Expand Down Expand Up @@ -86,7 +91,12 @@
"mdx" : "SELECT NON EMPTY [Measures].[DirectMemory.SUM] ON COLUMNS, NON EMPTY TopPercent(Except([Fields].[Field].[Field].Members, [Fields].[Field].[Field].[N/A]), 95, [Measures].[DirectMemory.SUM]) ON ROWS FROM [MemoryCube]",
"updateMode" : "once"
},
"filters" : [ "[Owners].[Owner Type].[ALL].[AllMember].[Store]" ],
"filters" : [ {
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type",
"members" : [ [ "AllMember", "Store" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"serverKey" : "MAC",
"widgetKey" : "plotly-tree-map"
Expand Down Expand Up @@ -132,7 +142,12 @@
"mdx" : "SELECT NON EMPTY Order(Hierarchize(Crossjoin(Hierarchize(DrilldownLevel([Owners].[Owner].[ALL].[AllMember])), Except([Fields].[Field].[Field].Members, [Fields].[Field].[Field].[N/A]), Hierarchize(DrilldownLevel([Components].[Component].[ALL].[AllMember])))), [Measures].[DirectMemory.SUM], DESC) ON ROWS, NON EMPTY {[Measures].[DirectMemory.SUM], [Measures].[DirectMemory.Ratio]} ON COLUMNS FROM [MemoryCube] CELL PROPERTIES VALUE, FORMATTED_VALUE, BACK_COLOR, FORE_COLOR, FONT_FLAGS",
"updateMode" : "once"
},
"filters" : [ "[Owners].[Owner Type].[ALL].[AllMember].[Store]" ],
"filters" : [ {
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type",
"members" : [ [ "AllMember", "Store" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"mapping" : {
"rows" : [ "[Owners].[Owner].[Owner]", "[Fields].[Field].[Field]", "[Components].[Component].[Component]" ],
Expand Down Expand Up @@ -184,7 +199,12 @@
"mdx" : "SELECT NON EMPTY [Measures].[DirectMemory.SUM] ON COLUMNS, NON EMPTY Generate(TopCount([Owners].[Owner].[Owner].Members, 6, [Measures].[DirectMemory.SUM]), TopPercent(Crossjoin(Except([Fields].[Field].[Field].Members, [Fields].[Field].[Field].[N/A]), [Owners].[Owner].CurrentMember), 95, [Measures].[DirectMemory.SUM])) ON ROWS FROM [MemoryCube]",
"updateMode" : "once"
},
"filters" : [ "[Owners].[Owner Type].[ALL].[AllMember].[Store]" ],
"filters" : [ {
"dimensionName" : "Owners",
"hierarchyName" : "Owner Type",
"members" : [ [ "AllMember", "Store" ] ],
"type" : "members"
} ],
"queryContext" : [ ],
"serverKey" : "MAC",
"widgetKey" : "plotly-tree-map"
Expand Down
Loading

0 comments on commit 443eb5c

Please sign in to comment.