From 91fe807305e89ecd9df3b6f4f221540fd451659e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gr=C3=A9goire=20Aubert?= Date: Thu, 8 Feb 2018 17:43:32 +0100 Subject: [PATCH] SONAR-10347 Create a CodeSnippet component and use it in project badges and onboarding tutorial --- .../js/apps/overview/badges/BadgesModal.tsx | 4 +- .../__snapshots__/BadgesModal-test.tsx.snap | 3 +- .../main/js/apps/overview/badges/styles.css | 35 ------ .../tutorials/onboarding/commands/ClangGCC.js | 6 +- .../tutorials/onboarding/commands/DotNet.js | 8 +- .../onboarding/commands/JavaGradle.js | 6 +- .../onboarding/commands/JavaMaven.js | 4 +- .../tutorials/onboarding/commands/Msvc.js | 8 +- .../tutorials/onboarding/commands/Other.js | 4 +- .../__snapshots__/ClangGCC-test.js.snap | 30 ++--- .../__snapshots__/Command-test.js.snap | 39 ------ .../__snapshots__/DotNet-test.js.snap | 32 ++--- .../__snapshots__/JavaGradle-test.js.snap | 16 +-- .../__snapshots__/JavaMaven-test.js.snap | 8 +- .../__tests__/__snapshots__/Msvc-test.js.snap | 32 ++--- .../__snapshots__/Other-test.js.snap | 18 +-- .../js/apps/tutorials/onboarding/styles.css | 42 ------- .../common/CodeSnippet.css} | 47 ++++++-- .../common/CodeSnippet.tsx} | 48 ++++---- .../common/__tests__/CodeSnippet-test.tsx} | 13 +- .../__snapshots__/CodeSnippet-test.tsx.snap | 111 ++++++++++++++++++ 21 files changed, 267 insertions(+), 247 deletions(-) delete mode 100644 server/sonar-web/src/main/js/apps/tutorials/onboarding/commands/__tests__/__snapshots__/Command-test.js.snap rename server/sonar-web/src/main/js/{apps/overview/badges/BadgeSnippet.tsx => components/common/CodeSnippet.css} (53%) rename server/sonar-web/src/main/js/{apps/tutorials/onboarding/commands/Command.js => components/common/CodeSnippet.tsx} (52%) rename server/sonar-web/src/main/js/{apps/tutorials/onboarding/commands/__tests__/Command-test.js => components/common/__tests__/CodeSnippet-test.tsx} (66%) create mode 100644 server/sonar-web/src/main/js/components/common/__tests__/__snapshots__/CodeSnippet-test.tsx.snap diff --git a/server/sonar-web/src/main/js/apps/overview/badges/BadgesModal.tsx b/server/sonar-web/src/main/js/apps/overview/badges/BadgesModal.tsx index fc98e4eb71a..3592c4daea3 100644 --- a/server/sonar-web/src/main/js/apps/overview/badges/BadgesModal.tsx +++ b/server/sonar-web/src/main/js/apps/overview/badges/BadgesModal.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import BadgeButton from './BadgeButton'; -import BadgeSnippet from './BadgeSnippet'; import BadgeParams from './BadgeParams'; import { BadgeType, BadgeOptions, getBadgeUrl } from './utils'; import { Metric } from '../../../app/types'; +import CodeSnippet from '../../../components/common/CodeSnippet'; import Modal from '../../../components/controls/Modal'; import { translate } from '../../../helpers/l10n'; import './styles.css'; @@ -101,7 +101,7 @@ export default class BadgesModal extends React.PureComponent { type={selectedType} updateOptions={this.handleUpdateOptions} /> - +