chore: Set maps key without restart

app/client/src/ce/pages/AdminSettings/config/types.ts

@@ -94,6 +94,7 @@ export interface Category {
   isConnected?: boolean;
   children?: Category[];
   icon?: string;
+  needsRestart?: boolean;
 }
 
 export const SettingCategories = {
@@ -129,4 +130,5 @@ export type AdminConfigType = {
   isConnected?: boolean;
   icon?: string;
   needsUpgrade?: boolean;
+  needsRestart?: boolean;
 };

app/client/src/pages/Settings/SaveSettings.tsx

@@ -41,14 +41,15 @@ const SettingsButtonWrapper = styled.div`
 
 type SaveAdminSettingsProps = {
   isSaving?: boolean;
+  needsRestart: boolean;
   onSave?: () => void;
   onClear?: () => void;
   settings: Record<string, string>;
   valid: boolean;
 };
 
 const saveAdminSettings = (props: SaveAdminSettingsProps) => {
-  const { isSaving, onClear, onSave, settings, valid } = props;
+  const { isSaving, needsRestart, onClear, onSave, settings, valid } = props;
 
   return (
     <SettingsButtonWrapper>
@@ -59,7 +60,7 @@ const saveAdminSettings = (props: SaveAdminSettingsProps) => {
         isLoading={isSaving}
         onClick={onSave}
         tag="button"
-        text={createMessage(() => "Save & Restart")}
+        text={createMessage(() => (needsRestart ? "Save & Restart" : "Save"))}
       />
       <StyledClearButton
         category={Category.secondary}

app/client/src/pages/Settings/SettingsForm.tsx

@@ -87,7 +87,7 @@ export function SettingsForm(
         AnalyticsUtil.logEvent("ADMIN_SETTINGS_SAVE", {
           method: pageTitle,
         });
-        dispatch(saveSettings(props.settings));
+        dispatch(saveSettings(props.settings, details?.needsRestart ?? true));
       } else {
         saveBlocked();
       }
@@ -201,6 +201,7 @@ export function SettingsForm(
           {isSavable && (
             <SaveAdminSettings
               isSaving={props.isSaving}
+              needsRestart={details?.needsRestart ?? true}
               onClear={onClear}
               onSave={onSave}
               settings={props.settings}

app/client/src/pages/Settings/config/ConfigFactory.ts

@@ -43,6 +43,7 @@ export class ConfigFactory {
       title: config.title,
       slug: config.type,
       subText: config.subText,
+      needsRestart: config.needsRestart,
       children: config?.children?.map((child) =>
         ConfigFactory.getCategory(child),
       ),

app/client/src/pages/Settings/config/googleMaps.ts

@@ -12,6 +12,7 @@ export const config: AdminConfigType = {
   controlType: SettingTypes.GROUP,
   title: "Google Maps",
   canSave: true,
+  needsRestart: false,
   settings: [
     {
       id: "APPSMITH_GOOGLE_MAPS_READ_MORE",

app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/InstanceAdminControllerCE.java

@@ -1,7 +1,6 @@
 package com.appsmith.server.controllers.ce;
 
 import com.appsmith.server.constants.Url;
-import com.appsmith.server.dtos.EnvChangesResponseDTO;
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.dtos.TestEmailConfigRequestDTO;
 import com.appsmith.server.solutions.EnvManager;
@@ -42,22 +41,22 @@ public Mono<Void> download(ServerWebExchange exchange) {
 
     @Deprecated
     @PutMapping(value = "/env", consumes = {MediaType.APPLICATION_JSON_VALUE})
-    public Mono<ResponseDTO<EnvChangesResponseDTO>> saveEnvChangesJSON(
+    public Mono<ResponseDTO<Void>> saveEnvChangesJSON(
             @Valid @RequestBody Map<String, String> changes
     ) {
         log.debug("Applying env updates {}", changes.keySet());
         return envManager.applyChanges(changes)
-                .map(res -> new ResponseDTO<>(HttpStatus.OK.value(), res, null));
+                .map(res -> new ResponseDTO<>(HttpStatus.OK.value(), null, null));
     }
 
     @PutMapping(value = "/env", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
-    public Mono<ResponseDTO<EnvChangesResponseDTO>> saveEnvChangesMultipartFormData(
+    public Mono<ResponseDTO<Void>> saveEnvChangesMultipartFormData(
             ServerWebExchange exchange
     ) {
         log.debug("Applying env updates from form data");
         return exchange.getMultipartData()
                 .flatMap(envManager::applyChangesFromMultipartFormData)
-                .map(res -> new ResponseDTO<>(HttpStatus.OK.value(), res, null));
+                .map(res -> new ResponseDTO<>(HttpStatus.OK.value(), null, null));
     }
 
     @PostMapping("/restart")

app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/TenantControllerCE.java

@@ -2,7 +2,6 @@
 
 import com.appsmith.server.constants.Url;
 import com.appsmith.server.domains.Tenant;
-import com.appsmith.server.domains.TenantConfiguration;
 import com.appsmith.server.dtos.ResponseDTO;
 import com.appsmith.server.services.TenantService;
 import org.springframework.http.HttpStatus;
@@ -23,7 +22,7 @@ public TenantControllerCE(TenantService service) {
 
     /**
      * This API returns the tenant configuration for any user (anonymous or logged in). The configurations are set
-     * in {@link com.appsmith.server.controllers.ce.InstanceAdminControllerCE#saveEnvChanges(Map<String,String>)}
+     * in {@link com.appsmith.server.controllers.ce.InstanceAdminControllerCE#saveEnvChangesJSON(Map<String,String>)}
      * <p>
      * The update and retrieval are in different controllers because it would have been weird to fetch the configurations
      * from the InstanceAdminController

app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/TenantConfigurationCE.java

@@ -1,10 +1,17 @@
 package com.appsmith.server.domains.ce;
 
+import com.appsmith.server.domains.TenantConfiguration;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
 public class TenantConfigurationCE {
 
+    @JsonProperty("APPSMITH_GOOGLE_MAPS_API_KEY")
     private String googleMapsKey;
 
+    public void copyNonSensitiveValues(TenantConfiguration source) {
+        googleMapsKey = source.getGoogleMapsKey();
+    }
+
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCE.java

@@ -14,9 +14,8 @@ public interface TenantServiceCE extends CrudService<Tenant, String> {
 
     Mono<Tenant> findById(String tenantId, AclPermission permission);
 
-    /*
-     *  For now, returning an empty tenantConfiguration object in this class. Will enhance this function once we
-     *  start saving other pertinent environment variables in the tenant collection
-     */
+    Mono<Tenant> getDefaultTenant();
+
     Mono<Tenant> getTenantConfiguration();
+
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/TenantServiceCEImpl.java

@@ -2,6 +2,7 @@
 
 import com.appsmith.external.helpers.AppsmithBeanUtils;
 import com.appsmith.server.acl.AclPermission;
+import com.appsmith.server.constants.EnvVariables;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Tenant;
 import com.appsmith.server.domains.TenantConfiguration;
@@ -75,23 +76,40 @@ public Mono<Tenant> findById(String tenantId, AclPermission permission) {
                 .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "tenantId", tenantId)));
     }
 
-    /*
-     * For now, returning just the instance-id, with an empty tenantConfiguration object in this class. Will enhance
-     * this function once we start saving other pertinent environment variables in the tenant collection.
-     */
     @Override
-    public Mono<Tenant> getTenantConfiguration() {
-        return configService.getInstanceId()
-                .map(instanceId -> {
-                    final Tenant tenant = new Tenant();
-                    tenant.setInstanceId(instanceId);
-
-                    final TenantConfiguration config = new TenantConfiguration();
-                    tenant.setTenantConfiguration(config);
+    public Mono<Tenant> getDefaultTenant() {
+        // Get the default tenant object from the DB and then populate the relevant user permissions in that
+        // We are doing this differently because `findBySlug` is a Mongo JPA query and not a custom Appsmith query
+        return repository.findBySlug(FieldName.DEFAULT)
+                .flatMap(tenant -> repository.setUserPermissionsInObject(tenant).thenReturn(tenant));
+    }
 
-                    config.setGoogleMapsKey(System.getenv("APPSMITH_GOOGLE_MAPS_API_KEY"));
+    @Override
+    public Mono<Tenant> getTenantConfiguration() {
+        return Mono.zip(
+                        getDefaultTenant(),
+                        configService.getInstanceId()
+                )
+                .map(tuple -> {
+                    final Tenant dbTenant = tuple.getT1();
+                    final String instanceId = tuple.getT2();
+
+                    final Tenant tenantForClient = new Tenant();
+                    tenantForClient.setInstanceId(instanceId);
+
+                    final TenantConfiguration configForClient = new TenantConfiguration();
+                    tenantForClient.setTenantConfiguration(configForClient);
+
+                    // Only copy the values that are pertinent to the client
+                    configForClient.copyNonSensitiveValues(dbTenant.getTenantConfiguration());
+                    tenantForClient.setUserPermissions(dbTenant.getUserPermissions());
+
+                    if (StringUtils.isEmpty(configForClient.getGoogleMapsKey())) {
+                        configForClient.setGoogleMapsKey(System.getenv(EnvVariables.APPSMITH_GOOGLE_MAPS_API_KEY.name()));
+                    }
 
-                    return tenant;
+                    return tenantForClient;
                 });
     }
+
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCE.java

@@ -1,7 +1,6 @@
 package com.appsmith.server.solutions.ce;
 
 import com.appsmith.server.domains.User;
-import com.appsmith.server.dtos.EnvChangesResponseDTO;
 import com.appsmith.server.dtos.TestEmailConfigRequestDTO;
 import org.springframework.http.codec.multipart.Part;
 import org.springframework.util.MultiValueMap;
@@ -16,9 +15,9 @@ public interface EnvManagerCE {
 
     List<String> transformEnvContent(String envContent, Map<String, String> changes);
 
-    Mono<EnvChangesResponseDTO> applyChanges(Map<String, String> changes);
+    Mono<Boolean> applyChanges(Map<String, String> changes);
 
-    Mono<EnvChangesResponseDTO> applyChangesFromMultipartFormData(MultiValueMap<String, Part> formData);
+    Mono<Boolean> applyChangesFromMultipartFormData(MultiValueMap<String, Part> formData);
 
     void setAnalyticsEventAction(Map<String, Object> properties, String newVariable, String originalVariable, String authEnv);
 

app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java

@@ -9,7 +9,7 @@
 import com.appsmith.server.domains.Tenant;
 import com.appsmith.server.domains.TenantConfiguration;
 import com.appsmith.server.domains.User;
-import com.appsmith.server.dtos.EnvChangesResponseDTO;
+import com.appsmith.server.domains.ce.TenantConfigurationCE;
 import com.appsmith.server.dtos.TestEmailConfigRequestDTO;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
@@ -296,12 +296,12 @@ private Mono<Void> validateChanges(User user, Map<String, String> changes) {
      * @return
      */
     private Set<String> allowedTenantConfiguration() {
-        Field[] fields = TenantConfiguration.class.getDeclaredFields();
-        return Arrays.stream(fields)
+        return getTenantConfigurationFields().stream()
                 .map(field -> {
                     JsonProperty jsonProperty = field.getDeclaredAnnotation(JsonProperty.class);
                     return jsonProperty == null ? field.getName() : jsonProperty.value();
-                }).collect(Collectors.toSet());
+                })
+                .collect(Collectors.toSet());
     }
 
     /**
@@ -313,8 +313,7 @@ private Set<String> allowedTenantConfiguration() {
      * @param value
      */
     private void setConfigurationByKey(TenantConfiguration tenantConfiguration, String key, String value) {
-        Field[] fields = tenantConfiguration.getClass().getDeclaredFields();
-        for (Field field : fields) {
+        for (Field field : getTenantConfigurationFields()) {
             JsonProperty jsonProperty = field.getDeclaredAnnotation(JsonProperty.class);
             if (jsonProperty != null && jsonProperty.value().equals(key)) {
                 try {
@@ -328,6 +327,12 @@ private void setConfigurationByKey(TenantConfiguration tenantConfiguration, Stri
         }
     }
 
+    @NotNull
+    private static List<Field> getTenantConfigurationFields() {
+        final List<Field> fields = Arrays.asList(TenantConfigurationCE.class.getDeclaredFields());
+        fields.addAll(Arrays.asList(TenantConfiguration.class.getDeclaredFields()));
+        return fields;
+    }
 
     private Mono<Tenant> updateTenantConfiguration(String tenantId, Map<String, String> changes) {
         TenantConfiguration tenantConfiguration = new TenantConfiguration();
@@ -344,7 +349,7 @@ private Mono<Tenant> updateTenantConfiguration(String tenantId, Map<String, Stri
     }
 
     @Override
-    public Mono<EnvChangesResponseDTO> applyChanges(Map<String, String> changes) {
+    public Mono<Boolean> applyChanges(Map<String, String> changes) {
         // This flow is pertinent for any variables that need to change in the .env file or be saved in the tenant configuration
         return verifyCurrentUserIsSuper().
                 flatMap(user -> validateChanges(user, changes).thenReturn(user))
@@ -368,13 +373,17 @@ public Mono<EnvChangesResponseDTO> applyChanges(Map<String, String> changes) {
                             envFileChanges.remove(key);
                         }
                     }
-                    final List<String> changedContent = transformEnvContent(originalContent, envFileChanges);
 
-                    try {
-                        Files.write(envFilePath, changedContent);
-                    } catch (IOException e) {
-                        log.error("Unable to write to env file " + envFilePath, e);
-                        return Mono.error(e);
+                    if (!envFileChanges.isEmpty()) {
+                        // If there's only tenant configuration changes, env file doesn't have to be written.
+                        final List<String> changedContent = transformEnvContent(originalContent, envFileChanges);
+
+                        try {
+                            Files.write(envFilePath, changedContent);
+                        } catch (IOException e) {
+                            log.error("Unable to write to env file " + envFilePath, e);
+                            return Mono.error(e);
+                        }
                     }
 
                     // For configuration variables, save the variables to the config collection instead of .env file
@@ -452,12 +461,12 @@ public Mono<EnvChangesResponseDTO> applyChanges(Map<String, String> changes) {
                         commonConfig.setTelemetryDisabled("true".equals(changesCopy.remove(APPSMITH_DISABLE_TELEMETRY.name())));
                     }
 
-                    return dependentTasks.thenReturn(new EnvChangesResponseDTO(true));
+                    return dependentTasks.thenReturn(true);
                 });
     }
 
     @Override
-    public Mono<EnvChangesResponseDTO> applyChangesFromMultipartFormData(MultiValueMap<String, Part> formData) {
+    public Mono<Boolean> applyChangesFromMultipartFormData(MultiValueMap<String, Part> formData) {
         return Flux.fromIterable(formData.entrySet())
                 .flatMap(entry -> {
                     final String key = entry.getKey();

app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/TenantServiceCETest.java

@@ -0,0 +1,29 @@
+package com.appsmith.server.services.ce;
+
+import com.appsmith.server.services.TenantService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import reactor.test.StepVerifier;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@SpringBootTest
+@ExtendWith(SpringExtension.class)
+class TenantServiceCETest {
+
+    @Autowired
+    TenantService tenantService;
+
+    @Test
+    void ensureMapsKey() {
+        StepVerifier.create(tenantService.getTenantConfiguration())
+                .assertNext(tenant -> {
+                    assertThat(tenant.getTenantConfiguration().getGoogleMapsKey()).isEqualTo("abcd");
+                })
+                .verifyComplete();
+    }
+
+}