Skip to content

Commit

Permalink
Merge pull request #1830 from apuliasoft/inputpanel
Browse files Browse the repository at this point in the history
feature: input panel e2e testing
  • Loading branch information
lucafoscili authored Mar 27, 2024
2 parents a87e854 + c62a6d1 commit c7f7391
Show file tree
Hide file tree
Showing 10 changed files with 292 additions and 316 deletions.
7 changes: 7 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
FROM mcr.microsoft.com/devcontainers/javascript-node:1-18-bullseye

# Install deps
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends chromium

# Define env vars
ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium

# [Optional] Uncomment if you want to install an additional version of node using nvm
ARG EXTRA_NODE_VERSION="lts/hydrogen"
RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
135 changes: 68 additions & 67 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,80 +1,81 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
{
"name": "@sme.up/ketchup-root",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"build": {
"dockerfile": "Dockerfile",
"args": {
"name": "@sme.up/ketchup-root",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "18-bullseye",
"EXTRA_NODE_VERSION": "18.16"
}
},
// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
// "ghcr.io/devcontainers/features/node:1": {
// "nodeGypDependencies": true,
// "version": "lts",
// "nvmVersion": "latest"
// },
"ghcr.io/devcontainers-contrib/features/lerna-npm:1": {
"version": "latest"
},
"ghcr.io/devcontainers-contrib/features/nx-npm:1": {
"version": "latest"
}
},
},
// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
// "ghcr.io/devcontainers/features/node:1": {
// "nodeGypDependencies": true,
// "version": "lts",
// "nvmVersion": "latest"
// },
"ghcr.io/devcontainers-contrib/features/lerna-npm:1": {
"version": "latest"
},
"ghcr.io/devcontainers-contrib/features/nx-npm:1": {
"version": "latest"
}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "sh .devcontainer/scripts/postCreateCommand.sh",
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "sh .devcontainer/scripts/postCreateCommand.sh",

// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"octref.vetur"
],
"settings": {
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.validate": ["vue", "html", "javascript", "typescript"],
"eslint.run": "onSave",
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[vue]": {
"editor.defaultFormatter": "octref.vetur"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
}
},
// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"firsttris.vscode-jest-runner",
"octref.vetur"
],
"settings": {
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.validate": ["vue", "html", "javascript", "typescript"],
"eslint.run": "onSave",
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[vue]": {
"editor.defaultFormatter": "octref.vetur"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
}
},
"mounts": [
"source=ketchup-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume", // deps volume
"source=ketchup-vscode-extensions,target=/root/.vscode-server/extensions,type=volume" // vscode extensions volume
"source=ketchup-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume", // deps volume
"source=ketchup-vscode-extensions,target=/root/.vscode-server/extensions,type=volume" // vscode extensions volume
]

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
"lerna": "lerna",
"k:build": "lerna run build --scope @sme.up/ketchup --stream && lerna run build --scope @sme.up/ketchup-react --stream",
"k:start": "lerna run start --scope @sme.up/ketchup --stream",
"k:test:all": "lerna run test --scope @sme.up/ketchup --stream",
"k:test:e2e": "lerna run test:e2e --scope @sme.up/ketchup --stream",
"k:test:unit": "lerna run test:spec --scope @sme.up/ketchup --stream",
"k:test:unitcov": "lerna run test:speccov --scope @sme.up/ketchup --stream",
"ksc:serve": "lerna run serve --scope @sme.up/ketchup-showcase --stream",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,6 @@ function createComp() {
title: 'Surname',
visible: true,
},
{
name: 'COL',
title: 'Color Shirt',
visible: true,
},
{
name: 'NAT',
title: 'Nation',
Expand All @@ -93,22 +88,12 @@ function createComp() {
title: 'City',
visible: true,
},
{
name: 'CAM',
title: 'Campionato vinto',
visible: true,
},
{
name: 'CHI',
title: 'Chip',
visible: true,
},
],
rows: [
{
cells: {
NAM: {
value: 'Francesco',
value: '',
obj: {
t: '',
p: '',
Expand All @@ -119,32 +104,25 @@ function createComp() {
shape: 'ITX',
},
SUR: {
value: 'Totti',
value: '',
obj: {
t: '',
p: '',
k: '',
},
editable: true,
mandatory: true,
shape: 'INF',
},
COL: {
value: '#8E1F2F',
obj: {
t: 'J1',
p: 'COL',
k: '',
},
editable: true,
mandatory: true,
// shape: 'CLP',
shape: 'ITX',
},
NAT: {
value: 'It',
value: '',
options: [
{ id: 'It', label: 'Italy' },
{ id: 'Sp', label: 'Spain' },
'Italy',
'Spain',
'Germany',
'France',
'Portugal',
'England',
],
obj: {
t: '',
Expand All @@ -156,7 +134,7 @@ function createComp() {
shape: 'CMB',
},
CIT: {
value: 'Rom',
value: '',
obj: {
t: '',
p: '',
Expand All @@ -165,31 +143,29 @@ function createComp() {
editable: true,
mandatory: true,
options: [
{ id: 'Rom', label: 'Roma' },
{ id: 'Flam', label: 'Flaminio' },
{ id: 'PorMet', label: 'Porta Metronia' },
{ id: 'Garbat', label: 'Garbatella' },
'Rome',
'Florence',
'Venice',
'Madrid',
'Barcelona',
'Seville',
'Berlin',
'Munich',
'Hamburg',
'Paris',
'Marseille',
'Lyon',
'Lisbon',
'Porto',
'Faro',
'London',
'Manchester',
'Liverpool',
],
shape: 'ACP',
},
CAM: {
value: 'on',
obj: {
t: 'V2',
p: 'SI/NO',
k: '',
},
editable: true,
mandatory: true,
// shape: 'CHK',
},
CHI: {
shape: 'CHI',
value: 'Chi',
editable: true,
options: [{ id: 'Chi', label: 'Chip' }],
},
},
layout: {},
},
],
};
Expand Down
Loading

0 comments on commit c7f7391

Please sign in to comment.