Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move FE dir out of core #479

Merged
merged 3 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/deploy-fe-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- "main"
paths:
- "**/src/oneid/oneid-ecs-core/src/main/webui**"
- "**/src/oneid/oneid-fe**"
workflow_dispatch:
inputs:
environment:
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
with:
node-version: 20.x
- name: Run yarn install, lint and test
working-directory: src/oneid/oneid-ecs-core/src/main/webui
working-directory: src/oneid/oneid-fe
run: |
yarn install --frozen-lockfile
yarn lint
Expand All @@ -83,4 +83,4 @@ jobs:
- name: Copy to S3
run: |
aws s3 sync dist s3://${{ vars.ASSETS_BUCKET_NAME }}
working-directory: src/oneid/oneid-ecs-core/src/main/webui
working-directory: src/oneid/oneid-fe
1 change: 0 additions & 1 deletion .github/workflows/deploy-oneid-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
- "**/src/oneid/oneid-ecs-core/**"
- "**/src/oneid/oneid-common/**"
- ".github/workflows/deploy-oneid-core-yml"
- "!**/src/oneid/oneid-ecs-core/src/main/webui/**"
workflow_dispatch:
inputs:
environment:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-fe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test FE
on:
pull_request:
paths:
- "**/src/oneid/oneid-ecs-core/src/main/webui**"
- "**/src/oneid/oneid-fe**"

jobs:
test:
Expand All @@ -16,7 +16,7 @@ jobs:
with:
node-version: 20.x
- name: Run yarn install, lint and test
working-directory: src/oneid/oneid-ecs-core/src/main/webui
working-directory: src/oneid/oneid-fe
run: |
yarn install --frozen-lockfile
yarn lint
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ gradle-app.setting
# End of https://www.toptal.com/developers/gitignore/api/gradle

# Frontend stuff
src/oneid/oneid-ecs-core/src/main/webui/node_modules
src/oneid/oneid-ecs-core/src/main/webui/dist
src/oneid/oneid-ecs-core/src/main/webui/coverage
src/oneid/oneid-fe/node_modules
src/oneid/oneid-fe/dist
src/oneid/oneid-fe/coverage
src/oneid/oneid-ecs-core/.quinoa

# Test stuff
Expand Down
2 changes: 2 additions & 0 deletions src/oneid/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ services:
dockerfile: oneid-ecs-core/Dockerfile
args:
ENVIRONMENT: local
# enable Quinoa to serve frontend within oneid-ecs-core (only for local dev)
QUARKUS_QUINOA: true
container_name: oneid-ecs-core
ports:
- "8080:8080"
Expand Down
7 changes: 6 additions & 1 deletion src/oneid/oneid-ecs-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@ COPY --chown=quarkus:quarkus ../mvnw .
COPY --chown=quarkus:quarkus ../.mvn ./.mvn
# oneid-common, oneid-ecs-core
COPY --chown=quarkus:quarkus ../oneid-common ./oneid-common
COPY --chown=quarkus:quarkus ../oneid-fe ./oneid-fe
COPY --chown=quarkus:quarkus ../oneid-ecs-core ./oneid-ecs-core
COPY --chown=quarkus:quarkus ../docker_mock/login-alert-message.json ./oneid-ecs-core/src/main/webui/public/assets/login-alert-message.json
COPY --chown=quarkus:quarkus ../docker_mock/login-alert-message.json ./oneid-fe/public/assets/login-alert-message.json
USER quarkus

# Default disable quinoa but take as build arg from ../docker-compose.yaml file to have it locally if needed
ARG QUARKUS_QUINOA=false
ENV QUARKUS_QUINOA=${QUARKUS_QUINOA}

# TODO debug logs, must be removed as soon as we're sure about caching
RUN \
--mount=type=cache,target=/tmp/.build-cache,sharing=locked,uid=1001,gid=1001 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ quarkus.http.limits.max-form-attribute-size=4M
## Quarkus dev services
quarkus.dynamodb.devservices.enabled=false
#region Quinoa for local dev
quarkus.quinoa.ui-dir=../oneid-fe
quarkus.quinoa.dev-server.port=5173
quarkus.quinoa.build-dir=dist
quarkus.quinoa.package-manager=yarn
quarkus.quinoa.package-manager-command.build=build --mode development
quarkus.quinoa.package-manager-install=true
quarkus.quinoa.package-manager-install.node-version=20.14.0
quarkus.quinoa.package-manager-install.yarn-version=1.22.22
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VITE_URL_CDN=https://dev.oneid.pagopa.it/assets

VITE_LOGIN_SPID_ENABLED_TEMPORARY_SELECT=false
VITE_SPID_TEST_ENV_ENABLED=true
VITE_SPID_CIE_ENTITY_ID=https://collaudo.idserver.servizicie.interno.gov.it/idp/profile/SAML2/POST/SSO
VITE_SPID_CIE_ENTITY_ID=https://preproduzione.idserver.servizicie.interno.gov.it/idp/profile/SAML2/POST/SSO
VITE_LOGIN_ALERT_BANNER=https://dev.oneid.pagopa.it/assets/login-alert-message.json
VITE_LOGIN_IDP_LIST=https://dev.oneid.pagopa.it/idps
VITE_LOGIN_CLIENT_BASE_URL=https://dev.oneid.pagopa.it/client
Expand Down
Loading