From 3bc3293fe866496042e11716f1b808ab52d4c0ca Mon Sep 17 00:00:00 2001 From: Jiri Zajic Date: Wed, 10 Aug 2022 18:14:50 +0200 Subject: [PATCH] cgra-bear - GoodData.UI v8.10 --- cgra-bear/.nvmrc | 2 +- cgra-bear/package.json | 20 +- cgra-bear/src/App.js | 4 + cgra-bear/src/md/full.js | 49 +- cgra-bear/src/routes/Home.js | 22 +- cgra-bear/src/routes/Home2.js | 39 + cgra-bear/src/theme.js | 45 + cgra-bear/yarn.lock | 7736 ++++++++++++++++----------------- 8 files changed, 3960 insertions(+), 3957 deletions(-) create mode 100644 cgra-bear/src/routes/Home2.js create mode 100644 cgra-bear/src/theme.js diff --git a/cgra-bear/.nvmrc b/cgra-bear/.nvmrc index 764b945d..ff650592 100644 --- a/cgra-bear/.nvmrc +++ b/cgra-bear/.nvmrc @@ -1 +1 @@ -v12.15.0 +v16.13.0 diff --git a/cgra-bear/package.json b/cgra-bear/package.json index c0a48939..70432eac 100644 --- a/cgra-bear/package.json +++ b/cgra-bear/package.json @@ -3,15 +3,15 @@ "version": "0.1.0", "private": true, "dependencies": { - "@gooddata/sdk-backend-bear": "^8.9.0", - "@gooddata/sdk-model": "^8.9.0", - "@gooddata/sdk-ui": "^8.9.0", - "@gooddata/sdk-ui-charts": "^8.9.0", - "@gooddata/sdk-ui-dashboard": "^8.9.0", - "@gooddata/sdk-ui-ext": "^8.9.0", - "@gooddata/sdk-ui-filters": "^8.9.0", - "@gooddata/sdk-ui-geo": "^8.9.0", - "@gooddata/sdk-ui-pivot": "^8.9.0", + "@gooddata/sdk-backend-bear": "^8.10.0", + "@gooddata/sdk-model": "^8.10.0", + "@gooddata/sdk-ui": "^8.10.0", + "@gooddata/sdk-ui-charts": "^8.10.0", + "@gooddata/sdk-ui-dashboard": "^8.10.0", + "@gooddata/sdk-ui-ext": "^8.10.0", + "@gooddata/sdk-ui-filters": "^8.10.0", + "@gooddata/sdk-ui-geo": "^8.10.0", + "@gooddata/sdk-ui-pivot": "^8.10.0", "classnames": "^2.3.1", "formik": "^2.2.9", "lodash": "^4.17.15", @@ -57,7 +57,7 @@ "@babel/preset-env": "^7.16.5", "@babel/preset-typescript": "^7.16.5", "@babel/register": "^7.16.5", - "@gooddata/catalog-export": "^8.9.0", + "@gooddata/catalog-export": "^8.10.0", "@wojtekmaj/enzyme-adapter-react-17": "^0.6.6", "babel-plugin-add-module-exports": "^1.0.4", "cross-env": "^5.2.0", diff --git a/cgra-bear/src/App.js b/cgra-bear/src/App.js index 1bb9bf27..b9ded73f 100644 --- a/cgra-bear/src/App.js +++ b/cgra-bear/src/App.js @@ -1,9 +1,11 @@ import React from "react"; import { BackendProvider } from "@gooddata/sdk-ui"; +import { ThemeProvider } from "@gooddata/sdk-ui-theme-provider"; import AppRouter from "./routes/AppRouter"; import { useAuth } from "./contexts/Auth"; import { WorkspaceListProvider } from "./contexts/WorkspaceList"; +import customTheme from "./theme"; function App() { const { backend } = useAuth(); @@ -11,7 +13,9 @@ function App() { return ( + {/* */} + {/* */} ); diff --git a/cgra-bear/src/md/full.js b/cgra-bear/src/md/full.js index c2b28710..ef35c59d 100644 --- a/cgra-bear/src/md/full.js +++ b/cgra-bear/src/md/full.js @@ -1,6 +1,6 @@ /* eslint-disable */ -/* THIS FILE WAS AUTO-GENERATED USING CATALOG EXPORTER; YOU SHOULD NOT EDIT THIS FILE; GENERATE TIME: 2022-06-09T10:57:58.575Z; */ +/* THIS FILE WAS AUTO-GENERATED USING CATALOG EXPORTER; YOU SHOULD NOT EDIT THIS FILE; GENERATE TIME: 2022-08-10T13:19:13.378Z; */ // @ts-ignore ignore unused imports here if they happen (e.g. when there is no measure in the workspace) import { newAttribute, newMeasure, idRef } from "@gooddata/sdk-model"; /** @@ -168,6 +168,13 @@ export const PercentTotalSalesFromPreviousMonth = newMeasure(idRef("aaoPOljQfRt1 */ export const AveragePageViews = newMeasure(idRef("aaSdqzqHdNL8", "measure")); +/** + * Metric Title: Average Page Views (Colored) + * Metric ID: ab9F5vJuqTdZ + * Metric Type: MAQL Metric + */ + +export const AveragePageViewsColored = newMeasure(idRef("ab9F5vJuqTdZ", "measure")); /** * Metric Title: Average Page Views [computers] * Metric ID: aaddocAhfjN5 @@ -4798,6 +4805,26 @@ export const Insights = { * Insight ID: accpTuREibqZ */ PageViewsByCategoryByBrand: "accpTuREibqZ", + /** + * Insight Title: Table (Colored) + * Insight ID: abuF8xDvs20l + */ + TableColored: "abuF8xDvs20l", + /** + * Insight Title: Avg Price by Category + * Insight ID: abdPNHOLcHLk + */ + AvgPriceByCategory: "abdPNHOLcHLk", + /** + * Insight Title: Avg Price by Category — Colored + * Insight ID: aaEPYMhnXmFf + */ + AvgPriceByCategoryColored: "aaEPYMhnXmFf", + /** + * Insight Title: Quantity by Category + * Insight ID: aaLgNq53S6VB + */ + QuantityByCategory: "aaLgNq53S6VB", }; export const Dashboards = { /** @@ -4825,11 +4852,6 @@ export const Dashboards = { * Dashboard ID: aagL8MteaYAo */ _5Embedding: "aagL8MteaYAo", - /** - * Dashboard Title: Overview - * Dashboard ID: abVw0FT8W9Jz - */ - Overview: "abVw0FT8W9Jz", /** * Dashboard Title: Dynamic Measures * Dashboard ID: aaNEDetXTWPh @@ -4840,19 +4862,14 @@ export const Dashboards = { * Dashboard ID: aagCCFA94QP5 */ DynamicMeasuresTesting: "aagCCFA94QP5", - /** - * Dashboard Title: Detail View - * Dashboard ID: aejqFk1jN0T5 - */ - DetailView: "aejqFk1jN0T5", - /** - * Dashboard Title: Copy of 1. Overview - * Dashboard ID: adcZ7eakBfE4 - */ - CopyOf1Overview: "adcZ7eakBfE4", /** * Dashboard Title: Recharts Piechart * Dashboard ID: aa0mnpTS4siw */ RechartsPiechart: "aa0mnpTS4siw", + /** + * Dashboard Title: My First Dashboard + * Dashboard ID: abUgFDzQoKGW + */ + MyFirstDashboard: "abUgFDzQoKGW", }; diff --git a/cgra-bear/src/routes/Home.js b/cgra-bear/src/routes/Home.js index a406c54b..288799e2 100644 --- a/cgra-bear/src/routes/Home.js +++ b/cgra-bear/src/routes/Home.js @@ -11,27 +11,7 @@ import CustomBarChart from "../components/CustomBarChart"; const Home = () => { return ( -