#192 - Possibility to reset URL (delete parameters from URL) -Done (#193

) * initial work for #192 * #192 - Possibility to reset URL (delete parameters from URL) - Done
NaluKit · May 11, 2021 · 2c82754 · 2c82754
1 parent a07c52c
commit 2c82754
Show file tree

Hide file tree

Showing 40 changed files with 478 additions and 155 deletions.
diff --git a/...e-web/src/main/java/com/github/nalukit/nalu/plugin/core/web/client/NaluPluginCoreWeb.java b/...e-web/src/main/java/com/github/nalukit/nalu/plugin/core/web/client/NaluPluginCoreWeb.java
@@ -26,6 +26,7 @@
 import elemental2.dom.PopStateEvent;
 import jsinterop.base.Js;
 
+import javax.naming.spi.DirObjectFactory;
 import java.util.*;
 
 public class NaluPluginCoreWeb {
@@ -79,6 +80,7 @@ public static void getContextPath(ShellConfiguration shellConfiguration) {
 
   @SuppressWarnings("StringSplitter")
   public static NaluStartModel getNaluStartModel() {
+    Js.debugger();
     Location            location        = Js.uncheckedCast(DomGlobal.location);
     Map<String, String> queryParameters = new HashMap<>();
     String              search          = location.search;
@@ -127,8 +129,23 @@ public static NaluStartModel getNaluStartModel() {
       } else {
         startRoute = "";
       }
-    } return new NaluStartModel(startRoute,
-                                queryParameters);
+    }
+
+    // in case we need to remove the parameter, update histry ...
+    if (PropertyFactory.get().isRemoveUrlParameterAtStart()) {
+      String href = location.href;
+      String newUrl = "";
+      if (href.contains("?")) {
+        newUrl = href.substring(0, href.indexOf("?"));
+        if (startRoute.length() > 0) {
+          newUrl = newUrl + "#" + startRoute;
+          DomGlobal.window.history.replaceState(newUrl, DomGlobal.document.title, newUrl);
+        }
+      }
+    }
+
+    return new NaluStartModel(startRoute,
+                              queryParameters);
   }
 
   private static String getHashValue(String hash) {

diff --git a/...essor/src/main/java/com/github/nalukit/nalu/processor/generator/ApplicationGenerator.java b/...essor/src/main/java/com/github/nalukit/nalu/processor/generator/ApplicationGenerator.java
@@ -280,6 +280,8 @@ public void generate(MetaModel metaModel)
                                            metaModel);
     generateIsStayOnSide(typeSpec,
                          metaModel);
+    generateIsRemoveUrlParameterAtStart(typeSpec,
+                                        metaModel);
 
     JavaFile javaFile = JavaFile.builder(metaModel.getGenerateToPackage(),
                                          typeSpec.build())
@@ -371,6 +373,17 @@ private void generateIsStayOnSide(TypeSpec.Builder typeSpec,
                                  .build());
   }
 
+  private void generateIsRemoveUrlParameterAtStart(TypeSpec.Builder typeSpec,
+                                                   MetaModel metaModel) {
+    typeSpec.addMethod(MethodSpec.methodBuilder("isRemoveUrlParameterAtStart")
+                                 .addAnnotation(Override.class)
+                                 .addModifiers(Modifier.PUBLIC)
+                                 .returns(boolean.class)
+                                 .addStatement("return $L",
+                                               metaModel.isRemoveUrlParameterAtStart() ? "true" : "false")
+                                 .build());
+  }
+
   public static class Builder {
 
     ProcessingEnvironment processingEnvironment;

diff --git a/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/MetaModel.java b/nalu-processor/src/main/java/com/github/nalukit/nalu/processor/model/MetaModel.java
@@ -66,6 +66,9 @@ public class MetaModel {
   /* does the context extends                    */
   /* AbstractModuleContext?                      */
   private boolean extendingIsModuleContext;
+  /* do we have to remove the URL parameter      */
+  /* from the URL                                */
+  private boolean removeUrlParameterAtStart;
 
   public MetaModel() {
     this.modules = new ArrayList<>();
@@ -80,6 +83,7 @@ public MetaModel() {
 
     this.applicationVersion = "APPLCIATIOPN-VERSION-NOT-AVAILABLE";
     this.extendingIsModuleContext = false;
+    this.removeUrlParameterAtStart = false;
   }
 
   public ModuleModel getModuleModel() {
@@ -336,4 +340,12 @@ public String getIllegalRouteTarget() {
   public void setIllegalRouteTarget(String illegalRouteTarget) {
     this.illegalRouteTarget = illegalRouteTarget;
   }
+
+  public boolean isRemoveUrlParameterAtStart() {
+    return removeUrlParameterAtStart;
+  }
+
+  public void setRemoveUrlParameterAtStart(boolean removeUrlParameterAtStart) {
+    this.removeUrlParameterAtStart = removeUrlParameterAtStart;
+  }
 }
diff --git a/...src/main/java/com/github/nalukit/nalu/processor/scanner/ApplicationAnnotationScanner.java b/...src/main/java/com/github/nalukit/nalu/processor/scanner/ApplicationAnnotationScanner.java
@@ -79,6 +79,7 @@ public void scan()
       }
       metaModel.setStartRoute(applicationAnnotation.startRoute());
       metaModel.setIllegalRouteTarget(applicationAnnotation.illegalRouteTarget());
+      metaModel.setRemoveUrlParameterAtStart(applicationAnnotation.removeUrlParameterAtStart());
       metaModel.setUsingHash(applicationAnnotation.useHash());
       metaModel.setUsingColonForParametersInUrl(applicationAnnotation.useColonForParametersInUrl());
       metaModel.setStayOnSide(applicationAnnotation.stayOnSite());

diff --git a/...onOkWithLoaderAsInnerInterface/ApplicationAnnotationOkWithLoaderAsInnerInterfaceImpl.java b/...onOkWithLoaderAsInnerInterface/ApplicationAnnotationOkWithLoaderAsInnerInterfaceImpl.java
@@ -142,4 +142,15 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
+
+  @Override
+  public boolean isStayOnSide() {
+    return false;
+  }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
+
 }
diff --git a/.../application/applicationAnnotationOkWithLoader/ApplicationAnnotationOkWithLoaderImpl.java b/.../application/applicationAnnotationOkWithLoader/ApplicationAnnotationOkWithLoaderImpl.java
@@ -139,9 +139,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
-}
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
+ }
diff --git a/...notationOkWithLoaderAndPostLoader/ApplicationAnnotationOkWithLoaderAndPostLoaderImpl.java b/...notationOkWithLoaderAndPostLoader/ApplicationAnnotationOkWithLoaderAndPostLoaderImpl.java
@@ -139,9 +139,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...onOkWithLoaderAsInnerInterface/ApplicationAnnotationOkWithLoaderAsInnerInterfaceImpl.java b/...onOkWithLoaderAsInnerInterface/ApplicationAnnotationOkWithLoaderAsInnerInterfaceImpl.java
@@ -140,9 +140,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...tion/applicationAnnotationOkWithPostLoader/ApplicationAnnotationOkWithPostLoaderImpl.java b/...tion/applicationAnnotationOkWithPostLoader/ApplicationAnnotationOkWithPostLoaderImpl.java
@@ -139,9 +139,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...cation/applicationAnnotationOkWithoutLoader/ApplicationAnnotationOkWithoutLoaderImpl.java b/...cation/applicationAnnotationOkWithoutLoader/ApplicationAnnotationOkWithoutLoaderImpl.java
@@ -139,9 +139,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...n/application/applicationAnnotationOkWithoutLoaderAsInnerInterface/MyApplicationImpl.java b/...n/application/applicationAnnotationOkWithoutLoaderAsInnerInterface/MyApplicationImpl.java
@@ -140,9 +140,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...ocessor/common/application/applicationWithComposite01/ApplicationWithComposite01Impl.java b/...ocessor/common/application/applicationWithComposite01/ApplicationWithComposite01Impl.java
@@ -145,9 +145,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...ocessor/common/application/applicationWithComposite02/ApplicationWithComposite02Impl.java b/...ocessor/common/application/applicationWithComposite02/ApplicationWithComposite02Impl.java
@@ -148,9 +148,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...ocessor/common/application/applicationWithComposite03/ApplicationWithComposite03Impl.java b/...ocessor/common/application/applicationWithComposite03/ApplicationWithComposite03Impl.java
@@ -150,9 +150,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...ocessor/common/application/applicationWithComposite04/ApplicationWithComposite04Impl.java b/...ocessor/common/application/applicationWithComposite04/ApplicationWithComposite04Impl.java
@@ -154,9 +154,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...ocessor/common/application/applicationWithComposite05/ApplicationWithComposite05Impl.java b/...ocessor/common/application/applicationWithComposite05/ApplicationWithComposite05Impl.java
@@ -151,9 +151,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...ocessor/common/application/applicationWithComposite06/ApplicationWithComposite06Impl.java b/...ocessor/common/application/applicationWithComposite06/ApplicationWithComposite06Impl.java
@@ -159,10 +159,15 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
 
diff --git a/...ocessor/common/application/applicationWithComposite07/ApplicationWithComposite07Impl.java b/...ocessor/common/application/applicationWithComposite07/ApplicationWithComposite07Impl.java
@@ -167,9 +167,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...ocessor/common/application/applicationWithComposite08/ApplicationWithComposite08Impl.java b/...ocessor/common/application/applicationWithComposite08/ApplicationWithComposite08Impl.java
@@ -213,7 +213,12 @@ public boolean isStayOnSide() {
   }
 
   @Override
-  public PropertyFactory.ErrorHandlingMethod getErrorHandlingMethod() {
-    return PropertyFactory.ErrorHandlingMethod.ROUTING;
+  public boolean isStayOnSide() {
+    return false;
+  }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
   }
 }
diff --git a/...s/com/github/nalukit/nalu/processor/common/application/startRouteOK/StartRouteOKImpl.java b/...s/com/github/nalukit/nalu/processor/common/application/startRouteOK/StartRouteOKImpl.java
@@ -146,4 +146,9 @@ public boolean isUsingColonForParametersInUrl() {
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...ocessor/controller/generateWithIsComponentCreator/GenerateWithIsComponentCreatorImpl.java b/...ocessor/controller/generateWithIsComponentCreator/GenerateWithIsComponentCreatorImpl.java
@@ -139,9 +139,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }
diff --git a/...r/controller/generateWithoutIsComponentCreator/GenerateWithoutIsComponentCreatorImpl.java b/...r/controller/generateWithoutIsComponentCreator/GenerateWithoutIsComponentCreatorImpl.java
@@ -139,9 +139,14 @@ public boolean isUsingHash() {
   public boolean isUsingColonForParametersInUrl() {
     return false;
   }
-  
+
   @Override
   public boolean isStayOnSide() {
     return false;
   }
+
+  @Override
+  public boolean isRemoveUrlParameterAtStart() {
+    return false;
+  }
 }