dbeaver/pro#6364 add option to set default view for project

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebConnectionConfigInputHandler.java

@@ -17,25 +17,32 @@
 package io.cloudbeaver;
 
 import io.cloudbeaver.model.WebConnectionConfig;
-import io.cloudbeaver.model.app.WebAppConfiguration;
+import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.utils.ServletAppUtils;
 import io.cloudbeaver.utils.WebDataSourceUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
+import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
+import org.jkiss.dbeaver.model.security.SMObjectType;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
+import org.jkiss.dbeaver.registry.DataSourceNavigatorSettings;
 import org.jkiss.utils.CommonUtils;
 
+import java.util.Map;
+
 public class WebConnectionConfigInputHandler<T extends WebConnectionConfig, C extends DataSourceDescriptor> {
     private static final Log log = Log.getLog(WebConnectionConfigInputHandler.class);
     protected final T input;
     protected final DBPDataSourceRegistry registry;
+    protected final WebSession webSession;
 
-    public WebConnectionConfigInputHandler(@NotNull DBPDataSourceRegistry registry, T configInput) {
+    public WebConnectionConfigInputHandler(@NotNull DBPDataSourceRegistry registry, T configInput, WebSession webSession) {
         this.registry = registry;
         this.input = configInput;
+        this.webSession = webSession;
     }
 
     public C createDataSourceContainer() throws DBWebException {
@@ -47,9 +54,7 @@
 
         C newDataSource = createDataSourceContainerFromInput(driver);
 
-        if (ServletAppUtils.getServletApplication().getAppConfiguration() instanceof WebAppConfiguration webAppConfiguration) {
-            newDataSource.setNavigatorSettings(webAppConfiguration.getDefaultNavigatorSettings());
-        }
+        presetNavigatorSettings(newDataSource);
 
         WebDataSourceUtils.saveAuthProperties(
             newDataSource,
@@ -61,6 +66,29 @@
         return newDataSource;
     }
 
+    private <C extends DataSourceDescriptor> void presetNavigatorSettings(C newDataSource) {
+//        if (ServletAppUtils.getServletApplication().getAppConfiguration() instanceof WebAppConfiguration webAppConfiguration) {
+//            newDataSource.setNavigatorSettings(webAppConfiguration.getDefaultNavigatorSettings());
+//        }
+        try {
+            DBPProject project = newDataSource.getProject();
+            String projectId = project.getId();
+            Map<String, Object> projectNavigatorSettings = webSession.getUserContext().getSecurityController().getObjectSettings(
+                projectId, SMObjectType.project,
+                ServletAppUtils.getServletApplication().getAppConfiguration().getDefaultUserTeam(),
+                DataSourceNavigatorSettings.getSettingsKeySet()
+            );
+            if (!CommonUtils.isEmpty(projectNavigatorSettings)) {
+                DataSourceNavigatorSettings navigatorSettings = new DataSourceNavigatorSettings();
+                navigatorSettings.loadSettings(projectNavigatorSettings);
+                newDataSource.setNavigatorSettings(navigatorSettings);
+            }
+        } catch (Exception e) {
+            log.warn("Error loading navigator settings", e);
+        }
+
+    }
+
     public void updateDataSource(@NotNull C dataSource) throws DBWebException {
         dataSource.setId(dataSource.getId());
         if (!CommonUtils.isEmpty(input.getName())) {

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebSessionProjectImpl.java

@@ -19,6 +19,7 @@
 import io.cloudbeaver.model.WebConnectionConfig;
 import io.cloudbeaver.model.WebConnectionInfo;
 import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.utils.ServletAppUtils;
 import io.cloudbeaver.utils.WebDataSourceUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
@@ -252,6 +253,7 @@ public void refreshProjectSettings() throws DBException {
         Map<String, Object> loadedSettings = webSession.getSecurityController().getObjectSettings(
             getId(),
             SMObjectType.project,
+            ServletAppUtils.getServletApplication().getAppConfiguration().getDefaultUserTeam(),
             null
         );
         projectSettings.clear();
@@ -359,7 +361,7 @@ public WebConnectionConfig getConnectionConfigInput(@Nullable Map<String, Object
 
     @NotNull
     protected WebConnectionConfigInputHandler getInputConfigHandler(@NotNull Map<String, Object> configMap) {
-        return new WebConnectionConfigInputHandler<>(getDataSourceRegistry(), getConnectionConfigInput(configMap));
+        return new WebConnectionConfigInputHandler<>(getDataSourceRegistry(), getConnectionConfigInput(configMap), webSession);
     }
 
 

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java

@@ -1277,6 +1277,4 @@ private static RMProject createRmProjectFromWebProject(Path path, RMLocalProject
 
         return project;
     }
-
-
 }

server/bundles/io.cloudbeaver.service.rm/schema/service.rm.graphqls

@@ -69,6 +69,9 @@ extend type Query {
 
     "Returns project settings that are specified for a current user"
     rmUserProjectSettings(projectId: ID!): Object @since(version: "25.2.1")
+
+    "Returns project settings that are specified for a subject"
+    rmAdminUserProjectSettings(projectId: ID!, subjectId: String!): Object @since(version: "25.2.3")
 }
 
 extend type Mutation {
@@ -137,4 +140,9 @@ extend type Mutation {
     rmAddUserProjectSettings(projectId: ID!, settings: Object!): Boolean! @since(version: "25.2.1")
     "Deletes project settings that are specified for a current user"
     rmDeleteUserProjectSettings(projectId: ID!, settingIds: [String!]!): Boolean! @since(version: "25.2.1")
+
+    "Adds project settings (e.g. enables simple view for a project) for a subject"
+    rmAdminAddUserProjectSettings(projectId: ID!, subjectId:String!, settings: Object!): Boolean! @since(version: "25.2.3")
+    "Deletes project settings that are specified for a subject"
+    rmAdminDeleteUserProjectSettings(projectId: ID!, subjectId:String!, settingIds: [String!]!): Boolean! @since(version: "25.2.3")
 }

server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/DBWServiceRM.java

@@ -214,4 +214,29 @@
         @NotNull @WebObjectId String projectId,
         @Nullable List<String> settings
     ) throws DBWebException;
+
+    @NotNull
+    @WebProjectAction(requireProjectPermissions = DBWConstants.PERMISSION_ADMIN)
+    Map<String, Object> getProjectSettings(
+        @NotNull WebSession webSession,
+        @NotNull @WebObjectId String projectId,
+        @NotNull String subjectId,
+        @Nullable String settingId
+    ) throws DBWebException;
+
+    @WebProjectAction(requireProjectPermissions = DBWConstants.PERMISSION_ADMIN)
+    boolean addProjectSettings(
+        @NotNull WebSession webSession,
+        @NotNull @WebObjectId String projectId,
+        @NotNull String subjectId,
+        @NotNull Map<String, Object> settings
+    ) throws DBWebException;
+
+    @WebProjectAction(requireProjectPermissions = DBWConstants.PERMISSION_ADMIN)
+    boolean deleteProjectSettings(
+        @NotNull WebSession webSession,
+        @NotNull @WebObjectId String projectId,
+        @NotNull String subjectId,
+        @Nullable List<String> settings
+    ) throws DBWebException;
 }

server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/WebServiceBindingRM.java

@@ -70,6 +70,14 @@ public void bindWiring(DBWBindingContext model) {
                     getArgument(env, "settingId")
                 )
             )
+            .dataFetcher(
+                "rmAdminUserProjectSettings", env -> getService(env).getProjectSettings(
+                    getWebSession(env),
+                    getArgumentVal(env, "projectId"),
+                    getArgumentVal(env, "subjectId"),
+                    getArgument(env, "settingId")
+                )
+            )
         ;
         model.getMutationType()
             .dataFetcher("rmCreateResource",
@@ -152,6 +160,22 @@ public void bindWiring(DBWBindingContext model) {
                     getArgument(env, "settingIds")
                 )
             )
+            .dataFetcher(
+                "rmAdminAddUserProjectSettings", env -> getService(env).addProjectSettings(
+                    getWebSession(env),
+                    getArgumentVal(env, "projectId"),
+                    getArgumentVal(env, "subjectId"),
+                    getArgumentVal(env, "settings")
+                )
+            )
+            .dataFetcher(
+                "rmAdminDeleteUserProjectSettings", env -> getService(env).deleteProjectSettings(
+                    getWebSession(env),
+                    getArgumentVal(env, "projectId"),
+                    getArgumentVal(env, "subjectId"),
+                    getArgument(env, "settingIds")
+                )
+            )
 
         ;
     }

server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/impl/WebServiceRM.java

@@ -469,22 +469,79 @@
         }
     }
 
+    @Override
+    public boolean addProjectSettings(@NotNull WebSession webSession, @NotNull String projectId, @NotNull Map<String, Object> settings)
+    throws DBWebException {
+
+        try {
+            validateProject(webSession, projectId);
+            //fixme transactional
+            SMController securityController = webSession.getSecurityController();
+            securityController.deleteObjectSettings(
+                projectId,
+                SMObjectType.project,
+                settings.keySet()
+            );
+            securityController.setObjectSettings(
+                projectId,
+                SMObjectType.project,
+                settings
+            );
+            return true;
+        } catch (DBException e) {
+            throw new DBWebException("Error adding object settings", e);
+        }
+    }
+
+    @NotNull
+    @Override
+    public Map<String, Object> getProjectSettings(@NotNull WebSession webSession, @NotNull String projectId, @Nullable String settingId)
+    throws DBWebException {
+        try {
+            validateProject(webSession, projectId);
+            //todo accumulate settings from user and team. For now just return team settings
+            return webSession.getSecurityController().getObjectSettings(
+                projectId,
+                SMObjectType.project,
+                ServletAppUtils.getServletApplication().getAppConfiguration().getDefaultUserTeam(),
+                settingId == null ? null : Set.of(settingId)
+            );
+        } catch (DBException e) {
+            throw new DBWebException("Error getting project settings", e);
+        }
+    }
+
+    @Override
+    public boolean deleteProjectSettings(@NotNull WebSession webSession, @NotNull String projectId, @Nullable List<String> settings)
+    throws DBWebException {
+        try {
+            validateProject(webSession, projectId);
+            webSession.getSecurityController().deleteObjectSettings(
+                projectId,
+                SMObjectType.project,
+                settings == null ? null : new HashSet<>(settings)
+            );
+            return true;
+        } catch (DBException e) {
+            throw new DBWebException("Error deleting object settings", e);
+        }
+    }
+
     @NotNull
     @Override
     public Map<String, Object> getProjectSettings(
         @NotNull WebSession webSession,
         @NotNull String projectId,
+        @Nullable String subjectId,
         @Nullable String settingId
     ) throws DBWebException {
         try {
-            var project = webSession.getProjectById(projectId);
-            if (project == null) {
-                throw new DBWebException("Project '" + projectId + "' not found");
-            }
+            validateProject(webSession, projectId);
             return webSession.getSecurityController().getObjectSettings(
                 projectId,
                 SMObjectType.project,
-                settingId
+                subjectId,
+                settingId == null ? null : Set.of(settingId)
             );
         } catch (DBException e) {
             throw new DBWebException("Error getting project settings", e);
@@ -495,16 +552,23 @@
     public boolean addProjectSettings(
         @NotNull WebSession webSession,
         @NotNull String projectId,
+        @NotNull String subjectId,
         @NotNull Map<String, Object> settings
     ) throws DBWebException {
         try {
-            var project = webSession.getProjectById(projectId);
-            if (project == null) {
-                throw new DBWebException("Project '" + projectId + "' not found");
-            }
-            webSession.getSecurityController().setObjectSettings(
+            validateProject(webSession, projectId);
+            //fixme transactional
+            SMAdminController adminSecurityController = webSession.getAdminSecurityController();
+            adminSecurityController.deleteObjectSettings(
+                projectId,
+                SMObjectType.project,
+                subjectId,
+                settings.keySet()
+            );
+            adminSecurityController.setObjectSettings(
                 projectId,
                 SMObjectType.project,
+                subjectId,
                 settings
             );
             return true;
@@ -517,16 +581,15 @@
     public boolean deleteProjectSettings(
         @NotNull WebSession webSession,
         @NotNull String projectId,
+        @NotNull String subjectId,
         @Nullable List<String> settings
     ) throws DBWebException {
         try {
-            var project = webSession.getProjectById(projectId);
-            if (project == null) {
-                throw new DBWebException("Project '" + projectId + "' not found");
-            }
-            webSession.getSecurityController().deleteObjectSettings(
+            validateProject(webSession, projectId);
+            webSession.getAdminSecurityController().deleteObjectSettings(
                 projectId,
                 SMObjectType.project,
+                subjectId,
                 settings == null ? null : new HashSet<>(settings)
             );
             return true;
@@ -535,6 +598,13 @@
         }
     }
 
+    private void validateProject(@NotNull WebSession webSession, @NotNull String projectId) throws DBWebException {
+        var project = webSession.getProjectById(projectId);
+        if (project == null) {
+            throw new DBWebException("Project '" + projectId + "' not found");
+        }
+    }
+
     private RMController getResourceController(WebSession webSession) {
         return webSession.getRmController();
     }