Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
80554e7
Init multi-select
GabrielSalernoILARI Jan 9, 2025
d52d5ba
modified dev env to see render of multi-select
GabrielSalernoILARI Jan 20, 2025
65c96a1
added sample tree data to multi-select.js
GabrielSalernoILARI Jan 21, 2025
ebd40f4
undid debug.js edits
GabrielSalernoILARI Jan 21, 2025
c5a2d21
test kup-multi-select
GabrielSalernoILARI Jan 21, 2025
21be036
corrected html, tsx and js files of multi-select
GabrielSalernoILARI Jan 22, 2025
14a5aa9
cleaned up multi select, data management not complete
GabrielSalernoILARI Jan 22, 2025
9cc72ec
testing with vue demo
GabrielSalernoILARI Jan 23, 2025
b298b19
minor changes
GabrielSalernoILARI Jan 23, 2025
8083e10
fixed errors, tree works in showcase
GabrielSalernoILARI Jan 27, 2025
798f843
data link works, added chips, todo chip logic with events on click
GabrielSalernoILARI Jan 27, 2025
800d35c
merged
GabrielSalernoILARI Jan 27, 2025
59677ff
added test event to tree
GabrielSalernoILARI Jan 27, 2025
595d0c3
added chip logic, refresh needs fix
GabrielSalernoILARI Jan 29, 2025
ea1716d
fixed chips refresh via data props assignment
GabrielSalernoILARI Jan 30, 2025
c843d78
Added working tree logic and logged output for mongo query
GabrielSalernoILARI Jan 30, 2025
9a2a91e
Merge branch 'develop' of https://github.com/smeup/ketchup into develop
GabrielSalernoILARI Feb 6, 2025
b8eded2
Merge remote-tracking branch 'upstream/develop' into develop
GabrielSalernoILARI Feb 6, 2025
da40758
testing MTS shape - unfinished
GabrielSalernoILARI Feb 10, 2025
532a3f6
changed indentation size and reformatted
GabrielSalernoILARI Feb 11, 2025
ae3b534
Revert "changed indentation size and reformatted"
GabrielSalernoILARI Feb 11, 2025
f1ce3a4
fix
GabrielSalernoILARI Feb 11, 2025
6031009
fixed development.md small errors
GabrielSalernoILARI Feb 11, 2025
2f801e3
changed formatting
GabrielSalernoILARI Feb 11, 2025
b075363
Revert "changed formatting"
GabrielSalernoILARI Feb 11, 2025
044dd4c
Merge remote-tracking branch 'upstream/develop' into develop
GabrielSalernoILARI Feb 11, 2025
c68f5ea
merge
GabrielSalernoILARI Feb 11, 2025
5caa3ca
removed unnecessary import
GabrielSalernoILARI Feb 11, 2025
c4228e6
debugging cell with mts shape, renders successfully
GabrielSalernoILARI Feb 12, 2025
dc36bcd
small edits
GabrielSalernoILARI Feb 12, 2025
aa21c0a
fixed package.json error
GabrielSalernoILARI Feb 12, 2025
98318e1
changed uuuuh readmes i think
GabrielSalernoILARI Feb 12, 2025
18c90e1
Merge branch 'develop' of https://github.com/smeup/ketchup into develop
GabrielSalernoILARI Feb 13, 2025
a3dd252
test
GabrielSalernoILARI Feb 13, 2025
3bc8a4a
MAKE SURE TO REMOVE REDHAT EXTENSION it fucks shit up
GabrielSalernoILARI Feb 13, 2025
190ba23
need to fix mts for inputpanel
GabrielSalernoILARI Feb 13, 2025
decff28
improved mts shape code
GabrielSalernoILARI Feb 14, 2025
6610473
Fixed MTS shape, now works with input panel
GabrielSalernoILARI Feb 14, 2025
aecc094
small edits to multiselect and mts shape
GabrielSalernoILARI Feb 19, 2025
fee82d7
Merge branch 'develop' of https://github.com/smeup/ketchup into develop
GabrielSalernoILARI Feb 20, 2025
ee89bac
chips are now visible, not sure if correct
GabrielSalernoILARI Feb 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version: 2
updates:
- package-ecosystem: 'devcontainers'
directory: '/'
schedule:
interval: weekly
ignore:
- dependency-name: '*'
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: weekly
- package-ecosystem: 'devcontainers'
directory: '/'
schedule:
interval: weekly
ignore:
- dependency-name: '*'
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: weekly
284 changes: 142 additions & 142 deletions .github/workflows/continuum.yaml
Original file line number Diff line number Diff line change
@@ -1,149 +1,149 @@
name: continuum

on:
push:
branches:
- develop
push:
branches:
- develop

env:
VERSION: 11.0.0-SNAPSHOT
AWS_REGION: eu-south-1
VERSION: 11.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 *
zip -qr /tmp/ketchup-components.zip ketchup/*

- 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@v5
- 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

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: |
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/actions/workflows/continuum.yaml/dispatches \
-d '{"ref": "develop"}'

trigger-webupjs-develop:
needs: build
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/ketchup-update.yaml/dispatches \
-d '{"ref": "develop"}'
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 *
zip -qr /tmp/ketchup-components.zip ketchup/*

- 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@v5
- 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

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: |
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/actions/workflows/continuum.yaml/dispatches \
-d '{"ref": "develop"}'

trigger-webupjs-develop:
needs: build
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/ketchup-update.yaml/dispatches \
-d '{"ref": "develop"}'
28 changes: 14 additions & 14 deletions .github/workflows/develop-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
name: ketchup-outsourcing-release

on:
push:
branches:
- staging
push:
branches:
- staging

jobs:
run-cicd:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
run-cicd:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Trigger jenkins workflow
uses: fjogeleit/http-request-action@v1
with:
url: 'https://webuptest.smeup.com/jenkins/job/WebupKetchupOutsourcingPipeline/build?token=${{ secrets.JENKINS_WEBHOOK_TOKEN }}'
method: 'GET'
username: ${{ secrets.JENKINS_WEBHOOK_USERNAME }}
password: ${{ secrets.JENKINS_WEBHOOK_PASSWORD }}
- name: Trigger jenkins workflow
uses: fjogeleit/http-request-action@v1
with:
url: 'https://webuptest.smeup.com/jenkins/job/WebupKetchupOutsourcingPipeline/build?token=${{ secrets.JENKINS_WEBHOOK_TOKEN }}'
method: 'GET'
username: ${{ secrets.JENKINS_WEBHOOK_USERNAME }}
password: ${{ secrets.JENKINS_WEBHOOK_PASSWORD }}
Loading