Merge branch 'main' into docs/PPDSC-2709-update-icons-scenarios-story…

…book
newscorp-ghfb · Mar 29, 2023 · c93bad3 · c93bad3
2 parents 57fe261 + 279953d
commit c93bad3
Show file tree

Hide file tree

Showing 17 changed files with 316 additions and 330 deletions.
diff --git a/.github/ISSUE_TEMPLATE/a11y_investigation.md b/.github/ISSUE_TEMPLATE/a11y_investigation.md
@@ -1,7 +1,6 @@
 ---
 name: A11y Investigation
-about: Details an accessibility investigation that needs to be done 
-title: '(A11y) - '
+about: Details an accessibility investigation that needs to be done
 labels: ["a11y", "triage"]
 assignees: ''
 

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,6 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: '(Bug) - '
 labels: ["bug", "triage"]
 assignees: ''
 

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,6 @@
 ---
 name: Feature request
 about: Suggest a feature/enhancement for NewsKit - External teams should use this instead of story,task,spike etc.
-title: ''
 labels: ["request", "triage"]
 assignees: ''
 

diff --git a/.github/ISSUE_TEMPLATE/spike.md b/.github/ISSUE_TEMPLATE/spike.md
@@ -1,7 +1,6 @@
 ---
 name: Technical Spike
 about: Details a piece of technical research or an investigation that needs to be conducted
-title: '(Spike) - '
 labels: ["spike", "triage"]
 assignees: ''
 

diff --git a/.github/ISSUE_TEMPLATE/story.md b/.github/ISSUE_TEMPLATE/story.md
@@ -1,7 +1,6 @@
 ---
 name: User Story
-about: Details a specific user facing feature 
-title: '(Story) - '
+about: Details a specific user facing feature
 labels: ["story", "triage"]
 assignees: ''
 

diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md
@@ -1,7 +1,6 @@
 ---
 name: Task
 about: Details a task
-title: '(Task) - '
 labels: ["task", "triage"]
 assignees: ''
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,5 @@
-PPDSC-XXXX
+<!-- Replace #000 with github issue number e.g #1234 -->
+#000
 
 **What**
 

diff --git a/.github/release.yml b/.github/release.yml
@@ -16,7 +16,7 @@ changelog:
         - fix
     - title: Documentation 📝
       labels:
-        - doc
+        - docs
     - title: Other Changes 🧱
       labels:
         - "*"
diff --git a/.storybook/addons/tealium/register.js b/.storybook/addons/tealium/register.js
@@ -5,7 +5,6 @@ import Helmet from 'react-helmet';
 import {IconButton, Icons} from '@storybook/components';
 
 import {
-  Consent,
   Tealium,
   ConsentSettingsLink,
   newskitLightTheme,
@@ -55,11 +54,6 @@ const CONFIG = {
     profileId: 'thetimes.storybook',
     env: isProduction ? 'prod' : 'dev',
   },
-  consent: {
-    accountId: 259,
-    propertyHref: 'https://newskit.co.uk',
-    gdpr: {},
-  },
 };
 
 const Tool = () => {
@@ -81,10 +75,6 @@ const Tool = () => {
           {''}
         </ConsentSettingsLink>
         <Tealium {...CONFIG.tealium} reactHelmet={Helmet} />
-        <Consent
-          sourcePointConfigUnified={CONFIG.consent}
-          reactHelmet={Helmet}
-        />
         <Tooltip content="Privacy Manager" asLabel placement="left">
           <span>
             <IconButton

diff --git a/githooks/commitmsg.js b/githooks/commitmsg.js
@@ -6,7 +6,7 @@ const read = require('@commitlint/read');
 
 const customMessages = {
   'scope-enum': {
-    level2: 'The scope should be a Jira ticket number',
+    level2: 'The scope should be a GitHub issue number',
   },
 };
 

diff --git a/githooks/constants.js b/githooks/constants.js
@@ -1,9 +1,9 @@
 const chalk = require('chalk');
 
 const TYPES = ['docs', 'feat', 'fix', 'refactor', 'revert', 'upkeep', 'spike'];
-const SCOPE_REGEX = /^[A-Z]{2,5}-\d{1,5}$/;
+const SCOPE_REGEX = /^[A-Z]{2,5}-\d{1,5}|\d{1,5}$/;
 const PLAIN_PREFIX_ERROR_MSG =
-  "The commit message should be in the format 'type - fix/feat/etc(ticket-number): message'";
+  "The commit message should be in the format 'type - fix/feat/etc(issue-number): message'";
 const FORMATTED_PREFIX_ERROR_MSG = `The commit message should be in the format ${chalk.bold(
   "'type",
 )}${chalk.reset.dim(' - fix/feat/etc')}${chalk.bold(

diff --git a/githooks/preparecommitmsg.js b/githooks/preparecommitmsg.js
@@ -40,12 +40,11 @@ const createPrompts = ({type, scope}) => {
           SEM_VER_COMMIT_TYPES[SEM_VER_COMMIT_TYPES.length - 1],
     },
     {
-      message: 'Enter the Jira ticket number for this commit',
+      message: 'Enter the github issue number for this commit',
       name: 'scope',
       transformer: input => input.toUpperCase(),
       type: 'input',
-      validate: input =>
-        SCOPE_REGEX.test(input.toUpperCase()) || 'e.g. PPDSC-1608',
+      validate: input => SCOPE_REGEX.test(input.toUpperCase()) || 'e.g. 1608',
       when: !scope,
     },
   ];
@@ -69,7 +68,7 @@ const createPrompts = ({type, scope}) => {
 
 const getBranchData = ({type, scope}) =>
   new Promise((resolve, reject) => {
-    const branchNameRegex = /^(?:(\w*)\/)?([a-z]{2,5}-\d{1,5})?/i;
+    const branchNameRegex = /^(?:(\w*)\/)?([a-z]{2,5}-\d{1,5}|\d{1,5})?/i;
     exec('git rev-parse --abbrev-ref HEAD', (err, stdout, stderr) => {
       if (stdout && typeof stdout === 'string') {
         const matches = stdout.trim().match(branchNameRegex);
@@ -102,6 +101,7 @@ if (msgFilePath) {
     )
     .then(({scope, type, ...parsed}) => {
       // remove any already defined type and scope info
+
       const message = parsed.raw
         .replace(type, '')
         .replace(`(${scope})`, '')

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "newskit",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "description": "A React Component library implementing the News design language",
   "keywords": [
     "react",

diff --git a/site/components/site-footer.tsx b/site/components/site-footer.tsx
@@ -2,7 +2,6 @@ import * as React from 'react';
 import {
   Grid,
   Cell,
-  ConsentSettingsLink,
   getColorCssFromTheme,
   getSizingCssFromTheme,
   getMediaQueryFromTheme,
@@ -96,14 +95,14 @@ const SiteFooter: React.FC<FooterProps> = ({cellProps = {xs: 12}}) => (
                 </Link>
               </FooterLink>
               <FooterLink>
-                <ConsentSettingsLink
-                  privacyManagerId="407619"
-                  gdpr
+                <Link
+                  type="standalone"
+                  href="/"
                   overrides={linkOverrides}
                   eventContext={{value: 'Privacy policy'}}
                 >
                   Privacy policy
-                </ConsentSettingsLink>
+                </Link>
               </FooterLink>
               <FooterLink>
                 <Link

diff --git a/site/pages/_document.tsx b/site/pages/_document.tsx
@@ -5,7 +5,6 @@ import Document, {Head, Main, NextScript, Html} from 'next/document';
 import {
   Global,
   css,
-  Consent,
   Tealium,
   compileTheme,
   newskitLightTheme,
@@ -22,30 +21,19 @@ const baseHref =
 
 const Base = () => <base href={baseHref} />;
 
+const compiledNewskitLightTheme = compileTheme(newskitLightTheme);
 export default class MyDocument extends Document {
   render() {
     const isSiteEnvProduction = process.env.SITE_ENV === 'production';
 
     const helmet = Helmet.rewind();
 
-    const compiledNewskitLightTheme = compileTheme(newskitLightTheme);
-
     return (
       <Html lang="en">
         <Head>
           <Base />
           {helmet.script.toComponent()}
           <HTMLMeta />
-          {isSiteEnvProduction && (
-            <Consent
-              sourcePointConfigUnified={{
-                accountId: 259,
-                propertyHref: 'https://newskit.co.uk',
-                gdpr: {},
-              }}
-              reactHelmet={Helmet}
-            />
-          )}
         </Head>
         <body>
           <Global
@@ -278,6 +266,7 @@ export default class MyDocument extends Document {
               reactHelmet={Helmet}
             />
           )}
+
           <Main />
           <NextScript />
         </body>

diff --git a/site/pages/help/terms-and-conditions.tsx b/site/pages/help/terms-and-conditions.tsx
@@ -39,44 +39,51 @@ const Introduction = ({path, ...props}: LayoutProps) => (
       name="Website terms and conditions of use"
       introduction={
         <>
-          <P overrides={contentOverrides}>
-            Welcome to the Website Terms and Conditions of Use (<b>Terms</b>)
-            which apply to{' '}
-            <Link href="https://newskit.co.uk/" target="_blank">
-              https://newskit.co.uk/
-            </Link>{' '}
-            (the <b>Website</b>).
-            <br />
-            <br />
-            By using our Website you agree to be legally bound by these Terms.
-            If you do not agree to these Terms, you should not use our Website.
-            <br />
-            <br />
-            On this Website, we make available various software components,
-            features and tools (<b>Components</b>), including code which has
-            been developed by or on behalf of News UK to form the basis of
-            NewsKit (<b>NewsKit OSS</b>).
-            <br />
-            <br />
-            Separate terms may apply to your usage of NewsKit OSS and other
-            Components, including these{' '}
-            <Link
-              href="https://github.com/newscorp-ghfb/newskit/blob/main/LICENSE"
-              target="_blank"
-            >
-              Open Source Terms
-            </Link>
-            . You should ensure that you check, and comply with, the terms of
-            the licences for any such Components before using them.
-            <br />
-            <br />
-            In the event of a conflict between these Terms and the Open Source
-            Terms in any way, the Open Source Terms shall prevail in relation to
-            your usage of any Components (including NewsKit OSS).
-          </P>
+          Welcome to the Website Terms and Conditions of Use (<b>Terms</b>)
+          which apply to{' '}
+          <Link href="https://newskit.co.uk/" target="_blank">
+            https://newskit.co.uk/
+          </Link>{' '}
+          (the <b>Website</b>).
         </>
       }
     />
+    <ComponentPageCell>
+      <ContentSection>
+        <ContentSecondary
+          description={
+            <>
+              By using our Website you agree to be legally bound by these Terms.
+              If you do not agree to these Terms, you should not use our
+              Website.
+              <br />
+              <br />
+              On this Website, we make available various software components,
+              features and tools (<b>Components</b>), including code which has
+              been developed by or on behalf of News UK to form the basis of
+              NewsKit (<b>NewsKit OSS</b>).
+              <br />
+              <br />
+              Separate terms may apply to your usage of NewsKit OSS and other
+              Components, including these{' '}
+              <Link
+                href="https://github.com/newscorp-ghfb/newskit/blob/main/LICENSE"
+                target="_blank"
+              >
+                Open Source Terms
+              </Link>
+              . You should ensure that you check, and comply with, the terms of
+              the licences for any such Components before using them.
+              <br />
+              <br />
+              In the event of a conflict between these Terms and the Open Source
+              Terms in any way, the Open Source Terms shall prevail in relation
+              to your usage of any Components (including NewsKit OSS).
+            </>
+          }
+        />
+      </ContentSection>
+    </ComponentPageCell>
 
     <ComponentPageCell>
       <ContentSection sectionName="accessing and using our website">
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ changelog: @@
             - fix
         - title: Documentation 📝
           labels:
-            - doc
+            - docs
         - title: Other Changes 🧱
           labels:
             - "*"