expanding publishing workflow

smarunich · smarunich · commit 6d986f082e0f · 2025-07-15T19:24:46.000Z
diff --git a/management/ui/src/components/PublishingForm.js b/management/ui/src/components/PublishingForm.js
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { useApi } from '../contexts/ApiContext';
+import { useAuth } from '../contexts/AuthContext';
 import toast from 'react-hot-toast';
 import { Globe, Key, Settings, Zap, AlertCircle, CheckCircle, X } from 'lucide-react';
 
@@ -24,15 +25,22 @@ const PublishingForm = ({ modelName, onComplete, onCancel }) => {
   const [isPublished, setIsPublished] = useState(false);
   const [modelDetails, setModelDetails] = useState(null);
   const [tenantInfo, setTenantInfo] = useState(null);
+  const [tenants, setTenants] = useState([]);
   const api = useApi();
+  const { user } = useAuth();
 
   useEffect(() => {
     if (modelName) {
       fetchModelDetails();
       fetchTenantInfo();
       checkIfPublished();
+      
+      // If user is admin, fetch available tenants
+      if (user?.isAdmin) {
+        fetchTenants();
+      }
     }
-  }, [modelName]);
+  }, [modelName, user]);
 
   const fetchModelDetails = async () => {
     try {
@@ -48,12 +56,31 @@ const PublishingForm = ({ modelName, onComplete, onCancel }) => {
     try {
       const response = await api.getTenantInfo();
       setTenantInfo(response.data);
-      setFormData(prev => ({ ...prev, tenantId: response.data.tenant }));
+      // Only set the default tenant if admin hasn't selected one
+      if (!user?.isAdmin) {
+        setFormData(prev => ({ ...prev, tenantId: response.data.tenant }));
+      }
     } catch (error) {
       console.error('Error fetching tenant info:', error);
     }
   };
 
+  const fetchTenants = async () => {
+    try {
+      const response = await api.getTenants();
+      setTenants(response.data.tenants || []);
+      
+      // Set default tenant for admin (first tenant or current user tenant)
+      if (response.data.tenants && response.data.tenants.length > 0) {
+        const defaultTenant = tenantInfo?.tenant || response.data.tenants[0].id;
+        setFormData(prev => ({ ...prev, tenantId: defaultTenant }));
+      }
+    } catch (error) {
+      console.error('Error fetching tenants:', error);
+      toast.error('Failed to fetch tenant list');
+    }
+  };
+
   const checkIfPublished = async () => {
     try {
       const response = await api.getPublishedModel(modelName);
@@ -97,9 +124,17 @@ const PublishingForm = ({ modelName, onComplete, onCancel }) => {
     setLoading(true);
 
     try {
-      const response = await api.publishModel(modelName, {
+      // Add tenant parameter for admin users
+      const requestBody = {
         config: formData
-      });
+      };
+      
+      // If admin is publishing to a different tenant, include tenant in request
+      if (user?.isAdmin && formData.tenantId !== tenantInfo?.tenant) {
+        requestBody.config.tenantID = formData.tenantId;
+      }
+      
+      const response = await api.publishModel(modelName, requestBody);
       
       toast.success('Model published successfully!');
       onComplete(response.data);
@@ -118,7 +153,11 @@ const PublishingForm = ({ modelName, onComplete, onCancel }) => {
 
     try {
       setLoading(true);
-      await api.unpublishModel(modelName);
+      
+      // Include namespace parameter for admin users
+      const namespace = user?.isAdmin ? formData.tenantId : null;
+      await api.unpublishModel(modelName, namespace);
+      
       toast.success('Model unpublished successfully!');
       onComplete(null);
     } catch (error) {
@@ -184,13 +223,35 @@ const PublishingForm = ({ modelName, onComplete, onCancel }) => {
 
             <div className="form-group">
               <label>Tenant</label>
-              <input
-                type="text"
-                value={formData.tenantId}
-                className="form-control"
-                disabled
-                style={{ backgroundColor: '#f8fafc', color: '#6b7280' }}
-              />
+              {user?.isAdmin ? (
+                <select
+                  name="tenantId"
+                  value={formData.tenantId}
+                  onChange={handleInputChange}
+                  className="form-control"
+                  required
+                >
+                  <option value="">Select a tenant</option>
+                  {tenants.map(tenant => (
+                    <option key={tenant.id} value={tenant.id}>
+                      {tenant.name || tenant.id}
+                    </option>
+                  ))}
+                </select>
+              ) : (
+                <input
+                  type="text"
+                  value={formData.tenantId}
+                  className="form-control"
+                  disabled
+                  style={{ backgroundColor: '#f8fafc', color: '#6b7280' }}
+                />
+              )}
+              {user?.isAdmin && (
+                <div style={{ fontSize: '0.875rem', color: '#6b7280', marginTop: '0.25rem' }}>
+                  Select the tenant namespace where the model should be published
+                </div>
+              )}
             </div>
           </div>
 
diff --git a/management/ui/src/components/PublishingWorkflow.js b/management/ui/src/components/PublishingWorkflow.js
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { useApi } from '../contexts/ApiContext';
+import { useAuth } from '../contexts/AuthContext';
 import toast from 'react-hot-toast';
 import { 
   ArrowRight, 
@@ -38,7 +39,9 @@ const PublishingWorkflow = ({ modelName, onComplete, onCancel }) => {
   const [publishedModel, setPublishedModel] = useState(null);
   const [loading, setLoading] = useState(false);
   const [validationErrors, setValidationErrors] = useState([]);
+  const [tenants, setTenants] = useState([]);
   const api = useApi();
+  const { user } = useAuth();
 
   const steps = [
     { id: 1, title: 'Model Validation', icon: CheckCircle },
@@ -51,8 +54,13 @@ const PublishingWorkflow = ({ modelName, onComplete, onCancel }) => {
     if (modelName) {
       fetchModelDetails();
       fetchTenantInfo();
+      
+      // If user is admin, fetch available tenants
+      if (user?.isAdmin) {
+        fetchTenants();
+      }
     }
-  }, [modelName]);
+  }, [modelName, user]);
 
   const fetchModelDetails = async () => {
     try {
@@ -68,12 +76,31 @@ const PublishingWorkflow = ({ modelName, onComplete, onCancel }) => {
   const fetchTenantInfo = async () => {
     try {
       const response = await api.getTenantInfo();
-      setPublishConfig(prev => ({ ...prev, tenantId: response.data.tenant }));
+      // Only set default tenant if admin hasn't selected one
+      if (!user?.isAdmin) {
+        setPublishConfig(prev => ({ ...prev, tenantId: response.data.tenant }));
+      }
     } catch (error) {
       console.error('Error fetching tenant info:', error);
     }
   };
 
+  const fetchTenants = async () => {
+    try {
+      const response = await api.getTenants();
+      setTenants(response.data.tenants || []);
+      
+      // Set default tenant for admin
+      if (response.data.tenants && response.data.tenants.length > 0) {
+        const defaultTenant = response.data.tenants[0].id;
+        setPublishConfig(prev => ({ ...prev, tenantId: defaultTenant }));
+      }
+    } catch (error) {
+      console.error('Error fetching tenants:', error);
+      toast.error('Failed to fetch tenant list');
+    }
+  };
+
   const validateModel = (model) => {
     const errors = [];
     
@@ -125,9 +152,17 @@ const PublishingWorkflow = ({ modelName, onComplete, onCancel }) => {
   const handlePublish = async () => {
     setLoading(true);
     try {
-      const response = await api.publishModel(modelName, {
+      // Add tenant parameter for admin users
+      const requestBody = {
         config: publishConfig
-      });
+      };
+      
+      // If admin is publishing to a specific tenant, include tenant in request
+      if (user?.isAdmin && publishConfig.tenantId) {
+        requestBody.config.tenantID = publishConfig.tenantId;
+      }
+      
+      const response = await api.publishModel(modelName, requestBody);
       
       setPublishedModel(response.data.publishedModel);
       setCurrentStep(4);
@@ -301,6 +336,34 @@ const PublishingWorkflow = ({ modelName, onComplete, onCancel }) => {
 
       <div style={{ display: 'flex', flexDirection: 'column', gap: '2rem' }}>
         
+        {/* Tenant Selection - Only for admins */}
+        {user?.isAdmin && (
+          <div>
+            <h4 style={{ marginBottom: '1rem', display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+              <Settings size={16} />
+              Target Tenant
+            </h4>
+            <div className="form-group">
+              <select
+                value={publishConfig.tenantId}
+                onChange={(e) => handleConfigChange('tenantId', e.target.value)}
+                className="form-control"
+                required
+              >
+                <option value="">Select a tenant</option>
+                {tenants.map(tenant => (
+                  <option key={tenant.id} value={tenant.id}>
+                    {tenant.name || tenant.id}
+                  </option>
+                ))}
+              </select>
+              <div style={{ fontSize: '0.875rem', color: '#6b7280', marginTop: '0.5rem' }}>
+                Select the tenant namespace where the model should be published
+              </div>
+            </div>
+          </div>
+        )}
+        
         {/* Model Type Detection */}
         <div>
           <h4 style={{ marginBottom: '1rem', display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
diff --git a/management/ui/src/contexts/ApiContext.js b/management/ui/src/contexts/ApiContext.js
@@ -60,10 +60,19 @@ export const ApiProvider = ({ children }) => {
     
     // Model Publishing
     publishModel: (modelName, publishConfig) => api.post(`/models/${modelName}/publish`, publishConfig),
-    unpublishModel: (modelName) => api.delete(`/models/${modelName}/publish`),
-    getPublishedModel: (modelName) => api.get(`/models/${modelName}/publish`),
+    unpublishModel: (modelName, namespace = null) => {
+      const params = namespace ? { namespace } : {};
+      return api.delete(`/models/${modelName}/publish`, { params });
+    },
+    getPublishedModel: (modelName, namespace = null) => {
+      const params = namespace ? { namespace } : {};
+      return api.get(`/models/${modelName}/publish`, { params });
+    },
     getPublishedModels: () => api.get('/published-models'),
-    rotateAPIKey: (modelName) => api.post(`/models/${modelName}/publish/rotate-key`),
+    rotateAPIKey: (modelName, namespace = null) => {
+      const params = namespace ? { namespace } : {};
+      return api.post(`/models/${modelName}/publish/rotate-key`, {}, { params });
+    },
     validateAPIKey: (apiKey) => api.post('/validate-api-key', { apiKey }),
 
     // Admin endpoints
