Skip to content

v.3.3.3 #77

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

Merged
kslysz merged 1 commit into from
Oct 22, 2022
Merged

v.3.3.3 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion frontend/src/components/data/BucketDataTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
Expand Down Expand Up @@ -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);
}}
Expand Down
3 changes: 0 additions & 3 deletions frontend/src/components/login/LoginPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
11 changes: 2 additions & 9 deletions frontend/src/route/AppRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}
Expand Down