ui: artist/media editor nullify empty fields

Japan7 · Aug 24, 2024 · c7ea499 · c7ea499
1 parent 2601480
commit c7ea499
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/ui/src/components/ArtistEditor.tsx b/ui/src/components/ArtistEditor.tsx
@@ -8,14 +8,18 @@ export default function ArtistEditor(props: {
 }) {
   const [getName, setName] = createSignal(props.artist?.Name ?? "");
   const [getAdditionalNames, setAdditionalNames] = createSignal(
-    props.artist?.AdditionalNames?.join("\n") ?? "",
+    props.artist?.AdditionalNames?.map((n) => n.Name).join("\n") ?? "",
   );
 
   const onsubmit: JSX.EventHandler<HTMLElement, SubmitEvent> = (e) => {
     e.preventDefault();
+    const additionalNamesStr = getAdditionalNames().trim();
+    const additionalNames = additionalNamesStr
+      ? additionalNamesStr.split("\n")
+      : null;
     props.onSubmit({
       name: getName(),
-      additional_names: getAdditionalNames().trim().split("\n"),
+      additional_names: additionalNames,
     });
     if (props.reset) {
       (e.target as HTMLFormElement).reset();

diff --git a/ui/src/components/KaraEditor.tsx b/ui/src/components/KaraEditor.tsx
@@ -56,9 +56,9 @@ export default function KaraEditor(props: {
   const [getSourceMedia, setSourceMedia] = createSignal<
     components["schemas"]["MediaDB"] | undefined
   >(props.kara?.SourceMedia);
-  const [getSongOrder, setSongOrder] = createSignal<number | undefined>(
-    props.kara?.SongOrder,
-  );
+  const [getSongOrder, setSongOrder] = createSignal<
+    components["schemas"]["KaraInfo"]["song_order"] | undefined
+  >(props.kara?.SongOrder);
   const [getMedias, setMedias] = createSignal<
     components["schemas"]["MediaDB"][]
   >(props.kara?.Medias ?? []);
@@ -86,9 +86,11 @@ export default function KaraEditor(props: {
 
   const onsubmit: JSX.EventHandler<HTMLElement, SubmitEvent> = (e) => {
     e.preventDefault();
+    const extraTitlesStr = getExtraTitles().trim();
+    const extraTitles = extraTitlesStr ? extraTitlesStr.split("\n") : null;
     props.onSubmit({
       title: getTitle(),
-      title_aliases: getExtraTitles().trim().split("\n") || null,
+      title_aliases: extraTitles,
       authors: getAuthors().map((author) => author.ID) || null,
       artists: getArtists().map((artist) => artist.ID) || null,
       source_media: getSourceMedia()?.ID || 0,

diff --git a/ui/src/components/MediaEditor.tsx b/ui/src/components/MediaEditor.tsx
@@ -17,15 +17,19 @@ export default function MediaEditor(props: {
   );
   const [getName, setName] = createSignal(props.media?.name ?? "");
   const [getAdditionalNames, setAdditionalNames] = createSignal(
-    props.media?.additional_name?.join("\n") ?? "",
+    props.media?.additional_name?.map((n) => n.Name).join("\n") ?? "",
   );
 
   const onsubmit: JSX.EventHandler<HTMLElement, SubmitEvent> = (e) => {
     e.preventDefault();
+    const additionalNamesStr = getAdditionalNames().trim();
+    const additionalNames = additionalNamesStr
+      ? additionalNamesStr.split("\n")
+      : null;
     props.onSubmit({
       media_type: getMediaType(),
       name: getName(),
-      additional_names: getAdditionalNames().trim().split("\n"),
+      additional_names: additionalNames,
     });
     if (props.reset) {
       (e.target as HTMLFormElement).reset();