Skip to content
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
16 changes: 4 additions & 12 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,34 @@ name: Build, Test, and Deploy Angular App
on:
push:
branches:
- main # Run the workflow on pushes to the main branch
workflow_dispatch: # Allows manual trigger
- release-1.0.0
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Job 1: Build the Angular application
build:
runs-on: ubuntu-latest

steps:
# Step 1: Check out the code
- name: Checkout repository
uses: actions/checkout@v3

# Step 2: Set up Node.js
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 18

# Step 3: Install dependencies
- name: Install dependencies
run: npm install

# Step 4: Build the application
- name: Build Angular app
run: npm run build -- --configuration production --base-href /formbuilder/

Expand All @@ -49,7 +41,7 @@ jobs:
run: mv ./dist/aphp-formbuilder _site

- name: Upload artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
path: _site

Expand All @@ -62,4 +54,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
6 changes: 6 additions & 0 deletions src/app/base-page/base-page.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@
<mat-icon class="menuIcon">help</mat-icon>
</button>
</div>
<div class="btn-group-sm me-2" role="group" aria-label="Help" aria-label="Help">
<button type="button" class="btn btn-secondary menuButton" matTooltip="Report an issue"
(click)="reportBug()">
<mat-icon class="menuIcon">bug_report</mat-icon>
</button>
</div>
<div class="btn-group-sm me-2" role="group" aria-label="Close editor">
<button id="closeBtn" type="button" matTooltip="Close" class="btn btn-secondary menuButton" (click)="close()">
<mat-icon class="menuIcon">close</mat-icon>
Expand Down
5 changes: 5 additions & 0 deletions src/app/base-page/base-page.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,11 @@ export class BasePageComponent implements OnInit {
}
}

reportBug() {
const url = 'https://github.com/aphp/formbuilder/issues/new';
window.open(url, '_blank');
}

/**
* Compare if a stored form is equal to default form.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/app/services/terminology-resources.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export class TerminologyResourcesService {
valueSet.id = `${Util.sanitizeString(codeSystemConcept.code)}`;
valueSet.name = valueSet.id;
valueSet.title = codeSystemConcept.display;
valueSet.description = 'ValueSet généré avec le FormBuilder';
valueSet.description = 'ValueSet generated with AP-HP FormBuilder';
valueSet.url = Util.buildUrl(fhirIg, 'ValueSet', valueSet.id);
if (useContext) {
valueSet.useContext = useContext;
Expand Down
Loading