From 59055ee3569301f5c68f904491066017902d074b Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 6 May 2019 11:37:09 -0700 Subject: [PATCH 01/12] natel branding --- emails/templates/layouts/default.html | 4 +- .../components/OrgActionBar/OrgActionBar.tsx | 10 ++- .../app/features/plugins/PluginListPage.tsx | 7 +- public/img/grafana_icon.svg | 73 ++++++------------- public/sass/layout/_page.scss | 2 +- public/views/index-template.html | 24 +----- 6 files changed, 34 insertions(+), 86 deletions(-) diff --git a/emails/templates/layouts/default.html b/emails/templates/layouts/default.html index ca54acdd2060c..c6b433c6cbc75 100644 --- a/emails/templates/layouts/default.html +++ b/emails/templates/layouts/default.html @@ -107,7 +107,7 @@ @@ -143,7 +143,7 @@

Sent by Grafana v[[.BuildVersion]] -
© 2018 Grafana Labs +
© 2019 Natel Energy

diff --git a/public/app/core/components/OrgActionBar/OrgActionBar.tsx b/public/app/core/components/OrgActionBar/OrgActionBar.tsx index f83d5c957f746..9fc67e8fe6e8f 100644 --- a/public/app/core/components/OrgActionBar/OrgActionBar.tsx +++ b/public/app/core/components/OrgActionBar/OrgActionBar.tsx @@ -14,7 +14,7 @@ export interface Props { export default class OrgActionBar extends PureComponent { render() { const { searchQuery, layoutMode, onSetLayoutMode, linkButton, setSearchQuery, target } = this.props; - const linkProps = { href: linkButton.href, target: undefined }; + const linkProps = { href: linkButton ? linkButton.href : '#', target: undefined }; if (target) { linkProps.target = target; @@ -33,9 +33,11 @@ export default class OrgActionBar extends PureComponent { onSetLayoutMode(mode)} />
- - {linkButton.title} - + {linkButton && ( + + {linkButton.title} + + )}
); } diff --git a/public/app/features/plugins/PluginListPage.tsx b/public/app/features/plugins/PluginListPage.tsx index 03d383fdec0ca..911cde2ebdf6e 100644 --- a/public/app/features/plugins/PluginListPage.tsx +++ b/public/app/features/plugins/PluginListPage.tsx @@ -41,11 +41,6 @@ export class PluginListPage extends PureComponent { searchQuery, } = this.props; - const linkButton = { - href: 'https://grafana.com/plugins?utm_source=grafana_plugin_list', - title: 'Find more plugins on Grafana.com', - }; - return ( @@ -55,7 +50,7 @@ export class PluginListPage extends PureComponent { layoutMode={layoutMode} onSetLayoutMode={mode => setPluginsLayoutMode(mode)} setSearchQuery={query => setPluginsSearchQuery(query)} - linkButton={linkButton} + linkButton={null} /> {hasFetched && plugins && (plugins && )} diff --git a/public/img/grafana_icon.svg b/public/img/grafana_icon.svg index 72702223dc77b..f97c21937aa5b 100644 --- a/public/img/grafana_icon.svg +++ b/public/img/grafana_icon.svg @@ -1,57 +1,28 @@ - + + viewBox="0 0 351 365" style="enable-background:new 0 0 351 365;" xml:space="preserve"> - + + + + + + + + + - - - - - diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss index 6b2fa95730e0a..edcefa44e82db 100644 --- a/public/sass/layout/_page.scss +++ b/public/sass/layout/_page.scss @@ -41,7 +41,7 @@ margin-right: auto; padding-left: $spacer * 2; padding-right: $spacer * 2; - max-width: 980px; + max-width: 100%; @include clearfix(); } diff --git a/public/views/index-template.html b/public/views/index-template.html index fa19ae599dd20..edfc13e6dad35 100644 --- a/public/views/index-template.html +++ b/public/views/index-template.html @@ -198,34 +198,14 @@
From 899728c30fc96c77baaeb0d1d10c8397a1386ff6 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 10 May 2019 11:44:17 -0700 Subject: [PATCH 02/12] merge master --- .../PluginListPage.test.tsx.snap | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap diff --git a/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap b/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap deleted file mode 100644 index eab70367152e8..0000000000000 --- a/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap +++ /dev/null @@ -1,69 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Render should render component 1`] = ` - - - - - -`; - -exports[`Render should render list 1`] = ` - - - - - - -`; From 3242babd9f8566372e9e04992149b3a679a06058 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 10 May 2019 15:34:32 -0700 Subject: [PATCH 03/12] put back the test --- .../PluginListPage.test.tsx.snap | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap diff --git a/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap b/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap new file mode 100644 index 0000000000000..eab70367152e8 --- /dev/null +++ b/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap @@ -0,0 +1,69 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Render should render component 1`] = ` + + + + + +`; + +exports[`Render should render list 1`] = ` + + + + + + +`; From e5c93e816c0019b9e384feecb6172e167cb72715 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 10 May 2019 15:52:32 -0700 Subject: [PATCH 04/12] fix test --- .../plugins/__snapshots__/PluginListPage.test.tsx.snap | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap b/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap index eab70367152e8..837d490051d61 100644 --- a/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap +++ b/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap @@ -50,12 +50,7 @@ exports[`Render should render list 1`] = ` > Date: Fri, 10 May 2019 17:27:48 -0700 Subject: [PATCH 05/12] update test --- .../plugins/__snapshots__/PluginListPage.test.tsx.snap | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap b/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap index 837d490051d61..44022e5dff817 100644 --- a/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap +++ b/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap @@ -18,12 +18,7 @@ exports[`Render should render component 1`] = ` > Date: Mon, 13 May 2019 15:53:20 -0700 Subject: [PATCH 06/12] fix test --- .../__snapshots__/ServerStats.test.tsx.snap | 30 +++---------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap b/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap index 23d4d714559d3..2c1015291a77b 100644 --- a/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap +++ b/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap @@ -159,35 +159,13 @@ exports[`ServerStats Should render table with stats 1`] = `
  • - Docs - -
    • -
  • - - - Support Plans - -
    • -
  • - - - Community + Upstream Tech
  • @@ -197,11 +175,11 @@ exports[`ServerStats Should render table with stats 1`] = ` > Grafana - + v v1.0 - (commit: + (commit: 1 ) From 51bb0acb8b6b8c338e1f95d1b07f9343ac947d06 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 13 May 2019 15:58:25 -0700 Subject: [PATCH 07/12] remove snapshots --- .../__snapshots__/ServerStats.test.tsx.snap | 236 ------------------ .../PluginListPage.test.tsx.snap | 59 ----- 2 files changed, 295 deletions(-) delete mode 100644 public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap delete mode 100644 public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap diff --git a/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap b/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap deleted file mode 100644 index 2c1015291a77b..0000000000000 --- a/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap +++ /dev/null @@ -1,236 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`ServerStats Should render table with stats 1`] = ` -
    -
    -
    -
    -
    -
    -
    -
    - - - -
    -

    - Admin -

    -
    - subTitle -
    -
    -
    - -
    -
    -
    -
    -
- +
- - - - - - - - - - - - - - - - -
- Name - - Value -
- Total dashboards - - 10 -
- Total Users - - 1 -
- - - - -
-
-
-
-
-
-
-
-`; diff --git a/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap b/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap deleted file mode 100644 index 44022e5dff817..0000000000000 --- a/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap +++ /dev/null @@ -1,59 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Render should render component 1`] = ` - - - - - -`; - -exports[`Render should render list 1`] = ` - - - - - - -`; From f986df1e2699b9e2bcf51d16b6942491666e3d72 Mon Sep 17 00:00:00 2001 From: ryan Date: Mon, 13 May 2019 16:26:10 -0700 Subject: [PATCH 08/12] remove snapshots --- scripts/grunt/options/exec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/grunt/options/exec.js b/scripts/grunt/options/exec.js index 3296abecfd4a9..fa983e426ba5c 100644 --- a/scripts/grunt/options/exec.js +++ b/scripts/grunt/options/exec.js @@ -18,7 +18,7 @@ module.exports = function(config, grunt) { command: 'yarn run typecheck', src: ['public/app/**/*.ts*'], }, - jest: 'node ./node_modules/jest-cli/bin/jest.js --maxWorkers 2', + jest: 'node ./node_modules/jest-cli/bin/jest.js --updateSnapshot --maxWorkers 2', webpack: 'node ./node_modules/webpack/bin/webpack.js --config scripts/webpack/webpack.prod.js', }; From d6ed1a3cdf84288d99fd4f02d96b353014c40b26 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 15 May 2019 09:46:28 -0700 Subject: [PATCH 09/12] merge master --- .../PluginListPage.test.tsx.snap | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap diff --git a/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap b/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap new file mode 100644 index 0000000000000..eab70367152e8 --- /dev/null +++ b/public/app/features/plugins/__snapshots__/PluginListPage.test.tsx.snap @@ -0,0 +1,69 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Render should render component 1`] = ` + + + + + +`; + +exports[`Render should render list 1`] = ` + + + + + + +`; From 9aeebff4c23f81dbec6bd8b86fe24c0f2b98bc71 Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 17 May 2019 11:16:02 -0700 Subject: [PATCH 10/12] merge master --- public/app/core/components/Footer/Footer.tsx | 21 +++++--------------- public/views/index-template.html | 6 ++++-- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/public/app/core/components/Footer/Footer.tsx b/public/app/core/components/Footer/Footer.tsx index 0e30c46db3e28..42b7c9d76eba3 100644 --- a/public/app/core/components/Footer/Footer.tsx +++ b/public/app/core/components/Footer/Footer.tsx @@ -17,26 +17,15 @@ export const Footer: FC = React.memo( diff --git a/public/views/index-template.html b/public/views/index-template.html index edfc13e6dad35..2117d50ef43f7 100644 --- a/public/views/index-template.html +++ b/public/views/index-template.html @@ -199,12 +199,14 @@ From 94f89dd3fbf2b770f4dfe45f048840e9c7b022fc Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 17 May 2019 11:17:01 -0700 Subject: [PATCH 11/12] merge master --- public/app/core/components/Footer/Footer.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/app/core/components/Footer/Footer.tsx b/public/app/core/components/Footer/Footer.tsx index 42b7c9d76eba3..3aa19a0426a06 100644 --- a/public/app/core/components/Footer/Footer.tsx +++ b/public/app/core/components/Footer/Footer.tsx @@ -1,5 +1,4 @@ import React, { FC } from 'react'; -import { Tooltip } from '@grafana/ui'; interface Props { appName: string; @@ -21,8 +20,7 @@ export const Footer: FC = React.memo(
  • - + v{buildVersion}
    • From 1fb4f1cc4d4d53b2b1738f98244d1ff252ee233b Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 17 May 2019 14:41:28 -0700 Subject: [PATCH 12/12] fix extra quote --- public/views/index-template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/index-template.html b/public/views/index-template.html index 2117d50ef43f7..1e5a582415f4f 100644 --- a/public/views/index-template.html +++ b/public/views/index-template.html @@ -204,7 +204,7 @@
  • + title="(commit: [[.BuildCommit]])"> v[[.BuildVersion]]