Merge pull request #301 from qld-gov-au/QOLOE-134-Various-UATs

[QOLOE-134] Various UATs
qld-gov-au · Jun 24, 2024 · affc431 · affc431
2 parents 44883ef + 3405101
commit affc431
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 32 deletions.
diff --git a/.esbuild/plugins/qgds-plugin-clean-output-folders.js b/.esbuild/plugins/qgds-plugin-clean-output-folders.js
@@ -1,39 +1,30 @@
 import fs from "fs";
 import log from "../helpers/logger.js";
 
-/**
- * Clean the output folders /dist.
- * Skip cleaning during the initial build or initial watch mode.
- *
- * @returns {Object} Object with a name and a setup function.
- */
 export default function cleanFoldersPlugin() {
-  let isInitialBuild = true;
   return {
     name: "qgds-clean-output-folders",
     setup(build) {
       build.onStart(() => {
-        if (!isInitialBuild) {
-          //Console feedback
-          log("cyan", `\u{1F4C2} Cleaning /dist folders\n\n`);
+        //Console feedback
+        log("cyan", `\u{1F4C2} Cleaning /dist folders\n\n`);
 
-          // Clean the output folders
-          const { outdir, outfile } = build.initialOptions;
+        // Clean the output folders
+        const { outdir, outfile } = build.initialOptions;
 
-          if (outdir && fs.existsSync(outdir)) {
-            fs.rmSync(outdir, { recursive: true });
-          }
-
-          if (outfile && fs.existsSync(outfile)) {
-            fs.rmSync(outfile);
-          }
+        if (outdir && fs.existsSync(outdir)) {
+          fs.rmSync(outdir, { recursive: true });
+        }
 
-          // // Clean the docs folder
-          // const docsdir = "./docs/";
-          // if (fs.existsSync(docsdir)) {
-          //   fs.rmSync(docsdir, { recursive: true });
-          // }
+        if (outfile && fs.existsSync(outfile)) {
+          fs.rmSync(outfile);
         }
+
+        // // Clean the docs folder
+        // const docsdir = "./docs/";
+        // if (fs.existsSync(docsdir)) {
+        //   fs.rmSync(docsdir, { recursive: true });
+        // }
       });
     },
   };

diff --git a/.storybook/main.js b/.storybook/main.js
@@ -4,10 +4,8 @@ const config = {
         "../src/stories/Introduction.mdx",
         // Include all stories found under the src/components directory ( For example: alert/alert.stories.js )
         // Exlude any stories starting with an underscore ( For example: _exludeme.stories.js )
-        // "../src/**/!(*_)*.mdx",
-        // "../src/**/!(*_)*.stories.js",
-        process.env.STORYBOOK_SINGLE ? process.env.STORYBOOK_SINGLE : "../src/**/!(*_)*.mdx",
-        process.env.STORYBOOK_SINGLE ? process.env.STORYBOOK_SINGLE : "../src/**/!(*_)*.stories.js",
+        "../src/**/!(*_)*.mdx",
+        "../src/**/!(*_)*.stories.js",
     ],
     staticDirs: [
         { from: '../dist', to: '/assets' },

diff --git a/package.json b/package.json
@@ -16,8 +16,6 @@
     "serve": "live-server dist",
     "dev-storybook": "npm-run-all --parallel watch storybook",
     "storybook": "storybook dev -p 6006",
-    "storybook-single": "STORYBOOK_SINGLE=../src/components/bs5/button/button.stories.js npm run storybook",
-    "storybook-single-watch": "STORYBOOK_SINGLE=../src/components/bs5/button/button.stories.js npm-run-all --parallel watch storybook",
     "build-storybook": "storybook build --webpack-stats-json ",
     "build-storybook:serve": "live-server storybook-static"
   },

diff --git a/src/components/bs5/textbox/textInput.scss b/src/components/bs5/textbox/textInput.scss
@@ -40,7 +40,7 @@
 }
 
 .qld-text-input-label {
-    color: var(--#{$prefix}color-default-color-light-text-lighter);
+    color: var(--#{$prefix}text-grey);
     display: block;
     font-weight: 600;
     line-height: 1.5;

diff --git a/src/components/bs5/video/video.hbs b/src/components/bs5/video/video.hbs
@@ -45,6 +45,8 @@
     </div>
 
     {{! Render the transcript content in an accordion template }}
-    {{{ transcriptAccordion }}}
+    {{#if transcriptContent}}
+        {{{ transcriptAccordion }}}
+    {{/if}}
 
 </section>