Merge remote-tracking branch 'origin/alpha' into alpha

middleware/auth.go

@@ -122,6 +122,7 @@ func authHelper(c *gin.Context, minRole int) {
 	c.Set("role", role)
 	c.Set("role", role)
 	c.Set("id", id)
 	c.Set("id", id)
 	c.Set("group", session.Get("group"))
 	c.Set("group", session.Get("group"))
+	c.Set("user_group", session.Get("group"))
 	c.Set("use_access_token", useAccessToken)
 	c.Set("use_access_token", useAccessToken)
 
 
 	//userCache, err := model.GetUserCache(id.(int))
 	//userCache, err := model.GetUserCache(id.(int))

web/src/hooks/mj-logs/useMjLogsData.js

@@ -94,6 +94,11 @@ export const useMjLogsData = () => {
         const parsed = JSON.parse(savedColumns);
         const parsed = JSON.parse(savedColumns);
         const defaults = getDefaultColumnVisibility();
         const defaults = getDefaultColumnVisibility();
         const merged = { ...defaults, ...parsed };
         const merged = { ...defaults, ...parsed };
+        // If not admin, force hide columns only visible to admins
+        if (!isAdminUser) {
+          merged[COLUMN_KEYS.CHANNEL] = false;
+          merged[COLUMN_KEYS.SUBMIT_RESULT] = false;
+        }
         setVisibleColumns(merged);
         setVisibleColumns(merged);
       } catch (e) {
       } catch (e) {
         console.error('Failed to parse saved column preferences', e);
         console.error('Failed to parse saved column preferences', e);

web/src/hooks/task-logs/useTaskLogsData.js

@@ -92,6 +92,10 @@ export const useTaskLogsData = () => {
         const parsed = JSON.parse(savedColumns);
         const parsed = JSON.parse(savedColumns);
         const defaults = getDefaultColumnVisibility();
         const defaults = getDefaultColumnVisibility();
         const merged = { ...defaults, ...parsed };
         const merged = { ...defaults, ...parsed };
+        // If not admin, force hide columns only visible to admins
+        if (!isAdminUser) {
+          merged[COLUMN_KEYS.CHANNEL] = false;
+        }
         setVisibleColumns(merged);
         setVisibleColumns(merged);
       } catch (e) {
       } catch (e) {
         console.error('Failed to parse saved column preferences', e);
         console.error('Failed to parse saved column preferences', e);

web/src/hooks/usage-logs/useUsageLogsData.js

@@ -116,6 +116,12 @@ export const useLogsData = () => {
         const parsed = JSON.parse(savedColumns);
         const parsed = JSON.parse(savedColumns);
         const defaults = getDefaultColumnVisibility();
         const defaults = getDefaultColumnVisibility();
         const merged = { ...defaults, ...parsed };
         const merged = { ...defaults, ...parsed };
+        // If not admin, force hide columns only visible to admins
+        if (!isAdminUser) {
+          merged[COLUMN_KEYS.CHANNEL] = false;
+          merged[COLUMN_KEYS.USERNAME] = false;
+          merged[COLUMN_KEYS.RETRY] = false;
+        }
         setVisibleColumns(merged);
         setVisibleColumns(merged);
       } catch (e) {
       } catch (e) {
         console.error('Failed to parse saved column preferences', e);
         console.error('Failed to parse saved column preferences', e);