Skip to content

Commit 4634e54

Browse files
committed
avniproject/avni-webapp#1509 | Fix static assets path
1. Replace /static with /assets 2. Remove old analytics paths
1 parent 543eeb0 commit 4634e54

File tree

5 files changed

+3
-27
lines changed

5 files changed

+3
-27
lines changed

avni-server-api/src/main/java/org/avni/server/StaticResourceConfiguration.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,17 @@ public class StaticResourceConfiguration implements WebMvcConfigurer {
1616
@Value("${static.path}")
1717
private String staticPath;
1818

19-
@Value("${analytics.path}")
20-
private String analyticsPath;
21-
2219
@Override
2320
public void addResourceHandlers(ResourceHandlerRegistry registry) {
2421
if (staticPath != null) {
2522
registry
26-
.addResourceHandler("/static/**")
27-
.addResourceLocations("file:" + staticPath + "static/")
23+
.addResourceHandler("/assets/**")
24+
.addResourceLocations("file:" + staticPath + "assets/")
2825
.setCacheControl(CacheControl.maxAge(365, TimeUnit.DAYS));
29-
//this is to serve user review html page in the web app.
30-
registry.addResourceHandler("/userReview")
31-
.addResourceLocations("file:" + staticPath + "userReview/");
3226
registry
3327
.addResourceHandler("/**")
3428
.addResourceLocations("file:" + staticPath);
3529
}
36-
if(analyticsPath != null){
37-
registry
38-
.addResourceHandler("/analytics/static/**")
39-
.addResourceLocations("file:" + analyticsPath + "static/");
40-
registry
41-
.addResourceHandler("/analytics/**")
42-
.addResourceLocations("file:" + analyticsPath);
43-
}
4430
}
4531

4632
@Override

avni-server-api/src/main/java/org/avni/server/domain/metabase/CannedAnalyticsException.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

avni-server-api/src/main/java/org/avni/server/framework/security/ResourceProtectionStatus.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ public class ResourceProtectionStatus {
1212
"/cognito-details",
1313
"/idp-details",
1414
"/favicon.ico",
15-
"/static/**",
16-
"/userReview",
15+
"/assets/**",
1716
"/asset-manifest.json",
1817
"/bulkuploads/**",
1918
"/documentation/**",

avni-server-api/src/main/resources/application.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ minio.secretAccessKey=${OPENCHS_MINIO_SECRET_ACCESS_KEY:dummy}
107107
static.path=${OPENCHS_STATIC_PATH:/opt/openchs/static/}
108108
csp.enabled=${OPENCHS_CSP_ENABLED:false}
109109
csp.allowed.hosts=${OPENCHS_CSP_ALLOWED_HOSTS:*.amazonaws.com keycloak-staging.avniproject.org}
110-
analytics.path=${OPENCHS_ANALYTICS_PATH:/opt/openchs/analytics/}
111110
spring.jackson.serialization.write-dates-as-timestamps=false
112111

113112
# Batch Jobs

avni-server-api/src/test/resources/application.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ avni.bucketName=${OPENCHS_BUCKET_NAME:dev-user-media}
6060
avni.connectToS3InDev=${OPENCHS_S3_IN_DEV:false}
6161

6262
static.path=${OPENCHS_STATIC_PATH:/opt/openchs/static/}
63-
analytics.path=${OPENCHS_ANALYTICS_PATH:/opt/openchs/analytics/}
6463

6564
#Minio
6665
minio.s3.enable=${OPENCHS_MINIO_ENABLED:false}

0 commit comments

Comments
 (0)