Merge branch 'develop' into staging

smeup · Jun 10, 2024 · df17e48 · df17e48
2 parents 63103df + 52b6843
commit df17e48
Show file tree

Hide file tree

Showing 231 changed files with 2,802 additions and 2,021 deletions.
diff --git a/.github/workflows/continuum.yaml b/.github/workflows/continuum.yaml
@@ -35,7 +35,7 @@ jobs:
         cd packages/ketchup/dist
         zip -qr /tmp/ketchup.zip *
         zip -qr /tmp/ketchup-components.zip ketchup/*
-    
+
     - name: Setup AWS
       uses: aws-actions/configure-aws-credentials@v4
       with:
@@ -74,8 +74,56 @@ jobs:
         id: deployment
         uses: actions/deploy-pages@v4
 
-  trigger-webup-continuum:
+  build:
+    runs-on: ubuntu-latest
     needs: ketchup-release
+    steps:
+        - uses: actions/checkout@v4
+        - uses: actions/setup-node@v4
+          with:
+              node-version: '18.x'
+              registry-url: 'https://registry.npmjs.org'
+
+        - name: Install dependencies
+          run: yarn install --no-immutable
+
+        - name: Update Ketchup Version with Timestamp
+          run: |
+              cd packages/ketchup
+              VERSION=$(node -p "require('./package.json').version")
+              TIMESTAMP=$(date +%Y%m%d%H%M%S)
+              NEW_VERSION="${VERSION}-${TIMESTAMP}"
+              echo "New version: $NEW_VERSION"
+              sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
+
+        - name: Update Ketchup React Version with Timestamp
+          run: |
+              cd packages/ketchup-react
+              VERSION=$(node -p "require('./package.json').version")
+              TIMESTAMP=$(date +%Y%m%d%H%M%S)
+              NEW_VERSION="${VERSION}-${TIMESTAMP}"
+              echo "New version: $NEW_VERSION"
+              sed -i "s/\"version\": \"$VERSION\"/\"version\": \"$NEW_VERSION\"/" ./package.json
+
+        - name: Run Ketchup build
+          run: npm run k:build
+
+        - name: Publish Ketchup
+          run: |
+              cd packages/ketchup
+              npm publish
+          env:
+              NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+        - name: Publish Ketchup React
+          run: |
+              cd packages/ketchup-react
+              npm publish
+          env:
+              NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  trigger-webup-continuum:
+    needs: build
     runs-on: ubuntu-latest
     steps:
     - run: |
@@ -86,9 +134,9 @@ jobs:
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/smeup/webup-project/actions/workflows/continuum.yaml/dispatches \
           -d '{"ref": "develop"}'
-  
+
   trigger-webupjs-develop:
-    needs: ketchup-release
+    needs: build
     runs-on: ubuntu-latest
     steps:
     - run: |

diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ import { defineCustomElements } from '@sme.up/ketchup/dist/loader';
 defineCustomElements(window);
 ```
 
--   Use Ketchup components in your pages. About components and their props and events see [Ketchup Showcase](https://ketchup.smeup.com/). A simple sample for a Ketchup button can be:
+-   Use Ketchup components in your pages. About components and their props and events see [Ketchup Showcase](https://smeup.github.io/ketchup/). A simple sample for a Ketchup button can be:
 
 ```
 <kup-button label="I'm a button" @kup-button-click="myButtonAction" />

diff --git a/docs/styleGuide.md b/docs/styleGuide.md
@@ -69,7 +69,7 @@ Ideally, component classes should be structured like this:
     /**
      * Custom style of the component.
      * @default ""
-     * @see https://ketchup.smeup.com/ketchup-showcase/#/customization
+     * @see https://smeup.github.io/ketchup/#/customization
      */
     @Prop() customStyle: string = '';
 ```
@@ -230,7 +230,7 @@ Almost all Ketchup components should include these features:
 -   customStyle
 -   debugging
 
-The `customStyle` prop allows a custom stylesheet to be defined inside a component. More info [here](https://ketchup.smeup.com/ketchup-showcase/#/customization).
+The `customStyle` prop allows a custom stylesheet to be defined inside a component. More info [here](https://smeup.github.io/ketchup/#/customization).
 
 Debugging is useful to understand a component's performances.
 
@@ -251,7 +251,7 @@ Both these features (among many others) reside in an API called `KupManager`, wh
     /**
      * Custom style of the component.
      * @default ""
-     * @see https://ketchup.smeup.com/ketchup-showcase/#/customization
+     * @see https://smeup.github.io/ketchup/#/customization
      */
     @Prop() customStyle: string = '';
 ```

diff --git a/packages/ketchup-showcase/src/views/components/advanced/box/examples/BoxDemo.vue b/packages/ketchup-showcase/src/views/components/advanced/box/examples/BoxDemo.vue
@@ -184,7 +184,7 @@ export default {
         {
           prop: 'customStyle',
           description:
-            'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
+            'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
           type: 'string',
           default: '""',
           try: 'css',

diff --git a/...es/ketchup-showcase/src/views/components/advanced/buttonlist/examples/ButtonlistBasic.vue b/...es/ketchup-showcase/src/views/components/advanced/buttonlist/examples/ButtonlistBasic.vue
@@ -3,9 +3,7 @@
     <div class="demo-wrapper">
       <p
         >Button lists are a set of
-        <a href="https://ketchup.smeup.com/ketchup-showcase/#/button"
-          >kup-button</a
-        >
+        <a href="https://smeup.github.io/ketchup/#/button">kup-button</a>
         elements. </p
       ><br />
       <p>For this reason, they inherit their style.</p>

diff --git a/...ges/ketchup-showcase/src/views/components/advanced/buttonlist/examples/ButtonlistDemo.vue b/...ges/ketchup-showcase/src/views/components/advanced/buttonlist/examples/ButtonlistDemo.vue
@@ -106,7 +106,7 @@ export default {
         {
           prop: 'customStyle',
           description:
-            'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
+            'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
           type: 'string',
           default: '""',
           try: 'css',

diff --git a/packages/ketchup-showcase/src/views/components/advanced/calendar/examples/CalendarDemo.vue b/packages/ketchup-showcase/src/views/components/advanced/calendar/examples/CalendarDemo.vue
@@ -71,7 +71,7 @@ export default {
         {
           prop: 'customStyle',
           description:
-            'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
+            'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
           type: 'string',
           default: '""',
           try: 'css',

diff --git a/packages/ketchup-showcase/src/views/components/advanced/card/examples/CardBasic.vue b/packages/ketchup-showcase/src/views/components/advanced/card/examples/CardBasic.vue
@@ -14,59 +14,49 @@
       >
       <br />
       <span class="code-word">autocomplete</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/autocomplete"
+      <a href="https://smeup.github.io/ketchup/#/autocomplete"
         >kup-autocomplete</a
       >
       <br />
       <span class="code-word">button</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/button"
-        >kup-button</a
-      >
+      <a href="https://smeup.github.io/ketchup/#/button">kup-button</a>
       props.
       <br />
       <span class="code-word">cell</span>: array of cells.
       <br />
       <span class="code-word">chart</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/chart">kup-chart</a>
+      <a href="https://smeup.github.io/ketchup/#/chart">kup-chart</a>
       props.
       <br />
       <span class="code-word">checkbox</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/checkbox"
-        >kup-checkbox</a
-      >
+      <a href="https://smeup.github.io/ketchup/#/checkbox">kup-checkbox</a>
       <br />
       <span class="code-word">chip</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/button">kup-chip</a>
+      <a href="https://smeup.github.io/ketchup/#/button">kup-chip</a>
       props.
       <br />
       <span class="code-word">color</span>: array of CSS color strings.
       <br />
       <span class="code-word">columns</span>: array of columns.
       <br />
       <span class="code-word">combobox</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/combobox"
-        >kup-combobox</a
-      >
+      <a href="https://smeup.github.io/ketchup/#/combobox">kup-combobox</a>
       props.
       <br />
       <span class="code-word">datatable</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/datatable"
-        >kup-data-table</a
-      >
+      <a href="https://smeup.github.io/ketchup/#/datatable">kup-data-table</a>
       props.
       <br />
       <span class="code-word">datepicker</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/datepicker"
-        >kup-date-picker</a
-      >
+      <a href="https://smeup.github.io/ketchup/#/datepicker">kup-date-picker</a>
       props.
       <br />
       <span class="code-word">image</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/image">kup-image</a>
+      <a href="https://smeup.github.io/ketchup/#/image">kup-image</a>
       props.
       <br />
       <span class="code-word">list</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/list">kup-list</a>
+      <a href="https://smeup.github.io/ketchup/#/list">kup-list</a>
       props.
       <br />
       <span class="code-word">object</span>: array of objects containing
@@ -76,33 +66,27 @@
       built-in layouts and it contains their settings.
       <br />
       <span class="code-word">progressbar</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/progressbar"
+      <a href="https://smeup.github.io/ketchup/#/progressbar"
         >kup-progress-bar</a
       >
       props.
       <br />
       <span class="code-word">tabbar</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/tabbar"
-        >kup-tab-bar</a
-      >
+      <a href="https://smeup.github.io/ketchup/#/tabbar">kup-tab-bar</a>
       props.
       <br />
       <span class="code-word">text</span>: array of strings.
       <br />
       <span class="code-word">textfield</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/textfield"
-        >kup-text-field</a
-      >
+      <a href="https://smeup.github.io/ketchup/#/textfield">kup-text-field</a>
       props.
       <br />
       <span class="code-word">timepicker</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/timepicker"
-        >kup-time-picker</a
-      >
+      <a href="https://smeup.github.io/ketchup/#/timepicker">kup-time-picker</a>
       props.
       <br />
       <span class="code-word">tree</span>: array of objects containing
-      <a href="https://ketchup.smeup.com/ketchup-showcase/#/tree">kup-tree</a>
+      <a href="https://smeup.github.io/ketchup/#/tree">kup-tree</a>
       props.
       <br />
       <br />

diff --git a/packages/ketchup-showcase/src/views/components/advanced/card/examples/CardDemo.vue b/packages/ketchup-showcase/src/views/components/advanced/card/examples/CardDemo.vue
@@ -64,7 +64,7 @@ export default {
         {
           prop: 'customStyle',
           description:
-            'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
+            'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
           type: 'string',
           default: '""',
           try: 'css',

diff --git a/packages/ketchup-showcase/src/views/components/advanced/cardlist/examples/CardListBasic.vue b/packages/ketchup-showcase/src/views/components/advanced/cardlist/examples/CardListBasic.vue
@@ -3,9 +3,7 @@
     <div class="demo-wrapper">
       <p
         >Cards lists are a set of scalable
-        <a href="https://ketchup.smeup.com/ketchup-showcase/#/button"
-          >kup-card</a
-        >
+        <a href="https://smeup.github.io/ketchup/#/button">kup-card</a>
         elements. </p
       ><br />
       <p>For this reason, they inherit their style.</p>

diff --git a/packages/ketchup-showcase/src/views/components/advanced/cardlist/examples/CardListDemo.vue b/packages/ketchup-showcase/src/views/components/advanced/cardlist/examples/CardListDemo.vue
@@ -54,7 +54,7 @@ export default {
         {
           prop: 'customStyle',
           description:
-            'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
+            'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
           type: 'string',
           default: '""',
           try: 'css',

diff --git a/packages/ketchup-showcase/src/views/components/advanced/cell/examples/CellDemo.vue b/packages/ketchup-showcase/src/views/components/advanced/cell/examples/CellDemo.vue
@@ -63,7 +63,7 @@ export default {
         {
           prop: 'customStyle',
           description:
-            'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
+            'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
           type: 'string',
           default: '""',
           try: 'css',

diff --git a/packages/ketchup-showcase/src/views/components/advanced/chart/examples/ChartDemo.vue b/packages/ketchup-showcase/src/views/components/advanced/chart/examples/ChartDemo.vue
@@ -82,7 +82,7 @@ export default {
         {
           prop: 'customStyle',
           description:
-            'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization.',
+            'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization.',
           type: 'string',
           default: '""',
           try: 'css',

diff --git a/packages/ketchup-showcase/src/views/components/advanced/dashboard/examples/DashboardDemo.vue b/packages/ketchup-showcase/src/views/components/advanced/dashboard/examples/DashboardDemo.vue
@@ -47,7 +47,7 @@ export default {
         {
           prop: 'customStyle',
           description:
-            'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
+            'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
           type: 'string',
           default: '""',
           try: 'css',

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
@@ -183,7 +183,7 @@ export default {
         {
           prop: 'customStyle',
           description:
-            'Custom style of the component. For more information: https://ketchup.smeup.com/ketchup-showcase/#/customization',
+            'Custom style of the component. For more information: https://smeup.github.io/ketchup/#/customization',
           type: 'string',
           default: '""',
           try: 'css',

diff --git a/packages/ketchup-showcase/src/views/components/advanced/echart/examples/EchartBar.vue b/packages/ketchup-showcase/src/views/components/advanced/echart/examples/EchartBar.vue
@@ -21,6 +21,18 @@
         />
       </div>
     </div>
+    <br />
+    <p>Stacked.</p>
+    <div class="demo-container">
+      <div class="kup-container">
+        <kup-echart
+          :axis.prop="axis"
+          :data.prop="baseData"
+          :types.prop="types"
+          stacked
+        />
+      </div>
+    </div>
   </div>
 </template>
 

diff --git a/packages/ketchup-showcase/src/views/components/advanced/echart/examples/EchartDemo.vue b/packages/ketchup-showcase/src/views/components/advanced/echart/examples/EchartDemo.vue
@@ -109,6 +109,13 @@ export default {
           default: '[]',
           try: 'json',
         },
+        {
+          prop: 'showMarks',
+          description: 'Displays the numerical values.',
+          type: 'boolean',
+          default: 'false',
+          try: 'switch',
+        },
         {
           prop: 'sizeX',
           description:
@@ -125,6 +132,14 @@ export default {
           default: '100%',
           try: 'field',
         },
+        {
+          prop: 'stacked',
+          description:
+            'Displays the data columns of an object on top of each other.',
+          type: 'boolean',
+          default: 'false',
+          try: 'switch',
+        },
         {
           prop: 'types',
           description:

diff --git a/packages/ketchup-showcase/src/views/components/advanced/echart/examples/EchartHBar.vue b/packages/ketchup-showcase/src/views/components/advanced/echart/examples/EchartHBar.vue
@@ -21,6 +21,18 @@
         />
       </div>
     </div>
+    <br />
+    <p>Stacked.</p>
+    <div class="demo-container">
+      <div class="kup-container">
+        <kup-echart
+          :axis.prop="axis"
+          :data.prop="baseData"
+          :types.prop="types"
+          stacked
+        />
+      </div>
+    </div>
   </div>
 </template>