From 4a030e47c31c4f03811691901867b70e0514d06f Mon Sep 17 00:00:00 2001
From: Kuba Orlik
Date: Sat, 9 Jul 2022 16:52:29 +0200
Subject: [PATCH] Fix react warnings
Closes #55
---
components/report-window/email-content.tsx | 5 +++--
.../problems/no-information-at-all.tsx | 2 +-
components/report-window/problems/problem.tsx | 5 ++++-
.../report-window/problems/transfer-outside-eu.tsx | 2 +-
.../report-window/problems/unknown-identity.tsx | 4 +---
.../report-window/problems/unknown-legal-basis.tsx | 2 +-
.../report-window/problems/unlawful-cookies.tsx | 14 ++++++++------
7 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/components/report-window/email-content.tsx b/components/report-window/email-content.tsx
index 803ffa2..da70ba2 100644
--- a/components/report-window/email-content.tsx
+++ b/components/report-window/email-content.tsx
@@ -25,7 +25,6 @@ export default function EmailContent({
downloadFiles: Function;
user_role: string;
}) {
- console.log('rendering email!', answers);
const _ = (key: string) => v(key, answers.zaimek);
const problems = deduceProblems(answers, clusters);
const explainers = Array.from(
@@ -64,7 +63,9 @@ export default function EmailContent({
{mode === 'email'
? emailIntro(email_tone, _, visited_url)
: reportIntro(visited_url)}
- {problems.map((problem) => problem.getEmailContent(mode, email_tone))}
+ {problems.map((problem, index) => (
+
+ ))}
{explainers.map((explainer) => explainer(answers.zaimek))}
Państwa rola jako współadministratora danych osobowych
{mode == 'email' ? (
diff --git a/components/report-window/problems/no-information-at-all.tsx b/components/report-window/problems/no-information-at-all.tsx
index e12d55b..6e02b01 100644
--- a/components/report-window/problems/no-information-at-all.tsx
+++ b/components/report-window/problems/no-information-at-all.tsx
@@ -6,7 +6,7 @@ export default class NoInformationAtAllProblem extends Problem {
qualifies() {
return this.answers.popup_type === 'none';
}
- getEmailContent(mode: 'email' | 'report', tone: 'official' | 'polite') {
+ getEmailContent({ mode, tone }: { mode: 'email' | 'report'; tone: 'official' | 'polite' }) {
const _ = (word: string) => v(word, this.answers.zaimek);
return (
<>
diff --git a/components/report-window/problems/problem.tsx b/components/report-window/problems/problem.tsx
index 7cc7b67..4b0e42e 100644
--- a/components/report-window/problems/problem.tsx
+++ b/components/report-window/problems/problem.tsx
@@ -16,7 +16,10 @@ function formatRange(cluster: RequestCluster) {
export abstract class Problem {
constructor(public answers: ParsedAnswers, public clusters: Record) {}
- abstract getEmailContent(mode: 'email' | 'report', tone: 'polite' | 'official'): JSX.Element;
+ abstract getEmailContent(props: {
+ mode: 'email' | 'report';
+ tone: 'polite' | 'official';
+ }): JSX.Element;
abstract getNecessaryExplainers(): ExplainerKey[];
abstract qualifies(): boolean;
diff --git a/components/report-window/problems/transfer-outside-eu.tsx b/components/report-window/problems/transfer-outside-eu.tsx
index e4f29b2..6784fd0 100644
--- a/components/report-window/problems/transfer-outside-eu.tsx
+++ b/components/report-window/problems/transfer-outside-eu.tsx
@@ -20,7 +20,7 @@ export class TransferOutsideEU extends Problem {
.map(([id]) => this.clusters[id]);
}
- getEmailContent(mode: 'email' | 'report') {
+ getEmailContent({ mode }: { mode: 'email' | 'report'; tone: 'official' | 'polite' }) {
const clusters = this.getRelatedClusters();
const _ = (key: string) => v(key, this.answers.zaimek);
return (
diff --git a/components/report-window/problems/unknown-identity.tsx b/components/report-window/problems/unknown-identity.tsx
index 4593e7d..c9fb21b 100644
--- a/components/report-window/problems/unknown-identity.tsx
+++ b/components/report-window/problems/unknown-identity.tsx
@@ -1,6 +1,4 @@
-import { RequestCluster } from '../../../request-cluster';
import { ExplainerKey } from '../explainers';
-import { ParsedHostAnswers } from '../parse-answers';
import { v } from '../verbs';
import { Problem } from './problem';
@@ -13,7 +11,7 @@ export class UnknownIdentity extends Problem {
return this.answers.administrator_identity_available_before_choice == 'no';
}
- getEmailContent(mode: 'email' | 'report', tone: 'polite' | 'official') {
+ getEmailContent({ mode, tone }: { mode: 'email' | 'report'; tone: 'official' | 'polite' }) {
const _ = (key: string) => v(key, this.answers.zaimek);
return (
<>
diff --git a/components/report-window/problems/unknown-legal-basis.tsx b/components/report-window/problems/unknown-legal-basis.tsx
index fc13e35..740f134 100644
--- a/components/report-window/problems/unknown-legal-basis.tsx
+++ b/components/report-window/problems/unknown-legal-basis.tsx
@@ -36,7 +36,7 @@ export class UnknownLegalBasis extends Problem {
);
}
- getEmailContent(mode: 'email' | 'report', tone: 'polite' | 'official') {
+ getEmailContent({ mode, tone }: { mode: 'email' | 'report'; tone: 'official' | 'polite' }) {
const clusters = this.getRelatedClusters();
const _ = (key: string) => v(key, this.answers.zaimek);
return (
diff --git a/components/report-window/problems/unlawful-cookies.tsx b/components/report-window/problems/unlawful-cookies.tsx
index 76c40eb..543f5ad 100644
--- a/components/report-window/problems/unlawful-cookies.tsx
+++ b/components/report-window/problems/unlawful-cookies.tsx
@@ -23,7 +23,7 @@ export class UnlawfulCookieAccess extends Problem {
});
}
- getEmailContent(mode: 'email' | 'report', tone: 'official' | 'polite') {
+ getEmailContent({ mode, tone }: { mode: 'email' | 'report'; tone: 'official' | 'polite' }) {
const cookie_clusters = Object.values(this.clusters).filter((c) => c.hasMarkedCookies());
const unnecessary_hosts = Object.entries(this.answers.hosts)
.filter(([, answers]) => answers.was_processing_necessary === 'no')
@@ -245,10 +245,12 @@ export class UnlawfulCookieAccess extends Problem {
)
) : (
-
- Jeżeli zgoda nadal ma być używana jako podstawa prawna do odczytu cookiesów
- przez skrypty wyżej wymienionych podmiotów, to należy zmienić mechanizm
- zgody tak, aby:{' '}
+ <>
+
+ Jeżeli zgoda nadal ma być używana jako podstawa prawna do odczytu plików
+ cookies przez skrypty wyżej wymienionych podmiotów, to należy zmienić
+ mechanizm zgody tak, aby:{' '}
+
{' '}
-
dawał użytkownikowi końcowemu możliwość odmowy zgody w sposób równie
@@ -262,7 +264,7 @@ export class UnlawfulCookieAccess extends Problem {
na nie zgody.
-
+ >
)}
{maybe_unnecessary_hosts.length > 1 && mode == 'email' && tone == 'official' ? (