zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move error page to react.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2023-07-30 22:31:24 -07:00
parent 68aa7c20eb
commit 1340fff68a
8 changed files with 60 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/webapp/WEB-INF/classes/log4j2.xml
View File

@@ -14,7 +14,7 @@
<Logger name="com.wisemapping" level="warn">
<AppenderRef ref="LogToConsole"/>
</Logger>
<Logger name="org.springframework" level="warn">
<Logger name="org.springframework" level="trace">
<AppenderRef ref="LogToConsole"/>
</Logger>
<Root level="warn">

5
wise-webapp/src/main/webapp/WEB-INF/views/reactInclude.jsp
View File

@@ -11,8 +11,6 @@
<link rel="preload" href="https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200;300;400;600&display=swap" as="style" onload="this.onload=null;this.rel='stylesheet'" crossorigin>
<%@ include file="pageHeaders.jsf" %>
<title>WiseMapping</title>
<script>
window.serverconfig = {
apiBaseUrl: '${requestScope['site.baseurl']}',
@@ -23,7 +21,10 @@
googleOauth2Url: '${requestScope['security.oauth2.google.url']}'
};
<!-- Hack to force view selection on react to move all the UI to react-->
window.errorMvcView = '${requestScope['exception']!=null?(fn:indexOf(requestScope['exception'],'SecurityException') gt 1?'securityError':'unexpectedError'):''}';
</script>
<c:if test="${requestScope['google.analytics.enabled']}">
<!-- Google Ads Sense Config. Lazy loading optimization -->
<script type="text/javascript">

27
wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
View File

@@ -22,33 +22,6 @@
<bean id="requestInterceptor" class="com.wisemapping.filter.RequestPropertiesInterceptor"/>
</mvc:interceptors>
<bean id="simpleMappingExceptionResolver"
class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
<property name="defaultStatusCode" value="500"/>
<property name="defaultErrorView" value="errorTemplate"/>
<property name="warnLogCategory" value="com.wisemapping.mvc.Exceptions"/>
<property name="exceptionMappings">
<props>
<!-- Security access exceptions must not handle as unexpected errors -->
<prop key="com.wisemapping.exceptions.MapNonPublicException">securityError</prop>
<prop key="com.wisemapping.exceptions.AccessDeniedSecurityException">securityError</prop>
</props>
</property>
<property name="statusCodes">
<props>
<prop key="securityError">403</prop>
</props>
</property>
</bean>
<bean id="viewResolver"
class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/WEB-INF/views/"/>
<property name="suffix" value=".jsp"/>
</bean>
<bean id="localeResolver"
class="org.springframework.web.servlet.i18n.SessionLocaleResolver">
</bean>