Merge branch 'develop' into tsys-release-2024-05-28

virtualidentityag · May 28, 2024 · e392a75 · e392a75
2 parents bb05f9e + e276923
commit e392a75
Show file tree

Hide file tree

Showing 7 changed files with 611 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,15 +39,15 @@ jobs:
               env:
                   GITHUB_TOKEN: ${{ secrets.github_token }}
             - name: Bump version
-              if: startsWith(env.BRANCH,'release') == true
+              if: env.BRANCH == 'release'
               run: |
                   git config --local user.email "[email protected]"
                   git config --local user.name "GitHub Action"
                   yarn run release
               env:
                   GITHUB_TOKEN: ${{ secrets.github_token }}
             - name: Push changes
-              if: startsWith(env.BRANCH,'release') == true
+              if: env.BRANCH == 'release'
               uses: ad-m/github-push-action@master
               with:
                   github_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adminpanel",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
   "homepage": "http://tenant1.onlineberatung.local/admin",
   "dependencies": {
@@ -48,6 +48,7 @@
     "start": "vite",
     "build": "tsc && vite build",
     "serve": "vite preview",
+    "release": "standard-version",
     "test": "vite test",
     "lint": "yarn run lint:css && yarn run lint:js && yarn run lint:formatting",
     "lint:css": "stylelint --fix \"src/**/*.(s(c|a)ss|css|less)\"",
@@ -108,6 +109,7 @@
     "prettier": "^2.5.1",
     "react-error-overlay": "6.0.10",
     "sass": "^1.56.1",
+    "standard-version": "^9.5.0",
     "stylelint": "^14.4.0",
     "stylelint-config-idiomatic-order": "^8.1.0",
     "stylelint-config-prettier": "^9.0.3",

diff --git a/src/api/agency/addAgencyData.ts b/src/api/agency/addAgencyData.ts
@@ -24,6 +24,7 @@ function buildAgencyDataRequestBody(consultingTypeResponseId: string | number, f
         demographics: formData.demographics,
         counsellingRelations: formData.counsellingRelations,
         dataProtection: formData.dataProtection,
+        agencyLogo: formData.agencyLogo,
     });
 }
 

diff --git a/src/hooks/useAgencyLegalDataMissing.tsx b/src/hooks/useAgencyLegalDataMissing.tsx
@@ -34,5 +34,5 @@ export const useAgencyLegalDataMissing = (agencyData: AgencyData) => {
                 hasMissingDataProtectionOfficerContact ||
                 hasMissingAlternativeDataProtectionRepresentativeContact)
         );
-    }, [agencyData]);
+    }, [agencyData, isEnabled]);
 };
diff --git a/src/pages/Agency/Edit/index.tsx b/src/pages/Agency/Edit/index.tsx
@@ -23,6 +23,7 @@ import { useAgencyLegalDataMissing } from '../../../hooks/useAgencyLegalDataMiss
 import { ResponsibleSettings } from './components/ResponsibleSettings';
 import { ContactSettings } from './components/ContactSettings';
 import styles from '../../../components/Page/styles.module.scss';
+import { AgencyLogo } from './components/AgencyLogo';
 
 function hasOnlyDefaultRangeDefined(data: PostCodeRange[]) {
     return data?.length === 0 || (data?.length === 1 && data[0].from === '00000' && data[0].until === '99999');
@@ -86,6 +87,7 @@ export const AgencyPageEdit = () => {
             offline: !formData.online,
             counsellingRelations: formData.counsellingRelations?.map(({ value }) => value),
         };
+
         mutate(newFormData, {
             onError: () => {
                 setSubmitted(false);
@@ -170,10 +172,11 @@ export const AgencyPageEdit = () => {
                     </Col>
                     <Col xs={12} lg={6}>
                         <AgencyGeneralInformation />
-                        <RegistrationSettings />
+                        <RegistrationSettings consultingTypeId={agencyData?.consultingType} />
                     </Col>
                     <Col xs={12} lg={6}>
                         <AgencySettings />
+                        <AgencyLogo />
                     </Col>
                 </Row>
                 {isEnabled(FeatureFlag.CentralDataProtectionTemplate) && (

diff --git a/src/styles/components/loginForm.less b/src/styles/components/loginForm.less
@@ -29,7 +29,7 @@
     }
 }
 
-@media screen and (min-width: @screen-md) {
+@media screen and (min-width: @screen-sm) {
     .loginForm {
         .ant-form-item-label > label {
             .labelText {
@@ -38,3 +38,12 @@
         }
     }
 }
+
+@media screen and (min-width: @screen-sm) and (max-width: @screen-md) {
+    .loginForm {
+        .ant-form-item-label {
+            flex: 0 auto;
+            max-width: none;
+        }
+    }
+}