From 6b4f1d9f637ce00b3357029bdc5a5b850dd709a8 Mon Sep 17 00:00:00 2001
From: ze0s <43699394+zze0s@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:45:45 +0100
Subject: [PATCH] fix(database): migrations to update PTP IRC channel (#1906)

* fix(database): migrations to update PTP IRC channel

* refactor(web): remove channel disable logic from IRC forms

---------

Co-authored-by: s0up4200 <s0up4200@pm.me>
---
 internal/database/postgres_migrate.go |  6 +++---
 internal/database/sqlite_migrate.go   |  2 +-
 web/src/forms/settings/IrcForms.tsx   | 21 +++++----------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/internal/database/postgres_migrate.go b/internal/database/postgres_migrate.go
index 208919e..3602172 100644
--- a/internal/database/postgres_migrate.go
+++ b/internal/database/postgres_migrate.go
@@ -1340,9 +1340,9 @@ CREATE INDEX release_cut_index
 CREATE INDEX release_hybrid_index
     ON "release" (hybrid);
 `,
-	`UPDATE irc_channel 
-    SET name = '#ptp-announce'
-    WHERE name = '#ptp-announce-dev';
+	`UPDATE irc_channel
+	SET name = '#ptp-announce'
+	WHERE name = '#ptp-announce-dev' AND NOT EXISTS (SELECT 1 FROM irc_channel WHERE name = '#ptp-announce');
 
 	UPDATE irc_network
   SET invite_command = REPLACE(invite_command, '#ptp-announce-dev', '#ptp-announce')
diff --git a/internal/database/sqlite_migrate.go b/internal/database/sqlite_migrate.go
index 2130290..fbf563e 100644
--- a/internal/database/sqlite_migrate.go
+++ b/internal/database/sqlite_migrate.go
@@ -1987,7 +1987,7 @@ CREATE INDEX release_hybrid_index
 `,
 	`UPDATE irc_channel 
     SET name = '#ptp-announce'
-    WHERE name = '#ptp-announce-dev';
+    WHERE name = '#ptp-announce-dev' AND NOT EXISTS (SELECT 1 FROM irc_channel WHERE name = '#ptp-announce');
 `,
 	`UPDATE irc_network
   SET invite_command = REPLACE(invite_command, '#ptp-announce-dev', '#ptp-announce')
diff --git a/web/src/forms/settings/IrcForms.tsx b/web/src/forms/settings/IrcForms.tsx
index 135e00d..087c708 100644
--- a/web/src/forms/settings/IrcForms.tsx
+++ b/web/src/forms/settings/IrcForms.tsx
@@ -34,9 +34,7 @@ const ChannelsFieldArray = ({ channels }: ChannelsFieldArrayProps) => (
       {({ remove, push }: FieldArrayRenderProps) => (
         <div className="flex flex-col space-y-2">
           {channels && channels.length > 0 ? (
-            channels.map((channel: IrcChannel, index) => {
-              const isDisabled = channel.name === "#ptp-announce-dev";
-              return (
+              channels.map((_, index) => (
                 <div key={index} className="flex justify-between border dark:border-gray-700 dark:bg-gray-815 p-2 rounded-md">
                   <div className="flex gap-2">
                     <Field name={`channels.${index}.name`}>
@@ -50,10 +48,8 @@ const ChannelsFieldArray = ({ channels }: ChannelsFieldArrayProps) => (
                             meta.touched && meta.error
                               ? "border-red-500 focus:ring-red-500 focus:border-red-500"
                               : "border-gray-300 dark:border-gray-700 focus:ring-blue-500 dark:focus:ring-blue-500 focus:border-blue-500 dark:focus:border-blue-500",
-                            "block w-full shadow-sm sm:text-sm rounded-md border py-2.5",
-                            isDisabled ? "disabled dark:bg-gray-700 dark:text-gray-400 cursor-not-allowed" : "bg-gray-100 dark:bg-gray-850 dark:text-gray-100"
+                            "block w-full shadow-sm sm:text-sm rounded-md border py-2.5 bg-gray-100 dark:bg-gray-850 dark:text-gray-100"
                           )}
-                          disabled={isDisabled}
                         />
                       )}
                     </Field>
@@ -70,10 +66,8 @@ const ChannelsFieldArray = ({ channels }: ChannelsFieldArrayProps) => (
                             meta.touched && meta.error
                               ? "border-red-500 focus:ring-red-500 focus:border-red-500"
                               : "border-gray-300 dark:border-gray-700 focus:ring-blue-500 dark:focus:ring-blue-500 focus:border-blue-500 dark:focus:border-blue-500",
-                            "block w-full shadow-sm sm:text-sm rounded-md border py-2.5",
-                            isDisabled ? "disabled dark:bg-gray-700 dark:text-white cursor-not-allowed" : "bg-gray-100 dark:bg-gray-850 dark:text-gray-100"
+                            "block w-full shadow-sm sm:text-sm rounded-md border py-2.5 bg-gray-100 dark:bg-gray-850 dark:text-gray-100"
                           )}
-                          disabled={isDisabled}
                         />
                       )}
                     </Field>
@@ -81,19 +75,14 @@ const ChannelsFieldArray = ({ channels }: ChannelsFieldArrayProps) => (
 
                   <button
                     type="button"
-                    className={classNames(
-                      "bg-white dark:bg-gray-700 rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-blue-500 dark:focus:ring-blue-500",
-                      isDisabled ? "hidden" : ""
-                    )}
+                    className="bg-white dark:bg-gray-700 rounded-md text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-blue-500 dark:focus:ring-blue-500"
                     onClick={() => remove(index)}
-                    disabled={isDisabled}
                   >
                     <span className="sr-only">Remove</span>
                     <XMarkIcon className="h-6 w-6" aria-hidden="true" />
                   </button>
                 </div>
-              );
-            })
+              ))
           ) : (
             <span className="text-center text-sm text-grey-darker dark:text-white">
               No channels!