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

v9.6.5
smeup · Apr 18, 2024 · 9d3b8c1 · 9d3b8c1
2 parents 9c0c94e + 0f477bd
commit 9d3b8c1
Show file tree

Hide file tree

Showing 55 changed files with 3,411 additions and 747 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -6,6 +6,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 
 # Define env vars
 ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
+ENV NODE_OPTIONS=--max-old-space-size=8192
 
 # [Optional] Uncomment if you want to install an additional version of node using nvm
 ARG EXTRA_NODE_VERSION="lts/hydrogen"

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -38,6 +38,7 @@
                 "esbenp.prettier-vscode",
                 "dbaeumer.vscode-eslint",
                 "firsttris.vscode-jest-runner",
+                "elltg.elltg-npm-script-run",
                 "octref.vetur"
             ],
             "settings": {

diff --git a/.devcontainer/scripts/git/pre-push b/.devcontainer/scripts/git/pre-push
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+yarn run k:build
+yarn run k:test:all
diff --git a/.devcontainer/scripts/postCreateCommand.sh b/.devcontainer/scripts/postCreateCommand.sh
@@ -3,5 +3,10 @@
 echo "Set permissions"
 sudo chown -R node:node node_modules
 
+echo "Set Git hooks"
+echo "Set pre-push hook"
+cp .devcontainer/scripts/git/pre-push .git/hooks
+chmod +x .git/hooks/pre-push
+
 echo "Installing Deps"
 yarn install
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.4",
+    "version": "9.6.5",
     "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.4",
+        "@sme.up/ketchup": "^9.6.5",
         "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.4",
+    "@sme.up/ketchup": "^9.6.5",
     "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.4"
-            >v9.6.4</a
+          ><a href="https://github.com/smeup/ketchup/releases/tag/v9.6.5"
+            >v9.6.5</a
           ></div
         ></div
       >

diff --git a/packages/ketchup-showcase/src/views/components/advanced/planner/examples/PlannerDemo.vue b/packages/ketchup-showcase/src/views/components/advanced/planner/examples/PlannerDemo.vue
@@ -121,6 +121,15 @@ export default {
           default: 'undefined',
           try: 'field',
         },
+        {
+          prop: 'detailHours',
+          description:
+            'Columns containing detail duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          isArray: true,
+          try: 'field',
+        },
         {
           prop: 'detailIdCol',
           description: 'Column containing unique detail identifier',
@@ -135,6 +144,15 @@ export default {
           default: 'undefined',
           try: 'field',
         },
+        {
+          prop: 'detailPrevHours',
+          description:
+            'Columns containing fForecast detail duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          isArray: true,
+          try: 'field',
+        },
         {
           prop: 'detailPrevDates',
           description:
@@ -198,6 +216,15 @@ export default {
           try: 'field',
           isArray: true,
         },
+        {
+          prop: 'phaseHours',
+          description:
+            'Columns containing phase duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          try: 'field',
+          isArray: true,
+        },
         {
           prop: 'phaseIdCol',
           description: 'Column containing unique phase identifier',
@@ -212,6 +239,15 @@ export default {
           default: 'undefined',
           try: 'field',
         },
+        {
+          prop: 'phasePrevHours',
+          description:
+            'Columns containing forecast phase duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          try: 'json',
+          isArray: true,
+        },
         {
           prop: 'phasePrevDates',
           description:
@@ -228,6 +264,13 @@ export default {
           default: 'false',
           try: 'switch',
         },
+        {
+          prop: 'scrollableTaskList',
+          description: 'Enable/disable scrollbar for task list',
+          type: 'boolean',
+          default: 'false',
+          try: 'switch',
+        },
         {
           prop: 'showSecondaryDates',
           description: 'Enable/disable display of secondary dates',
@@ -260,6 +303,15 @@ export default {
           default: 'undefined',
           try: 'field',
         },
+        {
+          prop: 'taskHours',
+          description:
+            'Columns containing task duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          try: 'json',
+          isArray: true,
+        },
         {
           prop: 'taskIdCol',
           description: 'Column containing unique task identifier',
@@ -288,6 +340,15 @@ export default {
           default: 'undefined',
           try: 'field',
         },
+        {
+          prop: 'taskPrevHours',
+          description:
+            'Columns containing forecast task duration, from (firstHour) to (secondHour)',
+          type: 'string',
+          default: 'undefined',
+          try: 'json',
+          isArray: true,
+        },
         {
           prop: 'taskPrevDates',
           description:

diff --git a/packages/ketchup-showcase/src/views/components/basic/pdf/examples/PdfDemo.vue b/packages/ketchup-showcase/src/views/components/basic/pdf/examples/PdfDemo.vue
@@ -58,7 +58,7 @@ export default {
 function createComp() {
   const comp = document.createElement('kup-pdf');
   comp.id = 'demo-component';
-  comp.pdfPath = '/assets/kup-pdf-sample.pdf';
+  comp.pdfPath = 'assets/kup-pdf-sample.pdf';
   return comp;
 }
 </script>
diff --git a/packages/ketchup/package.json b/packages/ketchup/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@sme.up/ketchup",
-    "version": "9.6.4",
+    "version": "9.6.5",
     "keywords": [
         "smeup",
         "KetchUP",