Skip to content

Commit

Permalink
Merge branch 'main' into summary2-taskid-event-handling
Browse files Browse the repository at this point in the history
  • Loading branch information
ErlingHauan authored Oct 7, 2024
2 parents b0ab8a1 + 81b65a2 commit a1cfe03
Show file tree
Hide file tree
Showing 149 changed files with 2,897 additions and 1,051 deletions.
48 changes: 32 additions & 16 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ solution/platform:
- changed-files:
- any-glob-to-any-file: 'src/Altinn.Platform/**/*'

solution/app-backend:
- changed-files:
- any-glob-to-any-file: 'src/studio/AppTemplates/**/*'

solution/studio/designer:
- changed-files:
- any-glob-to-any-file: ['backend/**/*', 'frontend/**/*']
Expand All @@ -18,43 +14,55 @@ solution/studio/repos:
# Labels for areas
area/app-deploy:
- changed-files:
- any-glob-to-any-file: ['frontend/app-development/features/appPublish/**/*', 'frontend/app-development/sharedResources/appDeployment/**/*', 'backend/src/Designer/Controllers/DeploymentsController.cs', 'src/studio/AppTemplates/AspNet/deployment/**/*']
- any-glob-to-any-file: ['frontend/app-development/features/appPublish/**/*', 'frontend/app-development/sharedResources/appDeployment/**/*', 'backend/src/Designer/**/*Deployment*.cs', 'backend/src/Designer/**/*Release*.cs']

area/app-preview:
- changed-files:
- any-glob-to-any-file: ['frontend/app-preview/**/*', 'backend/src/Designer/Controllers/PreviewController.cs']

area/authorization:
- changed-files:
- any-glob-to-any-file: ['frontend/packages/policy-editor/**/*']

area/dashboard:
- changed-files:
- any-glob-to-any-file: 'frontend/dashboard/**/*'
- any-glob-to-any-file: ['frontend/dashboard/**/*']

area/data-modeling:
- changed-files:
- any-glob-to-any-file: ['frontend/packages/schema-editor/**/*', 'frontend/packages/schema-model/**/*', 'frontend/app-development/features/dataModelling/**/*', 'backend/src/DataModeling/**/*']

area/pdf:
area/overview:
- changed-files:
- any-glob-to-any-file: 'src/Altinn.Platform/Altinn.Platform.PDF/**/*'
- any-glob-to-any-file: ['frontend/app-development/features/overview/**/*']

area/process:
- changed-files:
- any-glob-to-any-file: ['frontend/app-development/features/processEditor/**/*', 'frontend/packages/process-editor/**/*', 'backend/src/Designer/**/*ProcessesModeling*.cs']

area/resource-registry:
- changed-files:
- any-glob-to-any-file: 'frontend/resourceAdm/**/*'

area/test:
area/settings:
- changed-files:
- any-glob-to-any-file: 'src/test/**/*'
- any-glob-to-any-file: 'frontend/app-development/layout/SettingsModalButton/**/*'

area/text-editor:
area/studio-root:
- changed-files:
- any-glob-to-any-file: ['frontend/packages/text-editor/**', 'frontend/app-development/features/textEditor/**/*']
- any-glob-to-any-file: 'frontend/studio-root/**/*'

area/process:
area/text-editor:
- changed-files:
- any-glob-to-any-file: ['frontend/app-development/features/processEditor/**/*', 'frontend/packages/process-editor/**/*', 'backend/src/Designer/**/*ProcessesModeling*.cs']
- any-glob-to-any-file: ['frontend/packages/text-editor/**', 'frontend/app-development/features/textEditor/**/*', 'backend/src/Designer/**/*Text*.cs',]

area/ui-editor:
- changed-files:
- any-glob-to-any-file: 'frontend/packages/ux-editor/**/*'

area/studio-root:
area/version-control:
- changed-files:
- any-glob-to-any-file: 'frontend/studio-root/**/*'
- any-glob-to-any-file: 'frontend/packages/shared/src/components/GiteaHeader/**/*'

## Other labels
kind/dependencies:
Expand All @@ -68,3 +76,11 @@ quality/testing:
skip-releasenotes:
- changed-files:
- any-glob-to-any-file: ['.github/**/*', '.husky/**/*', '.vscode/**/*', '.yarn/**/*', 'testdata/**/*', 'development/**/*', 'src/**/*']

backend:
- changed-files:
- any-glob-to-any-file: 'backend/**/*'

frontend:
- changed-files:
- any-glob-to-any-file: 'frontend/**/*'
20 changes: 20 additions & 0 deletions .github/workflows/auto-approve-pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Auto-Approve PR

on:
pull_request:
types: [ labeled ]

jobs:
auto-approve:
runs-on: ubuntu-latest
if: github.event.label.name == 'skip-manual-testing'
steps:
- name: Checkout PR code
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: Auto approve PR
run: gh pr review ${{ github.event.pull_request.number }} --approve
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Empty file modified .yarn/releases/yarn-4.5.0.cjs
100644 → 100755
Empty file.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ COPY ./frontend/app-preview/package.json ./frontend/app-preview/
COPY ./frontend/dashboard/package.json ./frontend/dashboard/
COPY ./frontend/language/package.json ./frontend/language/
COPY ./frontend/libs/studio-components/package.json ./frontend/libs/studio-components/
COPY ./frontend/libs/studio-content-library/package.json ./frontend/libs/studio-content-library/
COPY ./frontend/libs/studio-hooks/package.json ./frontend/libs/studio-hooks/
COPY ./frontend/libs/studio-icons/package.json ./frontend/libs/studio-icons/
COPY ./frontend/libs/studio-pure-functions/package.json ./frontend/libs/studio-pure-functions/
Expand Down
2 changes: 1 addition & 1 deletion development/azure-devops-mock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"axios": "1.7.7",
"cors": "2.8.5",
"express": "4.20.0",
"express": "4.21.0",
"morgan": "1.10.0",
"nodemon": "3.1.7",
"p-queue": "8.0.1"
Expand Down
3 changes: 3 additions & 0 deletions frontend/app-preview/App.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:root {
font-family: Roboto, 'San Fransisco', 'Helvetica Neue', Helvetica, Arial, sans-serif;
}
1 change: 1 addition & 0 deletions frontend/app-preview/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import './App.css';
import { createRoot } from 'react-dom/client';
import { PreviewApp } from './src/PreviewApp';
import { BrowserRouter } from 'react-router-dom';
Expand Down
4 changes: 0 additions & 4 deletions frontend/app-preview/src/PreviewApp.module.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
:root {
--font-family: 'Inter', sans-serif;
}

.previewContainer {
--toolbar-height: 80px;
--subtoolbar-height: 60px;
Expand Down

This file was deleted.

This file was deleted.

60 changes: 0 additions & 60 deletions frontend/app-preview/src/components/AppPreviewSubMenu.test.tsx

This file was deleted.

39 changes: 0 additions & 39 deletions frontend/app-preview/src/components/AppPreviewSubMenu.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.subHeader {
display: flex;
align-items: center;
height: var(--subtoolbar-height);
padding-inline: var(--fds-spacing-4);
}

.icon {
font-size: var(--fds-sizing-6);
}
Loading

0 comments on commit a1cfe03

Please sign in to comment.