Merge pull request #1806 from smeup/dev-to-mas

v9.6.2
smeup · Mar 12, 2024 · 61d6a9a · 61d6a9a
2 parents 1046cd1 + 27ff586
commit 61d6a9a
Show file tree

Hide file tree

Showing 19 changed files with 360 additions and 111 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,14 +1,12 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for more information:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-# https://containers.dev/guide/dependabot
-
 version: 2
 updates:
-    - package-ecosystem: 'devcontainers'
-      directory: '/'
-      schedule:
-          interval: weekly
-      ignore:
-          - dependency-name: '*'
+  - package-ecosystem: 'devcontainers'
+    directory: '/'
+    schedule:
+      interval: weekly
+    ignore:
+      - dependency-name: '*'
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: weekly
diff --git a/.github/workflows/continuum.yaml b/.github/workflows/continuum.yaml
@@ -0,0 +1,92 @@
+name: continuum
+
+on:
+  push:
+    branches:
+      - develop
+
+env:
+  VERSION: 10.0.0-SNAPSHOT
+  AWS_REGION: eu-south-1
+
+jobs:
+  ketchup-release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: "18.16.0"
+        cache: "yarn"
+
+    - name: Install dependencies
+      run: yarn install --immutable
+
+    - name: Run Ketchup build
+      run: npm run k:build
+
+    - name: Run Ketchup Showcase build
+      run: npm run ksc:build
+
+    - name: Zip artifacts
+      run: |
+        cd packages/ketchup/dist
+        zip -qr /tmp/ketchup.zip *
+        ls -alh ketchup.zip
+        zip -qr /tmp/ketchup-components.zip ketchup/*
+        ls -alh ketchup-components.zip
+    
+    - name: Setup AWS
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ env.AWS_REGION }}
+
+    - name: Upload artifacts to AWS S3
+      run: |
+        aws s3 cp /tmp/ketchup.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ env.VERSION }}/zip/ketchup.zip
+        aws s3 cp /tmp/ketchup-components.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ env.VERSION }}/zip/ketchup-components.zip
+
+    # Prepare GitHub Pages Showcase deployment
+    - name: Setup GitHub Pages
+      uses: actions/configure-pages@v4
+    - name: Upload GitHub Pages artifact
+      uses: actions/upload-pages-artifact@v3
+      with:
+        path: "./packages/ketchup-showcase/dist"
+
+  # Showcase Deployment Job
+  showcase-release:
+    needs: ketchup-release
+    runs-on: ubuntu-latest
+    # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
+    permissions:
+      pages: write      # to deploy to Pages
+      id-token: write   # to verify the deployment originates from an appropriate source
+
+    # Deploy to the github-pages environment
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+
+  trigger-webup-continuum:
+    needs: ketchup-release
+    runs-on: ubuntu-latest
+    steps:
+    - run: |
+        curl -L \
+          -X POST \
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{ secrets.ROBBY_SMEUP_PAT }}" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          https://api.github.com/repos/smeup/webup-project/dispatches \
+          -d '{"event_type": "ketchup-continuum-rebuild"}'
+  
+  # TODO: add webup.js triggers
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -0,0 +1,49 @@
+name: release
+
+on:
+  push:
+    tags: "*"
+
+env:
+  AWS_REGION: eu-south-1
+
+jobs:
+  ketchup-release:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: "18.16.0"
+        cache: "yarn"
+
+    - name: Install dependencies
+      run: yarn install --immutable
+
+    - name: Run Ketchup build
+      run: npm run k:build
+
+    - name: Run Ketchup Showcase build
+      run: npm run ksc:build
+
+    - name: Zip artifacts
+      run: |
+        cd packages/ketchup/dist
+        zip -qr /tmp/ketchup.zip *
+        ls -alh ketchup.zip
+        zip -qr /tmp/ketchup-components.zip ketchup/*
+        ls -alh ketchup-components.zip
+
+    - name: Setup AWS
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ env.AWS_REGION }}
+
+    - name: Upload artifacts to AWS S3
+      run: |
+        aws s3 cp /tmp/ketchup.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ github.ref_name }}/zip/ketchup.zip
+        aws s3 cp /tmp/ketchup-components.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ github.ref_name }}/zip/ketchup-components.zip
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml
@@ -0,0 +1,31 @@
+name: Ketchup Unit Test
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - master
+
+jobs:
+  unit-test:
+    runs-on: ubuntu-latest
+    concurrency:
+      group: generate-docs-${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: "18.16.0"
+        cache: "yarn"
+
+    - name: Install dependencies
+      run: yarn install --immutable
+
+    - name: Run build
+      run: npm run k:build
+
+    - name: Execute tests
+      run: npm run k:test:unit
diff --git a/packages/ketchup-react/package.json b/packages/ketchup-react/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sme.up/ketchup-react",
-    "version": "9.6.1",
+    "version": "9.6.2",
     "module": "dist/index.js",
     "typings": "dist/index.d.ts",
     "keywords": [
@@ -20,7 +20,7 @@
     "description": "Ketchup React Components library by smeup",
     "license": "Apache-2.0",
     "dependencies": {
-        "@sme.up/ketchup": "^9.6.1",
+        "@sme.up/ketchup": "^9.6.2",
         "react": "^18.2.0",
         "react-dom": "^18.2.0"
     },

diff --git a/packages/ketchup-showcase/package.json b/packages/ketchup-showcase/package.json
@@ -19,7 +19,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@sme.up/ketchup": "^9.6.1",
+    "@sme.up/ketchup": "^9.6.2",
     "core-js": "^3.30.2",
     "vue": "^2.6.14",
     "vue-router": "^3.5.1"

diff --git a/packages/ketchup-showcase/src/App.vue b/packages/ketchup-showcase/src/App.vue
@@ -55,8 +55,8 @@
           @kup-tree-nodeselected="treeClick"
         ></kup-tree
         ><div class="version"
-          ><a href="https://github.com/smeup/ketchup/releases/tag/v9.6.1"
-            >v9.6.1</a
+          ><a href="https://github.com/smeup/ketchup/releases/tag/v9.6.2"
+            >v9.6.2</a
           ></div
         ></div
       >

diff --git a/packages/ketchup-showcase/src/mock/dataTableCellClasses.ts b/packages/ketchup-showcase/src/mock/dataTableCellClasses.ts
@@ -747,6 +747,35 @@ export const cellClassesDataTable = {
         },
       },
     },
+    {
+      cells: {
+        CSSCLASS: {
+          obj: {
+            t: '',
+            p: '',
+            k: '',
+          },
+          value: 'c-pre',
+        },
+        DESCR: {
+          obj: {
+            t: '',
+            p: '',
+            k: '',
+          },
+          value: 'Cell content will preserve whitespaces.',
+        },
+        EXAMPLE: {
+          obj: {
+            t: '',
+            p: '',
+            k: '',
+          },
+          value: '              c-pre',
+          cssClass: 'c-pre',
+        },
+      },
+    },
     {
       cells: {
         CSSCLASS: {

diff --git a/packages/ketchup/package.json b/packages/ketchup/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sme.up/ketchup",
-    "version": "9.6.1",
+    "version": "9.6.2",
     "keywords": [
         "smeup",
         "KetchUP",

diff --git a/packages/ketchup/src/components/kup-card/built-in/kup-card-built-in-7.scss b/packages/ketchup/src/components/kup-card/built-in/kup-card-built-in-7.scss
@@ -100,4 +100,12 @@
     right: 0;
     transition: background-color 125ms ease, opacity 250ms ease;
   }
+
+  .fun {
+    font-weight: bold;
+    &:hover {
+      text-decoration: underline;
+      cursor: pointer;
+    }
+  }
 }