Merge branch 'develop' of https://github.com/DiPA-Projekt/projektassi…

…stent into develop deployment
DiPA-Projekt · Jul 5, 2024 · b0f3660 · b0f3660
2 parents 02fe793 + e66ca71
commit b0f3660
Show file tree

Hide file tree

Showing 19 changed files with 758 additions and 284 deletions.
diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
@@ -26,7 +26,7 @@ jobs:
           npm run build
         working-directory: client
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE }}
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
@@ -35,5 +35,5 @@ jobs:
         run: mvn clean install -s .mvn/settings.xml
         env:
           GIT_HUB_USERNAME: ${{ secrets.GIT_HUB_USERNAME }}
-          GIT_HUB_PACKAGES_ACCESS_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}
+          GIT_HUB_PACKAGES_ACCESS_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE }}
+          NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,15 +39,23 @@ jobs:
         run: |
           git config user.email "actions@dipa.online"
           git config user.name "DiPA GitHub Actions"
+      - name: Einstellen des Autorisierungstoken
+        run: |
+          npm config set //npm.pkg.github.com/:_authToken=${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE }}
+      - name: Set up Node.js
+        uses: actions/setup-node@v2.1.5
+        with:
+          node-version: 14.x
+          registry-url: "https://npm.pkg.github.com"
+          scope: "@dipa-projekt"
       - name: Release with Maven
         run: mvn -s .mvn/settings.xml -B -DreleaseVersion=${{ github.event.inputs.release_version }} gitflow:release --file pom.xml
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCKER_REGISTRY_USERNAME: dipa
-          DOCKER_REGISTRY_TOKEN: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           GIT_HUB_USERNAME: ${{ secrets.GIT_HUB_USERNAME }}
           GIT_HUB_PACKAGES_ACCESS_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}      
       - name: Deployment to Kubernetes
         run: |
           git checkout -f main
@@ -63,5 +71,5 @@ jobs:
           DOCKER_REGISTRY_USERNAME: dipa
           DOCKER_REGISTRY_TOKEN: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
           GIT_HUB_USERNAME: ${{ secrets.GIT_HUB_USERNAME }}
-          GIT_HUB_PACKAGES_ACCESS_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}
-          NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN }}
+          GIT_HUB_PACKAGES_ACCESS_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE }}
+          NODE_AUTH_TOKEN: ${{ secrets.GIT_HUB_PACKAGES_ACCESS_TOKEN_WRITE }}
diff --git a/.gitignore b/.gitignore
@@ -197,3 +197,7 @@ buildNumber.properties
 .vscode
 /client/eslint-report.json
 /server/src/main/resources/liquibase-diff-changeLog.yaml
+
+OpenOfficePortable/
+client/node/
+node_modules/
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
@@ -1,11 +1,48 @@
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <activeProfiles>
+        <activeProfile>github-packages</activeProfile>
+    </activeProfiles>
+
+    <profiles>
+        <profile>
+            <id>github-packages</id>
+            <repositories>
+                <repository>
+                    <id>central</id>
+                    <url>https://repo1.maven.org/maven2</url>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </repository>
+                <repository>
+                    <id>github-packages</id>
+                    <name>GitHub - DiPA-Projekt</name>
+                    <url>https://maven.pkg.github.com/dipa-projekt/projektassistent-openapi</url>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </repository>
+            </repositories>
+        </profile>
+    </profiles>
     <servers>
         <server>
             <id>github</id>
-            <username>${env.GITHUB_ACTOR}</username>
-            <password>${env.GITHUB_TOKEN}</password>
+            <username>${env.GIT_HUB_USERNAME}</username>
+            <password>${env.GIT_HUB_PACKAGES_ACCESS_TOKEN}</password>
+        </server>
+        <server>
+            <id>github-packages</id>
+            <username>${env.GIT_HUB_USERNAME}</username>
+            <password>${env.GIT_HUB_PACKAGES_ACCESS_TOKEN}</password>
         </server>
         <server>
             <id>docker.dipa.online</id>

diff --git a/client/public/locales/de/translation.json b/client/public/locales/de/translation.json
@@ -6,7 +6,9 @@
   },
   "dataType": {
     "activity": "Aktivität",
+    "conventionFigure": "Konventionsabbildung",
     "decisionPoint": "Entscheidungspunkt",
+    "division": "Bereich",
     "externalTemplate": "Externe Kopiervorlage",
     "methodReference": "Methodenreferenz",
     "organisationRole": "Organisationsrolle",
@@ -26,6 +28,7 @@
     "SimpleDate": "{{date, date}}"
   },
   "label": {
+    "activities": "Aktivitäten",
     "bibliography": "Literaturverzeichnis",
     "group": "Gruppe",
     "product": "Produkt",
@@ -34,6 +37,7 @@
   },
   "text": {
     "insertTopicDescription": "Themenbeschreibungen einfügen",
-    "generateNavigation": "Erstelle Navigation"
+    "generateNavigation": "Erstelle Navigation",
+    "pleaseSelectSubChapter": "Bitte wählen Sie ein Unterkapitel."
   }
 }
diff --git a/client/public/style.css b/client/public/style.css
@@ -141,6 +141,15 @@ ul.sideMenu > li > ul > li > ul > li > div {
   color: rgba(0, 0, 0, 0.88);
 }
 
-.disable-link{
+.disable-link {
   pointer-events: none;
 }
+
+/* side background color like menu background color */
+.ant-layout-sider-children {
+  background: #f5f5f5;
+}
+
+.ant-layout-header {
+  background: #fff;
+}
diff --git a/client/src/assets/img/fc3fc9d51ffd43/ALLG-Logo-Farbe.gif b/client/src/assets/img/fc3fc9d51ffd43/ALLG-Logo-Farbe.gif
diff --git a/client/src/components/Breadcrumbs.tsx b/client/src/components/Breadcrumbs.tsx
@@ -2,7 +2,7 @@ import { Link, useLocation } from 'react-router-dom';
 import React, { useEffect, useState } from 'react';
 import { useDocumentation } from '../context/DocumentationContext';
 import { Breadcrumb } from 'antd';
-import { getSearchStringFromHash } from '../shares/utils';
+import { decodeXml, getSearchStringFromHash } from '../shares/utils';
 
 export function Breadcrumbs() {
   // const [pathSnippets, setPathSnippets] = useState<string[]>([]);
@@ -49,7 +49,7 @@ export function Breadcrumbs() {
             const url = '/documentation/' + parent?.key + getSearchStringFromHash();
             return {
               key: url,
-              title: <Link to={url}>{parent?.label}</Link>,
+              title: <Link to={url}>{decodeXml(parent?.label)}</Link>,
             };
           })
           .reverse();

diff --git a/client/src/components/header/SiteHeader.tsx b/client/src/components/header/SiteHeader.tsx
@@ -1,32 +1,26 @@
 import { Col, Layout, Menu, MenuProps, Row } from 'antd';
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { BookOutlined, FileTextOutlined, HomeOutlined, ScissorOutlined } from '@ant-design/icons';
-import { Link } from 'react-router-dom';
+import { Link, useLocation } from 'react-router-dom';
 import { useTailoring } from '../../context/TailoringContext';
 import useImage from '../../hooks/useImage';
 import { LinkWithQuery } from '../LinkWithQuery';
 
 const { Header } = Layout;
 
-// <Menu.Item key="1">
-//   <HomeOutlined />
-//   <Link to="/"> Home</Link>
-// </Menu.Item>
-// <Menu.Item key="2">
-//   <ScissorOutlined />
-//   <NavLink to="/tailoring">Tailoring</NavLink>
-// </Menu.Item>
-// <Menu.Item key="3">
-//   <FileTextOutlined />
-//   <NavLink to="/documentation">Dokumentation</NavLink>
-// </Menu.Item>
-// <Menu.Item key="4">
-//   <BookOutlined />
-//   <NavLink to="/produktvorlagen">Produktvorlagen</NavLink>
-// </Menu.Item>
-
 export const SiteHeader = (props: any) => {
   const { tailoringParameter } = useTailoring();
+  const location = useLocation();
+  const [current, setCurrent] = useState(location.pathname);
+
+  useEffect(() => {
+    if (location) {
+      const splitPathname = location.pathname.split('/');
+      if (splitPathname.length >= 2 && current !== splitPathname[1]) {
+        setCurrent(splitPathname[1]);
+      }
+    }
+  }, [location]);
 
   const items: MenuProps['items'] = [
     {
@@ -44,7 +38,7 @@ export const SiteHeader = (props: any) => {
           Dokumentation
         </LinkWithQuery>
       ),
-      key: 'dokumentation',
+      key: 'documentation',
       icon: <FileTextOutlined />,
       disabled: !tailoringParameter.projectTypeId,
     },
@@ -112,8 +106,8 @@ export const SiteHeader = (props: any) => {
         <Col span={20}>
           <Menu
             mode="horizontal"
-            theme="dark"
             defaultSelectedKeys={[props.selectedKey]}
+            selectedKeys={[current]}
             // onClick={handleMenuClick}
             items={items}
           ></Menu>

diff --git a/client/src/components/projekthandbuch/documentation/Documentation.tsx b/client/src/components/projekthandbuch/documentation/Documentation.tsx
@@ -31,6 +31,7 @@ export type PageEntry = {
 export type TableEntry = {
   id: string;
   descriptionEntry: string;
+  dataEntryDescription?: string;
   dataEntries: DataEntry[];
 };