Address review comments

Author: JulianKniephoff

CONFIGURATION.md

@@ -106,18 +106,17 @@ further below for information on that.
 # Default: 'optional'.
 #seriesField = 'optional'
 
-# Whether and if so how to fill the presenter name in the upload step.
-# This is a list of sources for potential presenter names to suggest,
-# in order of descending preference.
-# If it is empty, nothing is suggested.
-# Note that right now there is only one such source,
-# and that manual changes to the presenter form field
-# will be persisted in the users' `localStorage`,
-# and that stored value will always be preferred
-# over the generated suggestion.
+# Whether to fill the presenter name in the upload step, and if so, how.
+# This is a list of sources for potential presenter names to fill in,
+# in order of descending preference. If it is empty, nothing is suggested.
+#
+# Note that right now there is only one such source. Also, manual changes
+# to the presenter form field will be persisted in the users' `localStorage`,
+# and that stored value will always be preferred over the other sources.
 #
 # Possible sources are:
-# - `"opencast"`: Get the name from Opencast's `/info/me.json` API
+# - `"opencast"`: Get the name from Opencast's `/info/me.json` API,
+#   specifically the field `user.name`
 #autofillPresenter = []
 
 

src/opencast.tsx

@@ -290,25 +290,15 @@ export class Opencast {
 
   /** Returns the value from user.name from the `/info/me.json` endpoint. */
   getUsername(): string | null {
-    if (!(this.#currentUser)) {
-      return null;
-    }
-    if (!(typeof this.#currentUser === "object")) {
-      return null;
-    }
-    if (!("user" in this.#currentUser)) {
-      return null;
-    }
-    if (!this.#currentUser.user) {
-      return null;
-    }
-    if (!(typeof this.#currentUser.user === "object")) {
-      return null;
-    }
-    if (!("name" in this.#currentUser.user)) {
-      return null;
-    }
-    if (!(typeof this.#currentUser.user.name === "string")) {
+    if (!(
+      this.#currentUser
+      && typeof this.#currentUser === "object"
+      && "user" in this.#currentUser
+      && this.#currentUser.user
+      && typeof this.#currentUser.user === "object"
+      && "name" in this.#currentUser.user
+      && typeof this.#currentUser.user.name === "string"
+    )) {
       return null;
     }
     return this.#currentUser.user.name;

src/steps/finish/upload.tsx

@@ -159,13 +159,12 @@ type UploadFormProps = {
 };
 
 const UploadForm: React.FC<UploadFormProps> = ({ handleUpload }) => {
-  const uploadSettings = useSettings().upload ?? {};
   const {
     titleField = "required",
     presenterField = "required",
     seriesField = "optional",
     autofillPresenter = [],
-  } = uploadSettings;
+  } = useSettings().upload ?? {};
 
   const { t, i18n } = useTranslation();
   const opencast = useOpencast();
@@ -178,7 +177,7 @@ const UploadForm: React.FC<UploadFormProps> = ({ handleUpload }) => {
       .map(source => match(source, {
         "opencast": () => opencast.getUsername(),
       }))
-      .filter(Boolean)[0]
+      .find(Boolean)
     || "";
 
   type FormState = "idle" | "testing";
@@ -214,6 +213,15 @@ const UploadForm: React.FC<UploadFormProps> = ({ handleUpload }) => {
     }
   }
 
+  // If the user has not yet changed the value of the field, but it has been prefilled
+  // from local storage or one of the `autofillPresenter` sources, update the state
+  // using that value.
+  useEffect(() => {
+    if (presenterValue !== presenter) {
+      dispatch({ type: "UPDATE_PRESENTER", value: presenterValue });
+    }
+  }, []);
+
   const configurableServerUrl = settingsManager.isConfigurable("opencast.serverUrl");
   const configurableUsername = settingsManager.isUsernameConfigurable();
   const configurablePassword = settingsManager.isPasswordConfigurable();