Merge remote-tracking branch 'origin/main' into validation

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/prototypes/basic"
+  schedule:
+    interval: "weekly"
+- package-ecosystem: npm
+  directory: "/lib/importer"
+  schedule:
+    interval: "weekly"

.github/workflows/lint.yml

@@ -0,0 +1,22 @@
+name: Lint JS
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+jobs:
+  lint-importer:
+    defaults:
+      run:
+        working-directory: ./lib/importer
+    timeout-minutes: 5
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: lts/*
+    - name: Install dependencies
+      run: npm i
+    - name: Run linter
+      run: npm run lint

.github/workflows/test.yml

@@ -0,0 +1,48 @@
+name: Tests
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+jobs:
+  test:
+    defaults:
+      run:
+        working-directory: ./prototypes/basic
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: lts/*
+    - name: Install lib dependencies -- todo, check why
+      working-directory: ./lib/importer
+      run: npm i
+    - name: Install dependencies
+      run: npm i
+    - name: Install Playwright Browsers
+      run: npx playwright install --with-deps
+    - name: Run Playwright tests
+      run: npx playwright test
+    - uses: actions/upload-artifact@v4
+      if: always()
+      with:
+        name: test-results
+        path: ./prototypes/basic/test-results
+        retention-days: 30
+  importer:
+    defaults:
+      run:
+        working-directory: ./lib/importer
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: lts/*
+    - name: Install lib dependencies
+      run: npm i
+    - name: Run tests
+      run: npm run test

Makefile

@@ -1,10 +1,21 @@
 
+update-deps:
+	@echo "***************************"
+	@echo "** Updating importer lib **"
+	@echo "***************************"
+	@cd lib/importer && npm install
+	@echo "***********************************"
+	@echo "** Default development prototype **"
+	@echo "***********************************"
+	@cd prototypes/basic && npm install
+
 
 .PHONY: prototype
-prototype:
 ifndef NAME
-    $(error Need a value for NAME, e.g., make prototype NAME=value)
-endif
+prototype:
+	$(error Need a value for NAME, e.g., make prototype NAME=value)
+else
+prototype:
 	@cd lib/importer && npm install
 	@mkdir -p prototypes/${NAME}
 	@cd prototypes/${NAME} && npx govuk-prototype-kit@latest create && npm install ../../lib/importer
@@ -17,3 +28,5 @@ endif
 	    cd prototypes/${NAME}\n\
 	    npm run dev\n\
 	"
+endif
+

doc/.gitignore

@@ -1,16 +1,28 @@
 selectable_table.css
+sheet_selector.css
+x-govuk-masthead.css
+docs.css
+get-started-screenshots.png
 class_list.js
 keys.js
 selectable_polyfills.js
 selectable_table.js
-docs.css
-init.js
+sheet_selector.js
+logo.png
+mainpage-screenshots.png
 govuk-frontend.min.js
+init.js
 auto-store-data.js
 kit.js
 application.js
 application.css
+articles.html
+component-sheet-selector.html
 component-table-view.html
+how-it-works.html
 index.html
 pattern-tabular-data.html
+start.html
+what-it-is.html
 assets.mk
+assets.txt

doc/Makefile

@@ -10,13 +10,15 @@ $(error "No hq on the PATH? https://github.com/ludovicianul/hq/releases/tag/hq-1
 endif
 
 SOURCES := $(wildcard ../lib/importer/assets/docs/*.html)
+IMAGES := $(wildcard ../lib/importer/assets/docs/*.png)
 OBJECTS := $(subst ../lib/importer/assets/docs/,./,${SOURCES})
 
 # Create a list of all of the assets the pages need, by looking at the scripts
 # and stylesheets they intended to download.
 assets.txt: ${SOURCES}
 	(echo $^ | xargs -n1 | xargs -I INPUT ${HQ} -r '[data-plugin-only]' -f INPUT -a src 'script[src]'; \
-	 echo $^ | xargs -n1 | xargs -I INPUT ${HQ} -r '[data-plugin-only]' -f INPUT -a href 'link[rel=stylesheet]') | \
+	 echo $^ | xargs -n1 | xargs -I INPUT ${HQ} -r '[data-plugin-only]' -f INPUT -a href 'link[rel=stylesheet]'; \
+         echo ${IMAGES} | xargs -n1 | sed 's_\.\./lib/importer/assets/docs/_./_') | \
 		sort -u | grep . > $@
 
 # Now build a Makefile dependency include, specifying the correct download
@@ -41,7 +43,7 @@ include assets.mk
 # We can generate the .gitignore from all of the things we know we are going to
 # end up with in the root dir.
 .gitignore: assets.txt
-	(cat $^; printf '%s\n' ${OBJECTS}; echo assets.mk) | xargs -n1 basename > $@
+	(cat $^; printf '%s\n' ${OBJECTS}; echo assets.mk; echo assets.txt) | xargs -n1 basename > $@
 all: .gitignore
 
 # Download the page and remove any elements marked only for plugin use.
@@ -52,7 +54,7 @@ all: .gitignore
 # Download the asset. This is the easiest way to get the real thing, as some of
 # them (e.g. application.css) are generated by the Prototype Kit and can't just
 # be copied from the disk.
-%.css %.js:
+%.css %.js %.png:
 	curl --fail-with-body -o $@ -sL http://localhost:3000${SRC} || cat $@
 
 .PHONY: clean

fixtures/small-file.csv

@@ -0,0 +1,2 @@
+A,B
+1,2

lib/importer/assets/css/range_selector.css

@@ -0,0 +1,3 @@
+.rd-range-selector {
+    overflow-x: auto;
+}

lib/importer/assets/css/selectable_table.css

@@ -8,6 +8,8 @@ table.selectable {
 
 table.selectable caption {
     text-align: inherit;
+    white-space: nowrap;
+    overflow: hidden;
 }
 
 table.selectable col:not(:first-child) {

lib/importer/assets/docs/articles.html

@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>Data Upload Design Kit: Articles</title>
+    <link href="/public/stylesheets/application.css" rel="stylesheet" type="text/css" />
+    <link href="../css/selectable_table.css" rel="stylesheet" type="text/css" />
+    <link href="./docs.css" rel="stylesheet" type="text/css" />
+    <link href="../css/x-govuk-masthead.css" rel="stylesheet" type="text/css" />
+    <style type="text/css" data-plugin-only>
+        [data-static-only] {
+            display: none;
+        }
+    </style>
+    <style type="text/css">
+      ul#article-list {
+          list-style-type: none;
+          padding: 0;
+      }
+      ul#article-list li {
+          display: flex;
+          flex-direction: row;
+          flex-wrap: nowrap;
+          align-items: start;
+          gap: 1em;
+      }
+      ul#article-list li a.image {
+          width: 30%;
+      }
+      ul#article-list li a.image img {
+          width: 100%;
+      }
+      ul#article-list li p {
+      }
+    </style>
+    <link data-plugin-only rel="icon" sizes="48x48"
+        href="/manage-prototype/dependencies/govuk-frontend/dist/govuk/assets/images/favicon.ico">
+    <link data-plugin-only rel="icon" sizes="any"
+        href="/manage-prototype/dependencies/govuk-frontend/dist/govuk/assets/images/favicon.svg" type="image/svg+xml">
+    <link data-plugin-only rel="mask-icon"
+        href="/manage-prototype/dependencies/govuk-frontend/dist/govuk/assets/images/govuk-icon-mask.svg"
+        color="#0b0c0c">
+    <link data-plugin-only rel="apple-touch-icon"
+        href="/manage-prototype/dependencies/govuk-frontend/dist/govuk/assets/images/govuk-icon-180.png">
+</head>
+
+<body class="govuk-template__body">
+    <a href="#main-content" class="govuk-skip-link" data-module="govuk-skip-link">Skip to main content</a>
+    <header class="govuk-header">
+        <div class="govuk-header__container govuk-width-container">
+            <div class="govuk-header__logo" data-plugin-only>
+                <a href="/manage-prototype" class="govuk-header__link govuk-header__link--homepage">
+                    <svg focusable="false" role="img" class="govuk-header__logotype" xmlns="http://www.w3.org/2000/svg"
+                        viewBox="0 0 148 30" height="30" width="148" aria-label="GOV.UK">
+                        <title>GOV.UK</title>
+                        <path
+                            d="M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8m28.3-11.6c0 .9.1 1.7.3 2.5.2.8.6 1.5 1 2.2.5.6 1 1.1 1.7 1.5.7.4 1.5.6 2.5.6.9 0 1.7-.1 2.3-.4s1.1-.7 1.5-1.1c.4-.4.6-.9.8-1.5.1-.5.2-1 .2-1.5v-.2h-5.3v-3.2h9.4V28H55v-2.5c-.3.4-.6.8-1 1.1-.4.3-.8.6-1.3.9-.5.2-1 .4-1.6.6s-1.2.2-1.8.2c-1.5 0-2.9-.3-4-.8-1.2-.6-2.2-1.3-3-2.3-.8-1-1.4-2.1-1.8-3.4-.3-1.4-.5-2.8-.5-4.3s.2-2.9.7-4.2c.5-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.6 2.6-.8 4.1-.8 1 0 1.9.1 2.8.3.9.2 1.7.6 2.4 1s1.4.9 1.9 1.5c.6.6 1 1.3 1.4 2l-3.7 2.1c-.2-.4-.5-.9-.8-1.2-.3-.4-.6-.7-1-1-.4-.3-.8-.5-1.3-.7-.5-.2-1.1-.2-1.7-.2-1 0-1.8.2-2.5.6-.7.4-1.3.9-1.7 1.5-.5.6-.8 1.4-1 2.2-.3.8-.4 1.9-.4 2.7zM71.5 6.8c1.5 0 2.9.3 4.2.8 1.2.6 2.3 1.3 3.1 2.3.9 1 1.5 2.1 2 3.4s.7 2.7.7 4.2-.2 2.9-.7 4.2c-.4 1.3-1.1 2.4-2 3.4-.9 1-1.9 1.7-3.1 2.3-1.2.6-2.6.8-4.2.8s-2.9-.3-4.2-.8c-1.2-.6-2.3-1.3-3.1-2.3-.9-1-1.5-2.1-2-3.4-.4-1.3-.7-2.7-.7-4.2s.2-2.9.7-4.2c.4-1.3 1.1-2.4 2-3.4.9-1 1.9-1.7 3.1-2.3 1.2-.5 2.6-.8 4.2-.8zm0 17.6c.9 0 1.7-.2 2.4-.5s1.3-.8 1.7-1.4c.5-.6.8-1.3 1.1-2.2.2-.8.4-1.7.4-2.7v-.1c0-1-.1-1.9-.4-2.7-.2-.8-.6-1.6-1.1-2.2-.5-.6-1.1-1.1-1.7-1.4-.7-.3-1.5-.5-2.4-.5s-1.7.2-2.4.5-1.3.8-1.7 1.4c-.5.6-.8 1.3-1.1 2.2-.2.8-.4 1.7-.4 2.7v.1c0 1 .1 1.9.4 2.7.2.8.6 1.6 1.1 2.2.5.6 1.1 1.1 1.7 1.4.6.3 1.4.5 2.4.5zM88.9 28 83 7h4.7l4 15.7h.1l4-15.7h4.7l-5.9 21h-5.7zm28.8-3.6c.6 0 1.2-.1 1.7-.3.5-.2 1-.4 1.4-.8.4-.4.7-.8.9-1.4.2-.6.3-1.2.3-2v-13h4.1v13.6c0 1.2-.2 2.2-.6 3.1s-1 1.7-1.8 2.4c-.7.7-1.6 1.2-2.7 1.5-1 .4-2.2.5-3.4.5-1.2 0-2.4-.2-3.4-.5-1-.4-1.9-.9-2.7-1.5-.8-.7-1.3-1.5-1.8-2.4-.4-.9-.6-2-.6-3.1V6.9h4.2v13c0 .8.1 1.4.3 2 .2.6.5 1 .9 1.4.4.4.8.6 1.4.8.6.2 1.1.3 1.8.3zm13-17.4h4.2v9.1l7.4-9.1h5.2l-7.2 8.4L148 28h-4.9l-5.5-9.4-2.7 3V28h-4.2V7zm-27.6 16.1c-1.5 0-2.7 1.2-2.7 2.7s1.2 2.7 2.7 2.7 2.7-1.2 2.7-2.7-1.2-2.7-2.7-2.7z">
+                        </path>
+                    </svg>
+                </a>
+            </div>
+            <div id="static-header" data-static-only>
+                <a href="./index.html" class="govuk-header__link govuk-header__link--homepage">Data Upload Design Kit</a>
+            </div>
+            <div class="govuk-header__content">
+                <a href="/manage-prototype" data-plugin-only class="govuk-header__link govuk-header__service-name">
+                    Prototype Kit
+                </a>
+            </div>
+        </div>
+    </header>
+
+    <div class="govuk-width-container">
+      <div class="govuk-breadcrumbs">
+        <ol class="govuk-breadcrumbs__list">
+          <li class="govuk-breadcrumbs__list-item">
+            <a class="govuk-breadcrumbs__link" href="./index.html">Home</a>
+          </li>
+          <li class="govuk-breadcrumbs__list-item">
+            <a class="govuk-breadcrumbs__link" href="./articles.html">Articles</a>
+          </li>
+        </ol>
+      </div>
+      <main id="main-content" class="govuk-main-wrapper">
+        <div class="govuk-grid-row">
+          <div class="govuk-grid-column-one-quarter-from-desktop">
+            <nav class="sub-navigation" aria-labelledby="sub-navigation-heading">
+              <h2 id="sub-navigation-heading" class="govuk-visually-hidden">Pages in this section</h2>
+              <h3 class="sub-navigation-heading">Introduction</h3>
+              <ul class="sub-navigation-section">
+                <li class="sub-navigation-item false"><a class="sub-navigation-link" href="./what-it-is.html">What it is</a></li>
+                <li class="sub-navigation-item false"><a class="sub-navigation-link" href="./how-it-works.html">How it works</a></li>
+                <li class="sub-navigation-item false"><a class="sub-navigation-link" href="./start.html">Get started</a></li>
+                <li class="sub-navigation-item sub-navigation-item-current"><a aria-current="true" class="sub-navigation-link" href="./articles.html">Articles</a></li>
+              </ul>
+              <h3 class="sub-navigation-heading">Patterns and Components</h3>
+              <ul class="sub-navigation-section">
+                <li class="sub-navigation-item false"><a class="sub-navigation-link" href="./pattern-tabular-data.html">Tabular data</a></li>
+                <li class="sub-navigation-item false"><a class="sub-navigation-link" href="./component-table-view.html">Table view</a></li>
+                <li class="sub-navigation-item false"><a class="sub-navigation-link" href="./component-sheet-selector.html">Sheet selector</a></li>
+              </ul>
+            </nav>
+          </div>
+          <div class="govuk-grid-column-three-quarters-from-desktop">
+            <article class="app-prose">
+              <h1 class="govuk-heading-xl">Articles</h1>
+
+              <p>Here are some articles that offer more information about the <a href="index.html">Data Upload Design Kit</a>:</p>
+
+              <ul id="article-list">
+                <li>
+                  <a href="https://www.register-dynamics.co.uk/blog/collect-data-for-your-govuk-service-in-minutes-using-our-data-upload-design-kit" class="image">
+                    <img src="logo.png" />
+                  </a>
+                  <p><a href="https://www.register-dynamics.co.uk/blog/collect-data-for-your-govuk-service-in-minutes-using-our-data-upload-design-kit">Collect data for your GOV.UK service in minutes using our Data Upload Design Kit</a></p>
+                </li>
+              </ul>
+            </article>
+          </div>
+        </div>
+      </main>
+    </div>
+    <footer class="govuk-footer">
+        <div class="govuk-width-container">
+            <div class="govuk-footer__meta">
+                <div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
+                    <svg aria-hidden="true" focusable="false" class="govuk-footer__licence-logo"
+                        xmlns="http://www.w3.org/2000/svg" viewBox="0 0 483.2 195.7" height="17" width="41">
+                        <path fill="currentColor"
+                            d="M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145" />
+                    </svg>
+                    <span class="govuk-footer__licence-description">
+                        All content is available under the
+                        <a class="govuk-footer__link"
+                            href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"
+                            rel="license">Open Government Licence v3.0</a>, except where otherwise stated
+                    </span>
+                </div>
+                <div class="govuk-footer__meta-item">
+                    <a href="https://www.register-dynamics.co.uk"
+                        class="govuk-footer__link govuk-footer__copyright-logo rd-logo">
+                        &copy; Register Dynamics 2024
+                    </a>
+                </div>
+            </div>
+        </div>
+    </footer>
+</body>
+
+</html>