Merge pull request #591 from digirati-co-uk/feature/v2.1

v2.1

.env

@@ -28,8 +28,6 @@ POSTGRES_SEARCH_API_USER=search_api
 POSTGRES_SEARCH_API_SCHEMA=search_api
 POSTGRES_SEARCH_API_PASSWORD=search_api_password
 
-GATEWAY_HOST=http://localhost:8888
-
 # New SMTP
 SMTP_HOST=host.docker.internal
 SMTP_PORT=1025
@@ -38,4 +36,10 @@ SMTP_USER=project.1
 SMTP_PASSWORD=secret.1
 
 MAIL_FROM_USER="Madoc local <noreply@madoc.io>"
-MADOC_INSTALLATION_CODE="$2b$14$eofdZp3nY.HyK68a9zCfoOs3fuphxHRAR/KhckFm.8Qi8sEmgMcCK"
+MADOC_INSTALLATION_CODE='$2b$14$eofdZp3nY.HyK68a9zCfoOs3fuphxHRAR/KhckFm.8Qi8sEmgMcCK'
+
+# HTTPS
+# LOCAL PORT FOR HTTPS, CAN BE CHANGED
+PORTS_GATEWAY_HTTPS=443
+#GATEWAY_HOST=http://localhost:8888 <-- change for http
+GATEWAY_HOST=https://madoc.local

.github/workflows/madoc-ts-docker.yaml

@@ -5,7 +5,7 @@ on:
     branches: ['main']
     tags: ['v*']
   pull_request:
-    branches: ['main']
+    branches: ['main', 'feature/v2.1']
     paths:
       - ".github/workflows/madoc-ts-docker.yaml"
       - "services/madoc-ts/src/**"

.github/workflows/madoc-ts.yaml

@@ -33,14 +33,13 @@ on:
 jobs:
   madoc-ts-build:
     runs-on: ubuntu-latest
-
     name: Node build
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 18
 
       - name: Get yarn cache
         id: yarn-cache
@@ -58,13 +57,25 @@ jobs:
 
       - uses: actions/cache@v1
         with:
-          path: services/madoc-ts/.cache
-          key: typescript-cache
+          path: services/madoc-ts/node_modules/.vite
+          key: vite-cache
           restore-keys: |
-            typescript-cache
+            vite-cache
+
+      - working-directory: services/madoc-ts
+        run: yarn run build:vite-producer
+
+      - working-directory: services/madoc-ts
+        run: yarn run build:vite-auth
+
+      - working-directory: services/madoc-ts
+        run: yarn run build:vite-server
+
+      - working-directory: services/madoc-ts
+        run: yarn run build:vite-scheduler
 
       - working-directory: services/madoc-ts
-        run: yarn run build
+        run: yarn run build:frontend
 
       - working-directory: services/madoc-ts
         run: yarn run test

.github/workflows/test-storybook.yaml

@@ -0,0 +1,52 @@
+name: Test storybook
+
+on:
+  pull_request:
+    types: [ labeled, push ]
+
+jobs:
+  build:
+    if: ${{ contains( github.event.pull_request.labels.*.name, 'test-storybook') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 18
+
+      - name: Get yarn cache
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v1
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-yarn-madoc-ts-${{ hashFiles('services/madoc-ts/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-madoc-ts-
+
+      - working-directory: services/madoc-ts
+        run: yarn install --frozen-lockfile --non-interactive
+
+      - uses: actions/cache@v1
+        with:
+          path: services/madoc-ts/node_modules/.vite
+          key: vite-cache
+          restore-keys: |
+            vite-cache
+
+      - name: Install Playwright
+        working-directory: services/madoc-ts
+        run: npx playwright install --with-deps
+
+      - name: Build Storybook
+        working-directory: services/madoc-ts
+        run: yarn build-storybook --quiet
+
+      - name: Serve Storybook and run tests
+        working-directory: services/madoc-ts
+        run: |
+          npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \
+            "npx http-server storybook-static --port 6500 --silent" \
+            "npx wait-on tcp:6006 && yarn test-storybook --ci"

.gitignore

@@ -1,19 +1,17 @@
 .idea
-var/database/data
-var/files/*
+.run
 theme.zip
 node_modules
-var/shared-database/*
-var/certs/*
-var/jwt/*
-var/test-environment
+var/*
 key.pub
 .terraform
 infrastructure/ansible/inventory.yml
 infrastructure/ansible/vars/default.yml
 var_backup
 e2e/cypress/fixtures/madoc-test-fixtures
+services/enrichment
 services/search
 services/madoc-remix
 services/madoc-ts/service-jwts/madoc-remix.json
 e2e/test-fixtures/postgres/default/default.sql
+.DS_Store