From d3a24238b0dc6494f611bbcf524de880806c38e1 Mon Sep 17 00:00:00 2001
From: Arnei <arnewilken@yahoo.de>
Date: Fri, 5 Jul 2024 13:48:22 +0200
Subject: [PATCH 1/8] Start adopter registration with information page...

... instead of throwing a form right in their face.
---
 src/components/shared/RegistrationModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/shared/RegistrationModal.tsx b/src/components/shared/RegistrationModal.tsx
index ba22d4b493..4ae9203de7 100644
--- a/src/components/shared/RegistrationModal.tsx
+++ b/src/components/shared/RegistrationModal.tsx
@@ -25,7 +25,7 @@ const RegistrationModal = ({
 	const { t } = useTranslation();
 
 	// current state of the modal that is shown
-	const [state, setState] = useState<keyof typeof states>("form");
+	const [state, setState] = useState<keyof typeof states>("information");
 	// initial values for Formik
 	const [initialValues, setInitialValues] = useState<Registration & { agreedToPolicy: boolean, registered: boolean }>({
 		contactMe: false,

From 089a55f5aa8250257e02561be68cd84f754b2ab0 Mon Sep 17 00:00:00 2001
From: Arnei <arnewilken@yahoo.de>
Date: Fri, 5 Jul 2024 13:48:47 +0200
Subject: [PATCH 2/8] Fix header getting cut of

Headers in the Adopte Registration had their top
and bottom cut off.
---
 src/styles/extensions/views/modals/_registration.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/styles/extensions/views/modals/_registration.scss b/src/styles/extensions/views/modals/_registration.scss
index 5b633b005c..99de606c13 100644
--- a/src/styles/extensions/views/modals/_registration.scss
+++ b/src/styles/extensions/views/modals/_registration.scss
@@ -173,6 +173,7 @@
         h2 {
           font-size: 31px;
           color: $dark-prim-color;
+          overflow: visible;
         }
 
         &.for-header {

From 1dec530ebd2d826a7f5e9c486ecf2161d2fe906d Mon Sep 17 00:00:00 2001
From: Arnei <arnewilken@yahoo.de>
Date: Fri, 5 Jul 2024 13:55:40 +0200
Subject: [PATCH 3/8] Show back button on Adopter Registration form

Now that we show the information first again,
it makes sense to go back to the information from
the form.
---
 src/components/shared/RegistrationModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/shared/RegistrationModal.tsx b/src/components/shared/RegistrationModal.tsx
index 4ae9203de7..4320bbf362 100644
--- a/src/components/shared/RegistrationModal.tsx
+++ b/src/components/shared/RegistrationModal.tsx
@@ -659,7 +659,7 @@ const RegistrationModal = ({
 
 								{/* back, delete or cancel button depending on state */}
 								<div className="pull-left">
-									{state !== "form" && states[state].buttons.back && (
+									{states[state].buttons.back && (
 										<button
 											className="cancel"
 // @ts-expect-error TS(7053): Element implicitly has an 'any' type because expre... Remove this comment to see the full error message

From d12663c5b4ca941d6d39d78f3554893208af34b2 Mon Sep 17 00:00:00 2001
From: Arnei <arnewilken@yahoo.de>
Date: Fri, 5 Jul 2024 14:16:49 +0200
Subject: [PATCH 4/8] Properly space translations string

In order to avoid words sticking together.
---
 src/components/shared/RegistrationModal.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/shared/RegistrationModal.tsx b/src/components/shared/RegistrationModal.tsx
index 4320bbf362..0ac58adf2f 100644
--- a/src/components/shared/RegistrationModal.tsx
+++ b/src/components/shared/RegistrationModal.tsx
@@ -607,9 +607,9 @@ const RegistrationModal = ({
 																setState(states[state].nextState[2] as keyof typeof states)
 															}
 														>
-															{t(
+															{" " + t(
 																"ADOPTER_REGISTRATION.MODAL.FORM_STATE.READ_TERMS_OF_USE_LINK"
-															)}
+															) + " "}
 														</span>
 														<span>
 															{t(

From a1783f8406d66fa2f9bcecd41aa4e05e9f7666f8 Mon Sep 17 00:00:00 2001
From: Arnei <arnewilken@yahoo.de>
Date: Mon, 8 Jul 2024 09:03:38 +0200
Subject: [PATCH 5/8] Add back summary page to adopter registration

Adds back the summary page to the adopter
registration which will show you exactly what
data is being sent.
---
 src/components/shared/RegistrationModal.tsx   | 32 ++++++++++++++++---
 src/configs/adopterRegistrationConfig.ts      | 22 ++++++++++---
 .../adminui/languages/lang-en_US.json         |  7 ++++
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/src/components/shared/RegistrationModal.tsx b/src/components/shared/RegistrationModal.tsx
index 0ac58adf2f..7af7270853 100644
--- a/src/components/shared/RegistrationModal.tsx
+++ b/src/components/shared/RegistrationModal.tsx
@@ -624,17 +624,41 @@ const RegistrationModal = ({
 								</div>
 							)}
 
+							{/* shows summary of information */}
+							{state === "summary" && (
+								<div className="modal-content" style={{ display: "block" }}>
+									<div className="modal-body">
+										<p>{t("ADOPTER_REGISTRATION.MODAL.SUMMARY_STATE.HEADER")}</p>
+										<p>{t("ADOPTER_REGISTRATION.MODAL.SUMMARY_STATE.GENERAL_HEADER")}</p>
+										<div className="scrollbox">
+											<pre>
+												{JSON.stringify(formik.values, null, "\t")}
+											</pre>
+										</div>
+										<br />
+										<p>{t("ADOPTER_REGISTRATION.MODAL.SUMMARY_STATE.STATS_HEADER")}</p>
+									</div>
+								</div>
+							)}
+
 							{/* navigation buttons depending on state of modal */}
 							<footer>
 								{states[state].buttons.submit && (
 									<div className="pull-right">
 										{/* submit of form content */}
-										{state === "form" ? (
+										{state === "summary" ?
+												<button
+												onClick={() => formik.handleSubmit()}
+												className={cn("submit")}
+											>
+												{t(states[state].buttons.submitButtonText)}
+											</button>
+										: state === "form" ?
 											<button
 												disabled={
 													!(formik.isValid && formik.values.agreedToPolicy)
 												}
-												onClick={() => formik.handleSubmit()}
+												onClick={() => onClickContinue()}
 												className={cn("submit", {
 													active:
 														formik.isValid && formik.values.agreedToPolicy,
@@ -645,7 +669,7 @@ const RegistrationModal = ({
 											>
 												{t(states[state].buttons.submitButtonText)}
 											</button>
-										) : (
+										:
 											// continue button or confirm button (depending on state)
 											<button
 												className="continue-registration"
@@ -653,7 +677,7 @@ const RegistrationModal = ({
 											>
 												{t(states[state].buttons.submitButtonText)}
 											</button>
-										)}
+										}
 									</div>
 								)}
 
diff --git a/src/configs/adopterRegistrationConfig.ts b/src/configs/adopterRegistrationConfig.ts
index ecf1197ec0..4fa5a191cd 100644
--- a/src/configs/adopterRegistrationConfig.ts
+++ b/src/configs/adopterRegistrationConfig.ts
@@ -16,8 +16,8 @@ export const states = {
 	},
 	form: {
 		nextState: {
-			0: "thank_you",
-			1: "error",
+			0: "close",
+			1: "summary",
 			2: "legal_info",
 			3: "update",
 			4: "delete_submit",
@@ -29,7 +29,7 @@ export const states = {
 			skip: false,
 			close: true,
 			delete: false,
-			submitButtonText: "SUBMIT",
+			submitButtonText: "ADOPTER_REGISTRATION.MODAL.CONTINUE",
 		},
 	},
 	save: {
@@ -69,7 +69,7 @@ export const states = {
 			back: true,
 			skip: false,
 			close: true,
-			submitButtonText: "CONFIRM",
+			submitButtonText: "ADOPTER_REGISTRATION.MODAL.CONFIRM",
 		},
 	},
 	delete: {
@@ -85,6 +85,20 @@ export const states = {
 			submitButtonText: "",
 		},
 	},
+	summary: {
+		nextState: {
+			0: "thank_you",
+			1: "error",
+			5: "form",
+		},
+		buttons: {
+			submit: true,
+			back: true,
+			skip: false,
+			close: true,
+			submitButtonText: "ADOPTER_REGISTRATION.MODAL.SUBMIT",
+		},
+	},
 	thank_you: {
 		nextState: {
 			0: "close",
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json b/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
index 7e2070d0aa..71b6938f40 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
@@ -387,9 +387,16 @@
 			"SKIP": "Not now",
 			"CONTINUE": "Continue",
 			"BACK": "Back",
+			"SUBMIT": "Submit",
+			"CONFIRM": "Confirm",
 			"LEGAL_INFO_STATE": {
 				"HEADER": "Terms of Service and Privacy Policy"
 			},
+			"SUMMARY_STATE": {
+				"HEADER": "This is a JSON summary of exactly what would be sent to Opencast's servers",
+				"GENERAL_HEADER": "Adopter Information",
+				"STATS_HEADER": "Statistical Information"
+			},
 			"INFORMATION_STATE": {
 				"HEADER": "Thank you for using Opencast!",
 				"INFORMATION_PARAGRAPH_1": "Our developers are constantly working to provide you the best possible user experience. For that, we need to know more about who uses Opencast and how it is used. You can help us with a quick registration.",

From ac7d9db51454b86a6d0cb169cefe016ddef84951 Mon Sep 17 00:00:00 2001
From: Arnei <arnewilken@yahoo.de>
Date: Mon, 8 Jul 2024 09:12:21 +0200
Subject: [PATCH 6/8] Add some spacing to thank you message

Make the thank you sentence at the end of the
adopter registration a little more readable.
---
 src/components/shared/RegistrationModal.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/shared/RegistrationModal.tsx b/src/components/shared/RegistrationModal.tsx
index 7af7270853..5948efb460 100644
--- a/src/components/shared/RegistrationModal.tsx
+++ b/src/components/shared/RegistrationModal.tsx
@@ -237,7 +237,9 @@ const RegistrationModal = ({
 										</span>
 										<b>
 											(<span>{t("HELP.HELP")}</span>)
+											{" "}
 											<span className="fa fa-question-circle" />
+											{" > "}
 											<span>{t("HELP.ADOPTER_REGISTRATION")}</span>
 										</b>
 										<span>

From 3a258be45e6a1198fe87b72a7bc58b4c0e7286c4 Mon Sep 17 00:00:00 2001
From: Arnei <arnewilken@yahoo.de>
Date: Wed, 10 Jul 2024 11:32:26 +0200
Subject: [PATCH 7/8] Fetch statistics summary for adopter registration

If the user agrees to sending usage statistics,
show them what statistics they are sending.
---
 src/components/shared/RegistrationModal.tsx | 21 +++++++++++++++++++++
 src/utils/adopterRegistrationUtils.ts       |  7 +++++++
 2 files changed, 28 insertions(+)

diff --git a/src/components/shared/RegistrationModal.tsx b/src/components/shared/RegistrationModal.tsx
index 5948efb460..f4924ea79f 100644
--- a/src/components/shared/RegistrationModal.tsx
+++ b/src/components/shared/RegistrationModal.tsx
@@ -9,6 +9,7 @@ import {
 	Registration,
 	deleteAdopterRegistration,
 	fetchAdopterRegistration,
+	fetchAdopterStatisticsSummary,
 	postRegistration,
 } from "../../utils/adopterRegistrationUtils";
 import { useHotkeys } from "react-hotkeys-hook";
@@ -45,6 +46,11 @@ const RegistrationModal = ({
 		registered: false,
 	});
 
+	const [statisticsSummary, setStatisticsSummary] = useState<{
+		general: { [key: string]: unknown },
+		statistics: { [key: string]: unknown },
+	}>();
+
 	useHotkeys(
 		availableHotkeys.general.CLOSE_MODAL.sequence,
 		() => close(),
@@ -58,6 +64,7 @@ const RegistrationModal = ({
 
 	useEffect(() => {
 		fetchRegistrationInfos().then((r) => console.log(r));
+		fetchStatisticSummary();
 	}, []);
 
 	const onClickContinue = async () => {
@@ -76,6 +83,12 @@ const RegistrationModal = ({
 		setInitialValues(registrationInfo);
 	};
 
+	const fetchStatisticSummary = async () => {
+		const info = await fetchAdopterStatisticsSummary();
+
+		setStatisticsSummary(info);
+	}
+
 	const handleSubmit = (values: Registration) => {
 		// post request for adopter information
 		postRegistration(values)
@@ -638,7 +651,15 @@ const RegistrationModal = ({
 											</pre>
 										</div>
 										<br />
+
 										<p>{t("ADOPTER_REGISTRATION.MODAL.SUMMARY_STATE.STATS_HEADER")}</p>
+										{formik.values.allowsStatistics &&
+											<div className="scrollbox">
+												<pre>
+													{JSON.stringify(statisticsSummary?.statistics, null, "\t")}
+												</pre>
+											</div>
+										}
 									</div>
 								</div>
 							)}
diff --git a/src/utils/adopterRegistrationUtils.ts b/src/utils/adopterRegistrationUtils.ts
index 1b30459b64..2095de2e46 100644
--- a/src/utils/adopterRegistrationUtils.ts
+++ b/src/utils/adopterRegistrationUtils.ts
@@ -8,6 +8,13 @@ export const fetchAdopterRegistration = async () => {
 	return await response.data;
 };
 
+// get statistics information about adopter
+export const fetchAdopterStatisticsSummary = async () => {
+	const response = await axios.get("/admin-ng/adopter/summary");
+
+	return await response.data;
+};
+
 export type Registration = {
 	contactMe: boolean,
 	allowsStatistics: boolean,

From 1f95393ff0256bfed9b3c7b3097fa0999f84afd9 Mon Sep 17 00:00:00 2001
From: Arnei <arnewilken@yahoo.de>
Date: Wed, 24 Jul 2024 16:56:35 +0200
Subject: [PATCH 8/8] Display proper message if user does not want to share
 stats

Instead of showing the user an empty json,
properly tell them that no statistics data will
be shared with their adopter registration if they
don't want to.
---
 src/components/shared/RegistrationModal.tsx                | 7 +++++--
 .../org/opencastproject/adminui/languages/lang-en_US.json  | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/shared/RegistrationModal.tsx b/src/components/shared/RegistrationModal.tsx
index f4924ea79f..0492b97e0e 100644
--- a/src/components/shared/RegistrationModal.tsx
+++ b/src/components/shared/RegistrationModal.tsx
@@ -652,13 +652,16 @@ const RegistrationModal = ({
 										</div>
 										<br />
 
-										<p>{t("ADOPTER_REGISTRATION.MODAL.SUMMARY_STATE.STATS_HEADER")}</p>
-										{formik.values.allowsStatistics &&
+										{formik.values.allowsStatistics ?
+										<>
+											<p>{t("ADOPTER_REGISTRATION.MODAL.SUMMARY_STATE.STATS_HEADER")}</p>
 											<div className="scrollbox">
 												<pre>
 													{JSON.stringify(statisticsSummary?.statistics, null, "\t")}
 												</pre>
 											</div>
+										</>
+										: <p>{t("ADOPTER_REGISTRATION.MODAL.SUMMARY_STATE.NO_STATS_HEADER")}</p>
 										}
 									</div>
 								</div>
diff --git a/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json b/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
index 71b6938f40..f67b0cbe0b 100644
--- a/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
+++ b/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json
@@ -395,7 +395,8 @@
 			"SUMMARY_STATE": {
 				"HEADER": "This is a JSON summary of exactly what would be sent to Opencast's servers",
 				"GENERAL_HEADER": "Adopter Information",
-				"STATS_HEADER": "Statistical Information"
+				"STATS_HEADER": "Statistical Information",
+				"NO_STATS_HEADER": "No statistics data will be shared"
 			},
 			"INFORMATION_STATE": {
 				"HEADER": "Thank you for using Opencast!",