Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Move Maps API Key to database #20771

Merged
merged 51 commits into from
Jul 24, 2023
Merged

chore: Move Maps API Key to database #20771

Changes from 2 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
00cb432
chore: Set maps key without restart
sharat87 Feb 20, 2023
0c9513f
Remove maps key from /admin/env
sharat87 Feb 20, 2023
b114e6e
Use component-page for Maps settings
sharat87 Feb 21, 2023
92ce9c9
Remove `needsRestart` changes, not needed
sharat87 Feb 21, 2023
4a2cbf3
Restore app/server/appsmith-server/src/main/java/com/appsmith/server/…
sharat87 Feb 21, 2023
69af936
Remove useless boolean response
sharat87 Feb 21, 2023
9b7a9f2
Merge remote-tracking branch 'origin/chore/maps-key-without-restart' …
sharat87 Feb 21, 2023
43181b3
Merge branch 'release' into chore/maps-key-without-restart
sharat87 Feb 21, 2023
1b8c575
Add tests for maps key
sharat87 Feb 22, 2023
c7ca322
Merge branch 'release' into chore/maps-key-without-restart
sharat87 Feb 22, 2023
4dd2da0
Merge branch 'release' into chore/maps-key-without-restart
sharat87 Feb 24, 2023
faefe7c
Fix maps input width
sharat87 Feb 25, 2023
ddb544c
Fix some test keys
sharat87 Feb 25, 2023
8d0ed94
Fix font weight
sharat87 Feb 25, 2023
94fc749
Fix empty response from PUT /admin/env
sharat87 Feb 26, 2023
32aab44
Merge branch 'release' into chore/maps-key-without-restart
sharat87 Apr 25, 2023
6cbc1c2
Fix type imports
sharat87 Apr 25, 2023
25b2302
Merge branch 'release' into chore/maps-key-without-restart
sharat87 May 1, 2023
8b700f7
fix: test failure
sharat87 May 2, 2023
dd1eade
Merge branch 'release' into chore/maps-key-without-restart
sharat87 May 4, 2023
4ac21ed
Merge branch 'release' into chore/maps-key-without-restart
sharat87 Jun 8, 2023
3444b7f
Fix compile error
sharat87 Jun 8, 2023
6e78a8e
Fix UI
sharat87 Jun 8, 2023
63f0524
Undo unneeded exports
sharat87 Jun 8, 2023
0383eb2
Merge branch 'release' into chore/maps-key-without-restart
sharat87 Jun 12, 2023
77f79cf
Fix missing test id for tests
sharat87 Jun 12, 2023
1ad9e96
Merge branch 'release' into chore/maps-key-without-restart
sharat87 Jul 1, 2023
97be740
Undo changes to env API for saving maps key
sharat87 Jul 1, 2023
1147d78
Use tenant API to save changes in Maps key
sharat87 Jul 1, 2023
49dfa6b
Fix compile error in backend test
sharat87 Jul 1, 2023
ff62866
Add migration to comment out maps key env variable
sharat87 Jul 1, 2023
8ad43c2
Copy fix
sharat87 Jul 1, 2023
e3074f2
Lint fix
sharat87 Jul 1, 2023
57bff18
Back to googleMaps.ts and fix server tests
sharat87 Jul 2, 2023
ca83278
Revert unneeded changes
sharat87 Jul 2, 2023
42b3c44
Remove maps env variable from initial templates
sharat87 Jul 2, 2023
70fa722
Remove unused TestUtils
sharat87 Jul 2, 2023
abfc787
Fix lint
sharat87 Jul 2, 2023
3898ecb
Show Save button on Maps settings page
sharat87 Jul 2, 2023
bd452e8
Fix test compile
sharat87 Jul 2, 2023
e84d588
Respond with error when no access to update tenant
sharat87 Jul 3, 2023
3b92a10
Merge branch 'release' into chore/maps-key-without-restart
sharat87 Jul 17, 2023
f46b227
Fix formatting
sharat87 Jul 17, 2023
a1a0500
Fix tests
sharat87 Jul 17, 2023
c48c991
Fix form login setting fail
sharat87 Jul 18, 2023
8002d28
updating only tenant cnfig condition
ankitakinger Jul 18, 2023
1cb3681
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
ankitakinger Jul 18, 2023
c6a0688
Merge branch 'release' into chore/maps-key-without-restart
sharat87 Jul 20, 2023
70e7236
Introducing "Save & Refresh"!
sharat87 Jul 21, 2023
d2a5404
Merge release
sharat87 Jul 21, 2023
4d05a25
Allow null in `getClientPertinentTenant`, used in EE
sharat87 Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .../appsmith-server/src/main/java/com/appsmith/server/controllers/ce/TenantControllerCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

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;
Expand All @@ -22,7 +23,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#saveEnvChangesJSON(Map<String,String>)}
* in {@link com.appsmith.server.controllers.ce.InstanceAdminControllerCE#saveEnvChanges(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
Expand Down