Bugfix: Solved PGSQL Migration Issue, Msg Edit Remove Btn Issue.

Author: Ariansdf

database/migrations/2025_04_04_123507_update_enum_type_on_usage_records_table.php

@@ -8,11 +8,38 @@ class UpdateEnumTypeOnUsageRecordsTable extends Migration
 {
     public function up()
     {
-        // This updates the 'type' column to include 'api'.
-        DB::statement("
-            ALTER TABLE `usage_records`
-            MODIFY COLUMN `type` ENUM('private', 'group', 'api')
-        ");
+        if(env('DB_CONNECTION') == 'pgsql') {
+            // Check if the column uses a custom enum type or is just a varchar with a check constraint:
+            // Query information_schema to get the column type
+            $columnType = DB::table('information_schema.columns')
+                ->where('table_name', 'usage_records')
+                ->where('column_name', 'type')
+                ->value('udt_name');
+
+            if ($columnType === 'usage_type') {
+                // If the column uses a custom enum type 'usage_type'
+                DB::statement("ALTER TYPE usage_type ADD VALUE IF NOT EXISTS 'api';");
+            } else {
+                // Default Laravel enum - type is string/varchar with a check constraint
+                // Drop the old check constraint (if any), then add the new one
+
+                // Constraint names can be different if the table was renamed, but by default it's "usage_records_type_check"
+                // You might want to check your postgres schema if unsure
+                DB::statement('ALTER TABLE usage_records DROP CONSTRAINT IF EXISTS usage_records_type_check;');
+                DB::statement(
+                    "ALTER TABLE usage_records
+                     ADD CONSTRAINT usage_records_type_check
+                     CHECK (type IN ('private', 'group', 'api'));"
+                );
+            }
+        }
+        else{
+            // This updates the 'type' column to include 'api'.
+            DB::statement("
+                ALTER TABLE `usage_records`
+                MODIFY COLUMN `type` ENUM('private', 'group', 'api')
+            ");
+        }
     }
 
     public function down()
@@ -23,4 +50,4 @@ public function down()
             MODIFY COLUMN `type` ENUM('private', 'group')
         ");
     }
-}
+}

public/js_v2.1.0/message_functions.js

@@ -68,9 +68,7 @@ function addMessageToChatlog(messageObj, isFromServer = false){
     }
 
     /// Set Author Name
-    console.log(messageObj);
     if(messageObj.model && messageObj.message_role === 'assistant'){
-        console.log(messageObj);
         model = modelsList.find(m => m.id === messageObj.model);
         messageElement.querySelector('.message-author').innerHTML =
             model ?
@@ -607,27 +605,6 @@ function editMessage(provider){
     });
 
 
-    /// ATTACHMENTS
-    if(wrapper.querySelectorAll('.attachment').length > 0){
-        const atchs = wrapper.querySelectorAll('.attachment');
-        atchs.forEach(atch => {
-            atch.classList.add('edit-mode');
-            const rmBtn = atch.querySelector('.remove-btn');
-            rmBtn.style.display = 'flex';
-            rmBtn.disabled = false;
-            rmBtn.addEventListener('click', async ()=> {
-                const confirm = await openModal(ModalType.WARNING, translation.Cnf_RemoveFile);
-                if(!confirm){
-                    return;
-                }
-                const deleted = await requestAtchDelete(atch.dataset.fileId, 'conv');
-                if(deleted){
-                    atch.remove();
-                }
-            });
-        });
-    }
-
     content.setAttribute('contenteditable', true);
     content.dataset.tempContent = content.innerHTML;
     const rawMsg = content.closest('.message').dataset.rawMsg;
@@ -667,15 +644,15 @@ function abortEditMessage(provider){
     wrapper.classList.remove('edit-mode');
 
 
-    if(wrapper.querySelectorAll('.attachment').length > 0){
-        const atchs = wrapper.querySelectorAll('.attachment');
-        atchs.forEach(atch => {
-            atch.classList.remove('edit-mode');
-            const rmBtn = atch.querySelector('.remove-btn');
-            rmBtn.disabled = true;
-            rmBtn.style.display = 'none';
-        })
-    };
+    // if(wrapper.querySelectorAll('.attachment').length > 0){
+    //     const atchs = wrapper.querySelectorAll('.attachment');
+    //     atchs.forEach(atch => {
+    //         atch.classList.remove('edit-mode');
+    //         const rmBtn = atch.querySelector('.remove-btn');
+    //         rmBtn.disabled = true;
+    //         rmBtn.style.display = 'none';
+    //     })
+    // };
 
 
     const content = wrapper.querySelector('.message-content');
@@ -700,18 +677,6 @@ async function confirmEditMessage(provider){
     const wrapper = provider.closest('.message-wrapper');
     wrapper.classList.remove('edit-mode');
 
-
-    if(wrapper.querySelectorAll('.attachment').length > 0){
-        const atchs = wrapper.querySelectorAll('.attachment');
-        atchs.forEach(atch => {
-            atch.classList.remove('edit-mode');
-            const rmBtn = atch.querySelector('.remove-btn');
-            rmBtn.disabled = true;
-            rmBtn.style.display = 'none';
-        })
-    };
-
-
     const content = wrapper.querySelector('.message-content');
     content.setAttribute('contenteditable', false);
 

resources/views/layouts/login.blade.php

@@ -61,13 +61,12 @@
 </html>
 
 <script>
-    window.addEventListener('DOMContentLoaded', (event) => {
+    window.addEventListener('DOMContentLoaded', () => {
         if(window.innerWidth < 480){
             const bgVideo = document.querySelector(".image_preview_container");
             bgVideo.remove();
         }
 
-        // console.log(@json($activeOverlay));
         setTimeout(() => {
             if(@json($activeOverlay)){
                 // console.log('close overlay');
@@ -77,14 +76,14 @@
     });
 
     function onLoginKeydown(event){
-        if(event.key == "Enter"){
+        if(event.key === "Enter"){
             const username = document.getElementById('account');
             // console.log(username.value);
             if(!username.value){
                 return;
             }
             const password = document.getElementById('password');
-            if(document.activeElement != password){
+            if(document.activeElement !== password){
                 password.focus();
                 return;
             }

routes/web.php

@@ -25,6 +25,7 @@
     Route::post('/req/login-ldap', [AuthenticationController::class, 'ldapLogin']);
     Route::post('/req/login-shibboleth', [AuthenticationController::class, 'shibbolethLogin']);
     Route::post('/req/login-oidc', [AuthenticationController::class, 'openIDLogin']);
+    Route::get('/req/login-oidc', [AuthenticationController::class, 'openIDLogin']);
 
 
     Route::post('/req/changeLanguage', [LanguageController::class, 'changeLanguage']);