Merge remote-tracking branch 'origin/next' into feat-zmskvr-78-aufruf…

…e-in-bearbeitung
it-at-m · Feb 17, 2025 · 61b813f · 61b813f
2 parents 9e26867 + 708c776
commit 61b813f
Show file tree

Hide file tree

Showing 22 changed files with 537 additions and 27 deletions.
diff --git a/.github/workflows/combined-workflow-with-docs.yaml b/.github/workflows/combined-workflow-with-docs.yaml
@@ -80,16 +80,22 @@ jobs:
   call-build-api-docs:
     uses: ./.github/workflows/build-api-docs.yaml
 
+  generate-schema-diagrams:
+    uses: ./.github/workflows/generate-schema-diagrams.yaml
+
   deploy-to-pages:
-    needs: [aggregate-reports, call-build-api-docs]
+    needs: [aggregate-reports, call-build-api-docs, generate-schema-diagrams]
     if: |
       needs.call-build-api-docs.result == 'success' &&
-      needs.aggregate-reports.result == 'success'
+      needs.aggregate-reports.result == 'success' &&
+      needs.generate-schema-diagrams.result == 'success'
     uses: ./.github/workflows/deploy-pages.yaml
     with:
       coverage_artifact: aggregated-reports
       api_docs_artifact: api-docs
       security_artifact: aggregated-reports
+      git_commit: ${{ github.sha }}
+      git_branch: ${{ github.ref_name }}
 
   call-php-build-images:
     needs: [call-php-code-quality, call-php-unit-tests]

diff --git a/.github/workflows/deploy-pages.yaml b/.github/workflows/deploy-pages.yaml
@@ -18,10 +18,19 @@ on:
         required: true
         type: string
         default: 'security-reports'
+      git_commit:
+        description: 'Git commit hash'
+        required: true
+        type: string
+      git_branch:
+        description: 'Git branch name'
+        required: true
+        type: string
 
 permissions:
   pages: write
   id-token: write
+  contents: read
 
 concurrency:
   group: "pages"
@@ -37,6 +46,12 @@ jobs:
       - name: Create public directory
         run: mkdir -p public
 
+      - name: Download schema diagrams
+        uses: actions/download-artifact@v4
+        with:
+          name: schema-diagrams
+          path: public/diagrams
+
       - name: Download coverage reports
         uses: actions/download-artifact@v4
         with:
@@ -55,11 +70,6 @@ jobs:
           name: ${{ inputs.security_artifact }}
           path: public
 
-      - name: Debug - List directory structure
-        run: |
-          echo "=== Directory Structure ==="
-          ls -R public/
-
       - name: Create index page
         run: |
           cat > public/index.html <<'EOL'
@@ -114,6 +124,13 @@ jobs:
                 a:hover {
                   text-decoration: underline;
                 }
+                .footer {
+                  margin-top: 2rem;
+                  padding-top: 1rem;
+                  border-top: 1px solid #eaecef;
+                  color: #586069;
+                  font-size: 12px;
+                }
               </style>
             </head>
             <body>
@@ -123,8 +140,10 @@ jobs:
                 <div class="card">
                   <h2>API Documentation</h2>
                   <ul>
-                    <li><a href="https://it-at-m.github.io/eappointment/zmscitizenapi/public/doc/index.html">Zmscitizenapi API Documentation</a></li>
+                    <li><a href="https://it-at-m.github.io/eappointment/zmscitizenapi/public/doc/index.html">Zmscitizenapi Documentation</a></li>
                     <li><a href="https://it-at-m.github.io/eappointment/zmsapi/public/doc/index.html">Zmsapi Documentation</a></li>
+                    <li><a href="diagrams/zmscitizenapi.html">Zmscitizenapi Schema</a></li>
+                    <li><a href="diagrams/zmsapi.html">Zmsapi Schema</a></li>
                   </ul>
                 </div>
 
@@ -165,10 +184,36 @@ jobs:
                   </ul>
                 </div>
               </div>
+              <div class="footer">
+                Generated from branch <a href="https://github.com/it-at-m/eappointment/tree/${{ inputs.git_branch }}">${{ inputs.git_branch }}</a> at commit <a href="https://github.com/it-at-m/eappointment/commit/${{ inputs.git_commit }}">${{ inputs.git_commit }}</a>
+              </div>
             </body>
           </html>
           EOL
 
+      - name: Download coverage reports
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.coverage_artifact }}
+          path: public
+
+      - name: Download API docs
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.api_docs_artifact }}
+          path: public
+
+      - name: Download security reports
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.security_artifact }}
+          path: public
+
+      - name: Debug - List directory structure
+        run: |
+          echo "=== Directory Structure ==="
+          ls -R public/
+
       - name: Setup Pages
         uses: actions/configure-pages@v5