Merge branch 'pr/1838' into staging

smeup · Mar 29, 2024 · 92c8479 · 92c8479
2 parents c7f7391 + f27facc
commit 92c8479
Show file tree

Hide file tree

Showing 24 changed files with 775 additions and 160 deletions.
diff --git a/.github/workflows/continuum.yaml b/.github/workflows/continuum.yaml
@@ -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/packages/ketchup-showcase/src/App.vue b/packages/ketchup-showcase/src/App.vue
@@ -80,7 +80,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/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/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/input-panel.js b/packages/ketchup/src/assets/input-panel.js
@@ -108,13 +108,9 @@ const data = {
                 },
                 CHK: {
                     value: 'on',
-                    obj: {
-                        t: 'V2',
-                        p: 'SI/NO',
-                        k: '',
-                    },
                     editable: true,
                     mandatory: true,
+                    shape: 'CHK',
                 },
                 RAD: {
                     value: '1',

diff --git a/packages/ketchup/src/components.d.ts b/packages/ketchup/src/components.d.ts
@@ -11,7 +11,7 @@ import { ItemsDisplayMode, KupListEventPayload, KupListNode, KupListRole } from
 import { KupAutocompleteEventPayload, KupAutocompleteIconClickEventPayload } from "./components/kup-autocomplete/kup-autocomplete-declarations";
 import { KupBoxAutoSelectEventPayload, KupBoxClickEventPayload, KupBoxContextMenuEventPayload, KupBoxData, KupBoxKanban, KupBoxLayout, KupBoxLoadMoreClickEventPayload, KupBoxRow, KupBoxRowActionClickEventPayload, KupBoxSelectedEventPayload, LoadMoreMode } from "./components/kup-box/kup-box-declarations";
 import { KupStore } from "./components/kup-state/kup-store";
-import { KupDataCell, KupDataColumn, KupDataDataset, KupDataNewColumnOptions, KupDataNewColumnTypes, KupDataNode, KupDataRowAction } from "./managers/kup-data/kup-data-declarations";
+import { KupDataCell, KupDataColumn, KupDataDataset, KupDataNewColumnOptions, KupDataNewColumnTypes, KupDataRowAction } from "./managers/kup-data/kup-data-declarations";
 import { FButtonProps, FButtonStyling } from "./f-components/f-button/f-button-declarations";
 import { KupButtonClickEventPayload } from "./components/kup-button/kup-button-declarations";
 import { KupButtonListClickEventPayload, KupButtonListNode } from "./components/kup-button-list/kup-button-list-declarations";
@@ -41,8 +41,8 @@ import { KupFormData, KupFormLabelPlacement, KupFormLayout } from "./components/
 import { KupBadge } from "./components/kup-badge/kup-badge";
 import { FImageData } from "./f-components/f-image/f-image-declarations";
 import { KupImageClickEventPayload } from "./components/kup-image/kup-image-declarations";
+import { KupImageListDataNode, KupImageListEventPayload } from "./components/kup-image-list/kup-image-list-declarations";
 import { KupTreeColumnMenuEventPayload, KupTreeColumnRemoveEventPayload, KupTreeContextMenuEventPayload, KupTreeDynamicMassExpansionEventPayload, KupTreeExpansionMode, KupTreeNode, KupTreeNodeButtonClickEventPayload, KupTreeNodeCollapseEventPayload, KupTreeNodeExpandEventPayload, KupTreeNodeSelectedEventPayload, TreeNodePath } from "./components/kup-tree/kup-tree-declarations";
-import { KupImageListEventPayload } from "./components/kup-image-list/kup-image-list-declarations";
 import { KupInputPanelData } from "./components/kup-input-panel/kup-input-panel-declarations";
 import { KupLazyRender } from "./components/kup-lazy/kup-lazy-declarations";
 import { KupNavBarStyling } from "./components/kup-nav-bar/kup-nav-bar-declarations";
@@ -62,7 +62,7 @@ export { ItemsDisplayMode, KupListEventPayload, KupListNode, KupListRole } from
 export { KupAutocompleteEventPayload, KupAutocompleteIconClickEventPayload } from "./components/kup-autocomplete/kup-autocomplete-declarations";
 export { KupBoxAutoSelectEventPayload, KupBoxClickEventPayload, KupBoxContextMenuEventPayload, KupBoxData, KupBoxKanban, KupBoxLayout, KupBoxLoadMoreClickEventPayload, KupBoxRow, KupBoxRowActionClickEventPayload, KupBoxSelectedEventPayload, LoadMoreMode } from "./components/kup-box/kup-box-declarations";
 export { KupStore } from "./components/kup-state/kup-store";
-export { KupDataCell, KupDataColumn, KupDataDataset, KupDataNewColumnOptions, KupDataNewColumnTypes, KupDataNode, KupDataRowAction } from "./managers/kup-data/kup-data-declarations";
+export { KupDataCell, KupDataColumn, KupDataDataset, KupDataNewColumnOptions, KupDataNewColumnTypes, KupDataRowAction } from "./managers/kup-data/kup-data-declarations";
 export { FButtonProps, FButtonStyling } from "./f-components/f-button/f-button-declarations";
 export { KupButtonClickEventPayload } from "./components/kup-button/kup-button-declarations";
 export { KupButtonListClickEventPayload, KupButtonListNode } from "./components/kup-button-list/kup-button-list-declarations";
@@ -92,8 +92,8 @@ export { KupFormData, KupFormLabelPlacement, KupFormLayout } from "./components/
 export { KupBadge } from "./components/kup-badge/kup-badge";
 export { FImageData } from "./f-components/f-image/f-image-declarations";
 export { KupImageClickEventPayload } from "./components/kup-image/kup-image-declarations";
+export { KupImageListDataNode, KupImageListEventPayload } from "./components/kup-image-list/kup-image-list-declarations";
 export { KupTreeColumnMenuEventPayload, KupTreeColumnRemoveEventPayload, KupTreeContextMenuEventPayload, KupTreeDynamicMassExpansionEventPayload, KupTreeExpansionMode, KupTreeNode, KupTreeNodeButtonClickEventPayload, KupTreeNodeCollapseEventPayload, KupTreeNodeExpandEventPayload, KupTreeNodeSelectedEventPayload, TreeNodePath } from "./components/kup-tree/kup-tree-declarations";
-export { KupImageListEventPayload } from "./components/kup-image-list/kup-image-list-declarations";
 export { KupInputPanelData } from "./components/kup-input-panel/kup-input-panel-declarations";
 export { KupLazyRender } from "./components/kup-lazy/kup-lazy-declarations";
 export { KupNavBarStyling } from "./components/kup-nav-bar/kup-nav-bar-declarations";
@@ -2542,7 +2542,7 @@ export namespace Components {
           * Actual data of the component.
           * @default []
          */
-        "data": KupDataNode[];
+        "data": KupImageListDataNode[];
         /**
           * Used to retrieve component's props values.
           * @param descriptions - When provided and true, the result will be the list of props with their description.
@@ -2592,6 +2592,10 @@ export namespace Components {
           * @default false
          */
         "hiddenSubmitButton": boolean;
+        /**
+          * This method is used to trigger a new render of the component.
+         */
+        "refresh": () => Promise<void>;
         /**
           * Sets the callback function on submit form
           * @default null
@@ -7343,7 +7347,7 @@ declare namespace LocalJSX {
           * Actual data of the component.
           * @default []
          */
-        "data"?: KupDataNode[];
+        "data"?: KupImageListDataNode[];
         "onKup-imagelist-click"?: (event: KupImageListCustomEvent<KupImageListEventPayload>) => void;
         "onKup-imagelist-contextmenu"?: (event: KupImageListCustomEvent<KupImageListEventPayload>) => void;
         "onKup-imagelist-dblclick"?: (event: KupImageListCustomEvent<KupImageListEventPayload>) => void;

diff --git a/packages/ketchup/src/components/kup-image-list/kup-image-list-declarations.ts b/packages/ketchup/src/components/kup-image-list/kup-image-list-declarations.ts
@@ -1,17 +1,37 @@
-import { KupDataNode } from '../../managers/kup-data/kup-data-declarations';
-import { KupEventPayload } from '../../types/GenericTypes';
+import {
+    KupDataCell,
+    KupDataColumn,
+    KupDataNode,
+    KupDataRow,
+} from '../../managers/kup-data/kup-data-declarations';
+import { GenericObject, KupEventPayload } from '../../types/GenericTypes';
 
 /**
  * Props of the kup-image-list component.
  * Used to export every prop in an object.
  */
 export enum KupImageListProps {
+    columns = 'Can set a specific number of columns',
     customStyle = 'Custom style of the component.',
     data = 'Actual data of the component',
     ripple = "When enabled displays Material's ripple effect on clicked items.",
     rows = 'Cam set a specific number of rows. It overwrite the columns flow into rows flow',
 }
 
 export interface KupImageListEventPayload extends KupEventPayload {
-    node: KupDataNode;
+    details: KupImageListEventHandlerDetails;
+}
+/**
+ * Contains all the data of an event.
+ */
+export interface KupImageListEventHandlerDetails {
+    cell: KupDataCell;
+    column: KupDataColumn;
+    originalEvent: PointerEvent;
+    row: KupDataRow;
+}
+
+export interface KupImageListDataNode extends KupDataNode {
+    badgeData: GenericObject[];
+    children?: KupImageListDataNode[];
 }