@intranefr/superbackend 1.5.0 → 1.5.2

package/views/admin-i18n.ejs

@@ -113,6 +113,17 @@
               <div class="text-xs text-gray-600 mb-1">To</div>
               <input id="entryAiTo" class="border rounded px-3 py-2" readonly />
             </div>
+            <div class="flex-1">
+              <div class="grid grid-cols-1 md:grid-cols-2 gap-2">
+                <%- include('partials/llm-provider-model-picker', {
+                  providerInputId: 'entryAiProviderKey',
+                  modelInputId: 'entryAiModel',
+                  providerLabel: 'Provider',
+                  modelLabel: 'Model',
+                  showOpenRouterFetch: true,
+                }) %>
+              </div>
+            </div>
             <div class="flex gap-2">
               <button type="button" onclick="aiTranslateEntry()" class="px-4 py-2 bg-purple-600 text-white rounded hover:bg-purple-700">AI translate</button>
             </div>
@@ -147,8 +158,15 @@
           <input id="aiFilter" class="w-full border rounded px-3 py-2" placeholder="Filter keys..." oninput="renderAiCandidates()" />
         </div>
         <div>
-          <label class="block text-sm font-medium mb-2">Model</label>
-          <input id="aiModel" class="w-full border rounded px-3 py-2" placeholder="(optional)" />
+          <div class="grid grid-cols-1 gap-2">
+            <%- include('partials/llm-provider-model-picker', {
+              providerInputId: 'aiProviderKey',
+              modelInputId: 'aiModel',
+              providerLabel: 'Provider',
+              modelLabel: 'Model',
+              showOpenRouterFetch: true,
+            }) %>
+          </div>
         </div>
         <div class="flex items-center gap-2 pt-8">
           <input id="aiMissing" type="checkbox" onchange="renderAiCandidates()" />
@@ -204,7 +222,7 @@
   </div>
 
   <script>
-    const API_BASE = window.location.origin + "<%= baseUrl %>" || window.location.origin;
+    const API_BASE = window.location.origin + "<%= baseUrl || '' %>";
     let allLocales = [];
     let aiResults = [];
     let aiCandidates = [];
@@ -213,6 +231,22 @@
     let aiToLocaleKeySet = null;
     let aiToLocaleKeySetFor = null;
 
+    function initLlmPickers() {
+      if (!window.__llmProviderModelPicker || !window.__llmProviderModelPicker.init) return;
+
+      window.__llmProviderModelPicker.init({
+        apiBase: API_BASE,
+        providerInputId: 'aiProviderKey',
+        modelInputId: 'aiModel',
+      });
+
+      window.__llmProviderModelPicker.init({
+        apiBase: API_BASE,
+        providerInputId: 'entryAiProviderKey',
+        modelInputId: 'entryAiModel',
+      });
+    }
+
     function showToast(message, type = 'success') {
       const container = document.getElementById('toast-container');
       const toast = document.createElement('div');
@@ -323,6 +357,7 @@
       document.getElementById('entryLocale').disabled = false;
 
       document.getElementById('modal').classList.remove('hidden');
+      initLlmPickers();
     }
 
     function createMissing(key) {
@@ -341,6 +376,7 @@
       document.getElementById('entryLocale').disabled = true;
 
       document.getElementById('modal').classList.remove('hidden');
+      initLlmPickers();
     }
 
     async function aiTranslateEntry() {
@@ -348,11 +384,19 @@
         const fromLocale = document.getElementById('entryAiFrom').value;
         const toLocale = document.getElementById('entryAiTo').value || document.getElementById('entryLocale').value;
         const text = document.getElementById('entryValue').value;
+        const providerKey = document.getElementById('entryAiProviderKey')?.value;
+        const model = document.getElementById('entryAiModel')?.value;
 
         const res = await fetch(`${API_BASE}/api/admin/i18n/ai/translate-text`, {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ fromLocale, toLocale, text })
+          body: JSON.stringify({
+            fromLocale,
+            toLocale,
+            text,
+            providerKey: providerKey ? String(providerKey).trim() : undefined,
+            model: model ? String(model).trim() : undefined,
+          })
         });
 
         if (!res.ok) {
@@ -390,6 +434,7 @@
         document.getElementById('entryLocale').disabled = true;
 
         document.getElementById('modal').classList.remove('hidden');
+        initLlmPickers();
       } catch (e) {
         showToast(e.message, 'error');
       }
@@ -489,6 +534,7 @@
       document.getElementById('aiCandidateSummary').textContent = '0 selected';
 
       document.getElementById('aiModal').classList.remove('hidden');
+      initLlmPickers();
       loadAiCandidates();
     }
 
@@ -634,6 +680,7 @@
       try {
         const fromLocale = document.getElementById('aiFrom').value;
         const toLocale = document.getElementById('aiTo').value;
+        const providerKey = document.getElementById('aiProviderKey')?.value;
         const model = document.getElementById('aiModel').value;
         const keys = Array.from(aiSelectedKeys);
 
@@ -645,7 +692,14 @@
         const res = await fetch(`${API_BASE}/api/admin/i18n/ai/preview`, {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ fromLocale, toLocale, keys, missingOnly: false, model: model || undefined })
+          body: JSON.stringify({
+            fromLocale,
+            toLocale,
+            keys,
+            missingOnly: false,
+            providerKey: providerKey ? String(providerKey).trim() : undefined,
+            model: model ? String(model).trim() : undefined,
+          })
         });
 
         if (!res.ok) {

package/views/admin-llm.ejs

@@ -34,6 +34,47 @@
       </div>
 
       <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8 space-y-8">
+        <!-- Defaults + Model Suggestions -->
+        <div class="bg-white rounded-lg shadow">
+          <div class="px-4 py-3 border-b">
+            <h2 class="text-lg font-semibold text-gray-900">Centralized Defaults</h2>
+            <p class="text-sm text-gray-600">Global and per-system defaults used by AI features (provider/model). Models are suggestions only.</p>
+          </div>
+          <div class="p-4 space-y-4">
+            <div class="flex items-center justify-end">
+              <button id="btnSaveCentralDefaults" class="px-3 py-2 bg-blue-600 text-white rounded hover:bg-blue-700 text-sm">Save centralized defaults</button>
+            </div>
+            <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
+              <div>
+                <label class="block text-xs font-medium mb-1">Global default providerKey</label>
+                <input id="defaultsProviderKey" type="text" class="w-full border rounded px-2 py-1 text-sm" placeholder="e.g. openrouter" />
+              </div>
+              <div>
+                <label class="block text-xs font-medium mb-1">Global default model</label>
+                <input id="defaultsModel" type="text" class="w-full border rounded px-2 py-1 text-sm" placeholder="e.g. google/gemini-2.5-flash-lite" />
+              </div>
+            </div>
+
+            <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
+              <div>
+                <div class="flex items-center justify-between mb-1">
+                  <label class="block text-xs font-medium">System defaults (JSON map)</label>
+                </div>
+                <textarea id="systemDefaultsJson" rows="8" class="w-full border rounded px-2 py-1 text-sm font-mono" placeholder="{\n  &quot;pageBuilder.blocks.generate&quot;: { &quot;providerKey&quot;: &quot;openrouter&quot;, &quot;model&quot;: &quot;...&quot; }\n}"></textarea>
+                <p class="text-[11px] text-gray-500 mt-1">Stored as <code>llm.systemDefaults</code>.</p>
+              </div>
+              <div>
+                <div class="flex items-center justify-between mb-1">
+                  <label class="block text-xs font-medium">Provider model suggestions (JSON map)</label>
+                  <button id="btnFetchOpenRouterModels" class="px-2 py-1 bg-gray-200 text-gray-800 rounded text-xs">Fetch OpenRouter models</button>
+                </div>
+                <textarea id="providerModelsJson" rows="8" class="w-full border rounded px-2 py-1 text-sm font-mono" placeholder="{\n  &quot;openrouter&quot;: [\"google/gemini-2.5-flash-lite\"]\n}"></textarea>
+                <p class="text-[11px] text-gray-500 mt-1">Stored as <code>llm.providerModels</code>. Suggestions only.</p>
+              </div>
+            </div>
+          </div>
+        </div>
+
         <!-- Providers + Prompts -->
         <div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
           <!-- Providers -->
@@ -388,6 +429,9 @@ console.log(result.content);</pre>
       const API_BASE = window.location.origin + "<%= baseUrl %>" || window.location.origin;
       let providers = {};
       let prompts = {};
+      let defaults = { providerKey: '', model: '' };
+      let systemDefaults = {};
+      let providerModels = {};
       let auditPage = 1;
       let costPage = 1;
 
@@ -479,6 +523,14 @@ console.log(result.content);</pre>
           if (!res.ok) throw new Error(data?.error || 'Failed to load config');
           providers = data.providers || {};
           prompts = data.prompts || {};
+          defaults = data.defaults || { providerKey: '', model: '' };
+          systemDefaults = data.systemDefaults || {};
+          providerModels = data.providerModels || {};
+
+          document.getElementById('defaultsProviderKey').value = defaults.providerKey || '';
+          document.getElementById('defaultsModel').value = defaults.model || '';
+          document.getElementById('systemDefaultsJson').value = JSON.stringify(systemDefaults || {}, null, 2);
+          document.getElementById('providerModelsJson').value = JSON.stringify(providerModels || {}, null, 2);
           renderProviders();
           renderPrompts();
         } catch (e) {
@@ -488,10 +540,31 @@ console.log(result.content);</pre>
 
       async function saveConfig() {
         try {
+          defaults = {
+            providerKey: document.getElementById('defaultsProviderKey').value.trim(),
+            model: document.getElementById('defaultsModel').value.trim(),
+          };
+
+          try {
+            const rawSystemDefaults = document.getElementById('systemDefaultsJson').value;
+            systemDefaults = rawSystemDefaults && rawSystemDefaults.trim() ? JSON.parse(rawSystemDefaults) : {};
+          } catch (e) {
+            showToast('Invalid systemDefaults JSON: ' + e.message, 'error');
+            return;
+          }
+
+          try {
+            const rawProviderModels = document.getElementById('providerModelsJson').value;
+            providerModels = rawProviderModels && rawProviderModels.trim() ? JSON.parse(rawProviderModels) : {};
+          } catch (e) {
+            showToast('Invalid providerModels JSON: ' + e.message, 'error');
+            return;
+          }
+
           const res = await fetch(`${API_BASE}/api/admin/llm/config`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ providers, prompts }),
+            body: JSON.stringify({ providers, prompts, defaults, systemDefaults, providerModels }),
           });
           const data = await res.json();
           if (!res.ok) throw new Error(data?.error || 'Failed to save config');
@@ -501,6 +574,28 @@ console.log(result.content);</pre>
         }
       }
 
+      async function fetchOpenRouterModels() {
+        try {
+          const res = await fetch(`${API_BASE}/api/admin/llm/openrouter/models`);
+          const data = await res.json();
+          if (!res.ok) throw new Error(data?.error || 'Failed to fetch OpenRouter models');
+          const models = Array.isArray(data?.models) ? data.models : [];
+
+          const rawProviderModels = document.getElementById('providerModelsJson').value;
+          let map = {};
+          try {
+            map = rawProviderModels && rawProviderModels.trim() ? JSON.parse(rawProviderModels) : {};
+          } catch (_) {
+            map = {};
+          }
+          map.openrouter = models;
+          document.getElementById('providerModelsJson').value = JSON.stringify(map, null, 2);
+          showToast('OpenRouter models loaded');
+        } catch (e) {
+          showToast(e.message, 'error');
+        }
+      }
+
       function applyProviderPresetDefaults() {
         const preset = document.getElementById('providerPreset').value;
         const baseUrlInput = document.getElementById('providerBaseUrl');
@@ -848,6 +943,9 @@ console.log(result.content);</pre>
       document.getElementById('btnSaveProvider').addEventListener('click', createOrUpdateProviderFromForm);
       document.getElementById('providerPreset').addEventListener('change', applyProviderPresetDefaults);
 
+      document.getElementById('btnFetchOpenRouterModels').addEventListener('click', fetchOpenRouterModels);
+      document.getElementById('btnSaveCentralDefaults').addEventListener('click', saveConfig);
+
       document.getElementById('btnAddPrompt').addEventListener('click', () => openPromptEditor(null));
       document.getElementById('btnCancelPrompt').addEventListener('click', closePromptEditor);
       document.getElementById('btnSavePrompt').addEventListener('click', createOrUpdatePromptFromForm);

package/views/admin-organizations.ejs

@@ -142,6 +142,30 @@
                 <button id="btn-members-refresh" class="bg-gray-100 text-gray-800 px-3 py-2 rounded hover:bg-gray-200" disabled>Refresh</button>
               </div>
 
+              <!-- Assign User Section -->
+              <div class="bg-gray-50 rounded-lg border p-4 mt-4">
+                <h4 class="font-semibold text-gray-900">Assign User to Organization</h4>
+                <div class="grid grid-cols-1 md:grid-cols-3 gap-3 mt-3">
+                  <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">User *</label>
+                    <select id="assign-user-select" class="w-full border rounded px-3 py-2">
+                      <option value="">Loading users...</option>
+                    </select>
+                  </div>
+                  <div>
+                    <label class="block text-sm font-medium text-gray-700 mb-1">Role</label>
+                    <select id="assign-user-role" class="w-full border rounded px-3 py-2">
+                      <option value="member">member</option>
+                      <option value="admin">admin</option>
+                      <option value="viewer">viewer</option>
+                    </select>
+                  </div>
+                  <div class="flex items-end">
+                    <button id="btn-assign-user" class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600" disabled>Assign User</button>
+                  </div>
+                </div>
+              </div>
+
               <div class="grid grid-cols-1 md:grid-cols-3 gap-3 mt-4">
                 <div>
                   <label class="block text-sm font-medium text-gray-700 mb-1">Role</label>
@@ -453,8 +477,138 @@
       orgs: { offset: 0, limit: 25, total: 0, selectedOrgId: null },
       members: { offset: 0, limit: 50, total: 0 },
       invites: { offset: 0, limit: 50, total: 0 },
+      availableUsers: [],
     };
 
+    async function loadAvailableUsers() {
+
+      console.log('Loading available users...');
+
+      const orgId = state.orgs.selectedOrgId;
+      if (!orgId) {
+        console.log('No org selected');
+        return;
+      }
+
+      try {
+        // Load all users
+        const usersRes = await fetch(`${API_BASE}/api/admin/users`, { 
+          headers: { 'Accept': 'application/json' },
+          credentials: 'same-origin'
+        });
+        
+        const usersData = await usersRes.json();
+        
+        if (!usersRes.ok) {
+          console.error('Failed to load users:', usersData?.error);
+          const select = document.getElementById('assign-user-select');
+          if (select) {
+            select.innerHTML = `<option value="">Error: ${usersData?.error || 'Unknown error'}</option>`;
+          }
+          return;
+        }else{
+          console.log('Loaded users:', usersData);
+        }
+
+        // Load current org members
+        const membersRes = await fetch(`${API_BASE}${ORGS_ADMIN_PATH}/${encodeURIComponent(orgId)}/members?limit=500`, { 
+          headers: { 'Accept': 'application/json' },
+          credentials: 'same-origin'
+        });
+        const membersData = await membersRes.json();
+        
+        if (!membersRes.ok) {
+          console.error('Failed to load members:', membersData?.error);
+          return;
+        }
+
+        const allUsers = Array.isArray(usersData?.users) ? usersData.users : [];
+        const currentMembers = Array.isArray(membersData?.members) ? membersData.members : [];
+        const memberUserIds = new Set(currentMembers.map(m => String(m.userId)));
+
+        // Filter out users who are already members
+        const availableUsers = allUsers.filter(user => !memberUserIds.has(String(user._id)));
+        state.availableUsers = availableUsers;
+
+        // Update the select dropdown
+        const select = document.getElementById('assign-user-select');
+        if (select) {
+          select.innerHTML = '<option value="">Select a user...</option>';
+          availableUsers.forEach(user => {
+            const option = document.createElement('option');
+            option.value = user._id;
+            option.textContent = `${user.name || 'No name'} (${user.email})`;
+            select.appendChild(option);
+          });
+        }
+
+        // Enable/disable assign button based on availability
+        const assignBtn = document.getElementById('btn-assign-user');
+        if (assignBtn) {
+          assignBtn.disabled = availableUsers.length === 0;
+          if (availableUsers.length === 0) {
+            select.innerHTML = '<option value="">No available users</option>';
+          }
+        }
+      } catch (e) {
+        console.error('Failed to load available users:', e);
+        const select = document.getElementById('assign-user-select');
+        if (select) {
+          select.innerHTML = '<option value="">Failed to load users</option>';
+        }
+      }
+    }
+
+    async function assignUserToOrg() {
+      const orgId = state.orgs.selectedOrgId;
+      const userId = document.getElementById('assign-user-select')?.value;
+      const role = document.getElementById('assign-user-role')?.value;
+
+      if (!orgId) {
+        showToast('No organization selected', 'error');
+        return;
+      }
+
+      if (!userId) {
+        showToast('Please select a user', 'error');
+        return;
+      }
+
+      if (!role) {
+        showToast('Please select a role', 'error');
+        return;
+      }
+
+      const userName = state.availableUsers.find(u => u._id === userId)?.name || userId;
+
+      try {
+        const res = await fetch(`${API_BASE}${ORGS_ADMIN_PATH}/${encodeURIComponent(orgId)}/members`, {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json', 'Accept': 'application/json' },
+          credentials: 'same-origin',
+          body: JSON.stringify({ userId, role }),
+        });
+
+        const data = await res.json();
+
+        if (!res.ok) {
+          showToast(data?.error || 'Failed to assign user', 'error');
+          return;
+        }
+
+        showToast(data?.message || 'User assigned successfully', 'success');
+        
+        // Reset form
+        document.getElementById('assign-user-select').value = '';
+        document.getElementById('assign-user-role').value = 'member';
+        
+        // Reload members list and available users
+        await Promise.all([loadMembers(), loadAvailableUsers()]);
+      } catch (e) {
+        showToast(e.message || 'Failed to assign user', 'error');
+      }
+    }
+
     async function loadOrgs() {
       const q = document.getElementById('orgs-q')?.value?.trim();
       const status = document.getElementById('orgs-status')?.value?.trim();
@@ -539,6 +693,7 @@
                 </td>
                 <td class="px-4 py-3 text-sm text-gray-700 whitespace-nowrap">
                   <button class="text-blue-600 hover:text-blue-800 mr-2" data-edit="${escapeHtml(o?._id)}" data-name="${escapeHtml(o?.name)}" data-description="${escapeHtml(o?.description || '')}" data-owner="${escapeHtml(o?.ownerUserId)}" data-status="${escapeHtml(o?.status)}">Edit</button>
+                  <button class="text-gray-600 hover:text-gray-800 mr-2" data-copy="${escapeHtml(o?._id)}" title="Copy orgId">Copy ID</button>
                   ${o?.status === 'active' 
                     ? `<button class="text-orange-600 hover:text-orange-800 mr-2" data-disable="${escapeHtml(o?._id)}" data-name="${escapeHtml(o?.name)}">Disable</button>`
                     : `<button class="text-green-600 hover:text-green-800 mr-2" data-enable="${escapeHtml(o?._id)}" data-name="${escapeHtml(o?.name)}">Enable</button>`
@@ -567,6 +722,7 @@
       const ids = [
         'btn-selected-refresh',
         'btn-members-refresh',
+        'btn-assign-user',
         'btn-members-apply',
         'btn-members-reset',
         'btn-members-prev',
@@ -591,7 +747,7 @@
       state.invites.offset = 0;
 
       setSelectedControlsEnabled(true);
-      await Promise.all([loadSelectedOrg(), loadMembers(), loadInvites()]);
+      await Promise.all([loadSelectedOrg(), loadMembers(), loadInvites(), loadAvailableUsers()]);
       await loadOrgs();
     }
 
@@ -1039,6 +1195,9 @@
         if (e.target.matches('[data-edit]')) {
           const btn = e.target;
           openEditOrgModal(btn.dataset.edit, btn.dataset.name, btn.dataset.description, btn.dataset.owner, btn.dataset.status);
+        } else if (e.target.matches('[data-copy]')) {
+          const btn = e.target;
+          copyText(btn.dataset.copy);
         } else if (e.target.matches('[data-disable]')) {
           const btn = e.target;
           disableOrganization(btn.dataset.disable, btn.dataset.name);
@@ -1057,6 +1216,9 @@
       const membersRefreshBtn = document.getElementById('btn-members-refresh');
       if (membersRefreshBtn) membersRefreshBtn.onclick = () => loadMembers();
 
+      const assignUserBtn = document.getElementById('btn-assign-user');
+      if (assignUserBtn) assignUserBtn.onclick = () => assignUserToOrg();
+
       const membersApplyBtn = document.getElementById('btn-members-apply');
       if (membersApplyBtn) membersApplyBtn.onclick = () => { state.members.offset = 0; loadMembers(); };