Merge pull request #77 from databucket/3.3.3

v.3.3.3

Author: kslysz

frontend/src/components/data/BucketDataTable.jsx

@@ -113,13 +113,16 @@ export default function BucketDataTable(props) {
 
     // active bucket has been changed
     useEffect(() => {
+        // console.log(">> active bucket has been changed");
         setChangedBucket(true);
         setFiltering(false);
         const bucketViews = getBucketViews(activeBucket, views);
         if (bucketViews.length > 0 && tags != null && enums != null && views != null && columns != null) {
+            // console.log(">> 1");
             const orderBy = getLastBucketOrder(activeBucket.id);
-
+            // console.log("lastBucketOrder: " + orderBy);
             if (tableRef !== null && tableRef.current !== null) {
+                // console.log("lastBucketSearchText: " + searchText);
                 tableRef.current.dataManager.changeSearchText(searchText);
                 tableRef.current.dataManager.orderBy = -1;
                 tableRef.current.dataManager.orderDirection = "";
@@ -662,6 +665,9 @@ export default function BucketDataTable(props) {
                         }
                     }}
                     onOrderChange={(colId, ord) => {
+                        // console.log("onOrderChange: (colId, ord)");
+                        // console.log(colId);
+                        // console.log(ord);
                         let order = (colId >= 0) ? {colId, ord} : null;
                         setLastBucketOrder(activeBucket.id, order);
                     }}

frontend/src/components/login/LoginPage.jsx

@@ -236,14 +236,11 @@ export default function LoginPage() {
                 return getProjectsPaper();
             case 2:
                 const pathname = getPathname();
-                console.log("pathname: " + pathname);
                 if (pathname != null && pathname !== "null") {
                     setPathname(null);
-                    console.log("> 1: redirectTo: " + pathname);
                     return redirectTo(pathname)
                 } else {
                     const pathname = getProjectDataPath();
-                    console.log("> 2: redirectTo: " + pathname);
                     return redirectTo(pathname);
                 }
             case 1:

frontend/src/route/AppRouter.js

@@ -14,16 +14,9 @@ import {getContextPath} from "../utils/UrlBuilder";
 
 export default function AppRouter() {
 
-    const fullPathname = window.location.pathname;
-    const pathname = fullPathname.replace(getContextPath(), "");
+    // initial browser url without context path
+    setPathname(window.location.pathname.replace(getContextPath(), ""));
 
-    console.log("----save pathname -------------------------------------------");
-    console.log("contextPath: " + getContextPath());
-    console.log("fullPathname: " + fullPathname);
-    console.log("pathname: " + pathname);
-    console.log("-------------------------------------------------------------");
-
-    setPathname(pathname);
     return (
         <BrowserRouter
             basename={getContextPath()}