Merge pull request #1841 from smeup/9-6-3

v9.6.3
smeup · Apr 2, 2024 · dbb5fa3 · dbb5fa3
2 parents 600f7ac + d2b8cba
commit dbb5fa3
Show file tree

Hide file tree

Showing 44 changed files with 4,049 additions and 1,737 deletions.
diff --git a/.github/workflows/continuum.yaml b/.github/workflows/continuum.yaml
@@ -50,7 +50,7 @@ jobs:
 
     # Prepare GitHub Pages Showcase deployment
     - name: Setup GitHub Pages
-      uses: actions/configure-pages@v4
+      uses: actions/configure-pages@v5
     - name: Upload GitHub Pages artifact
       uses: actions/upload-pages-artifact@v3
       with:
@@ -84,7 +84,18 @@ jobs:
           -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"}'
+          https://api.github.com/repos/smeup/webup-project/actions/workflows/continuum.yaml/dispatches \
+          -d '{"ref": "develop"}'
   
-  # TODO: add webup.js triggers
+  trigger-webupjs-develop:
+    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.js/actions/workflows/develop-release.yaml/dispatches \
+          -d '{"ref": "develop"}'
diff --git a/.github/workflows/staging.yaml b/.github/workflows/staging.yaml
@@ -0,0 +1,40 @@
+name: staging
+
+on:
+  push:
+    branches:
+      - staging
+
+env:
+  AWS_REGION: eu-south-1
+
+jobs:
+  showcase-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: 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 sync packages/ketchup-showcase/dist/ s3://smeup-ketchup/staging/ --delete
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.2",
+    "version": "9.6.3",
     "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.2",
+        "@sme.up/ketchup": "^9.6.3",
         "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.2",
+    "@sme.up/ketchup": "^9.6.3",
     "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.2"
-            >v9.6.2</a
+          ><a href="https://github.com/smeup/ketchup/releases/tag/v9.6.3"
+            >v9.6.3</a
           ></div
         ></div
       >
@@ -82,7 +82,7 @@
           size-y="24px"
         ></kup-image>
       </a>
-      <span class="company-text">© Copyright 2022 - Sme.UP Spa</span>
+      <span class="company-text">© Copyright 2024 - Sme.UP Spa</span>
       <a
         class="footer__icon--trailing"
         target="_blank"

diff --git a/packages/ketchup-showcase/src/views/components/advanced/datatable/examples/DatatableDemo.vue b/packages/ketchup-showcase/src/views/components/advanced/datatable/examples/DatatableDemo.vue
@@ -360,6 +360,14 @@ export default {
           default: 'false',
           try: 'switch',
         },
+        {
+          prop: 'legacyLook',
+          description:
+            'When enabled, the extra whitespaces will be displayed and the font will be set to monospace by default.',
+          type: 'boolean',
+          default: 'false',
+          try: 'switch',
+        },
         {
           prop: 'lineBreakCharacter',
           description:

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

diff --git a/packages/ketchup/scripts/F-COMPONENTS-SASS-COMPILER.md b/packages/ketchup/scripts/F-COMPONENTS-SASS-COMPILER.md
@@ -78,6 +78,7 @@ I also tried to use a file importer, but without much success and the `loadPaths
 const parsedStyle = sass.compileString(
     `
     @import 'global.scss';
+    @import 'fonts.scss';
     @import '${componentName}.scss';
 `,
     {

diff --git a/packages/ketchup/scripts/fcomponentsSassParse.js b/packages/ketchup/scripts/fcomponentsSassParse.js
@@ -78,6 +78,7 @@ for (const componentName of componentsFolders) {
                 const parsedStyle = sass.compileString(
                     `
                     @import 'global.scss';
+                    @import 'fonts.scss';
                     @import '${componentName}.scss';
                 `,
                     {
@@ -147,6 +148,7 @@ for (const fileName of KUP_THEME_FILES_TO_PARSE) {
             const parsedStyle = sass.compileString(
                 `
                     @import 'global.scss';
+                    @import 'fonts.scss';
                     @import '${fileName}.scss';
                 `,
                 sassParserOptions

diff --git a/packages/ketchup/src/assets/data-table.js b/packages/ketchup/src/assets/data-table.js
@@ -553,15 +553,20 @@ const completeData = {
                                 checked: true,
                                 value: '10',
                             },
+                            {
+                                checked: false,
+                                value: '20',
+                            },
                         ],
                     },
                     obj: {
-                        k: '10',
+                        k: '10;20',
                         p: 'B£WAR',
                         t: 'TA',
                     },
+                    isEditable: true,
                     shape: 'Rad',
-                    value: '10',
+                    value: '10;20',
                 },
                 RATING: {
                     isEditable: true,

diff --git a/packages/ketchup/src/assets/image-list.js b/packages/ketchup/src/assets/image-list.js
@@ -12,6 +12,18 @@ const data = [
                         icon: 'view-quilt',
                         value: 'Box',
                         visible: true,
+                        badgeData: [
+                            {
+                                imageData: {
+                                    resource:
+                                        'https://ketchup.smeup.com/ketchup-showcase/header_logo_dark.svg',
+                                    sizeX: '1.75rem',
+                                    sizeY: 'auto',
+                                    color: 'var(--kup-text-on-primary-color)',
+                                },
+                                position: 'BL',
+                            },
+                        ],
                     },
                     {
                         cells: {
@@ -612,3 +624,11 @@ imageList.selectable = true;
 document.addEventListener('kup-imagelist-click', (e) => {
     console.log(e);
 });
+
+document.addEventListener('kup-imagelist-contextmenu', (e) => {
+    console.log(e);
+});
+
+document.addEventListener('kup-imagelist-dblclick', (e) => {
+    console.log(e);
+});
diff --git a/packages/ketchup/src/assets/index.js b/packages/ketchup/src/assets/index.js
@@ -190,6 +190,10 @@ components.data = [
         value: 'Planner example 5',
         id: 'planner-example-5.html',
     },
+    {
+        value: 'Planner example 6',
+        id: 'planner-example-6.html',
+    },
     {
         value: 'Progress Bar',
         id: 'progress-bar.html',