Merge pull request #1031 from digitalfabrik/1030-incomplete-data-priv…

…acy-policy 1030: Incomplete data privacy
digitalfabrik · Jun 28, 2023 · cb2fc68 · cb2fc68
2 parents 75d71c0 + b492226
commit cb2fc68
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/administration/src/bp-modules/regions/data-privacy-policy/DataPrivacyPolicy.tsx b/administration/src/bp-modules/regions/data-privacy-policy/DataPrivacyPolicy.tsx
@@ -22,6 +22,7 @@ const DataPrivacyPolicy = (): ReactElement => {
     <Container>
       <Title>{config.dataPrivacyHeadline}</Title>
       <config.dataPrivacyContent />
+      {config.dataPrivacyAdditionalBaseContent && <config.dataPrivacyAdditionalBaseContent />}
     </Container>
   )
 }

diff --git a/administration/src/mui-modules/application/forms/StepSendForm.tsx b/administration/src/mui-modules/application/forms/StepSendForm.tsx
@@ -77,6 +77,7 @@ const StepSendForm: Form<State, Options, ValidatedInput, AdditionalProps> = {
     const policyQueryHandler = getQueryResult(policyQuery)
     if (!policyQueryHandler.successful) return policyQueryHandler.component
     const dataPrivacyPolicy = policyQueryHandler.data.dataPolicy.dataPrivacyPolicy
+
     return (
       <>
         <SubForms.hasAcceptedDataPrivacy.Component
@@ -105,7 +106,11 @@ const StepSendForm: Form<State, Options, ValidatedInput, AdditionalProps> = {
           content={
             <>
               <config.dataPrivacyContent />
-              <div>{dataPrivacyPolicy}</div>
+              {config.dataPrivacyAdditionalBaseContent && (!dataPrivacyPolicy || dataPrivacyPolicy.length === 0) ? (
+                <config.dataPrivacyAdditionalBaseContent />
+              ) : (
+                <div>{dataPrivacyPolicy}</div>
+              )}
             </>
           }
         />

diff --git a/administration/src/project-configs/bayern/config.ts b/administration/src/project-configs/bayern/config.ts
@@ -1,7 +1,7 @@
 import BavariaCardTypeExtension from '../../cards/extensions/BavariaCardTypeExtension'
 import RegionExtension from '../../cards/extensions/RegionExtension'
 import { ProjectConfig } from '../getProjectConfig'
-import { DataPrivacyBaseText, dataPrivacyBaseHeadline } from './dataPrivacyBase'
+import { DataPrivacyAdditionalBaseText, DataPrivacyBaseText, dataPrivacyBaseHeadline } from './dataPrivacyBase'
 import pdfConfiguration from './pdf'
 
 const config: ProjectConfig = {
@@ -18,6 +18,7 @@ const config: ProjectConfig = {
   },
   dataPrivacyHeadline: dataPrivacyBaseHeadline,
   dataPrivacyContent: DataPrivacyBaseText,
+  dataPrivacyAdditionalBaseContent: DataPrivacyAdditionalBaseText,
   timezone: 'Europe/Berlin',
   pdf: pdfConfiguration,
 }

diff --git a/administration/src/project-configs/bayern/dataPrivacyBase.tsx b/administration/src/project-configs/bayern/dataPrivacyBase.tsx
@@ -449,11 +449,16 @@ export const DataPrivacyBaseText = () => (
       Informationen, die Sie unverschlüsselt per E-Mail an uns senden können, möglicherweise auf dem Übertragungsweg von
       Dritten gelesen werden.{' '}
     </p>
-    <p style={{ marginTop: '0pt', marginBottom: '8pt' }}>
+    <div>
       <span>
         <b>Weitergabe der Daten an externe Dritte</b>
       </span>
-    </p>
-    <p style={{ marginTop: '0pt', marginBottom: '8pt' }} />
+    </div>
+  </div>
+)
+
+export const DataPrivacyAdditionalBaseText = () => (
+  <div>
+    <span>Es erfolgt keine Weitergabe der Daten an Dritte.</span>
   </div>
 )
diff --git a/administration/src/project-configs/getProjectConfig.ts b/administration/src/project-configs/getProjectConfig.ts
@@ -42,6 +42,7 @@ export interface ProjectConfig {
   card: CardConfig
   dataPrivacyHeadline: string
   dataPrivacyContent: () => ReactElement
+  dataPrivacyAdditionalBaseContent?: () => ReactElement
   pdf: PdfConfig
   timezone: string
   activityLogConfig?: ActivityLogConfig