Skip to content
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.

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

Update desktop edition with latest changes #2551

Merged
merged 27 commits into from
Sep 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
91075ef
Create a new API method for downloading report data in csv format (#2…
LibNik Jun 26, 2024
bec70ac
FIX-2493 requestObjectSelectionCapability workaround (#2495)
eliasbruvik Jun 26, 2024
5f376c0
FIX-2487 Add job progress for copying log curves (#2497)
eliasbruvik Jun 26, 2024
38c43e0
maxdatapoints (#2499)
robertbasti Aug 2, 2024
5f13738
FIX-2500 Properties modal refactoring (#2501)
eliasbruvik Aug 2, 2024
00fcce9
FIX-2512 Fix time zone offset bug (#2513)
eliasbruvik Aug 2, 2024
f9899ee
FIX-2503 Sort log curves in table by active (#2504)
eliasbruvik Aug 5, 2024
20a6b2d
FIX-2489 Query View - Implement "Open in table view" (#2510)
eliasbruvik Aug 5, 2024
391684a
FIX-2508 Disable paste when no trajectory station is copied (#2509)
eliasbruvik Aug 5, 2024
ed2605f
FIX-2506 Show heartbeat for active multi-logs (#2507)
eliasbruvik Aug 5, 2024
f92b6e1
FIX-2494 Allow unspecified returnElements in queryView (#2505)
eliasbruvik Aug 5, 2024
fb57c70
FIX-2511 Ensure correct match between log header and data for downloa…
eliasbruvik Aug 5, 2024
907ce36
[Snyk] Security upgrade echarts from 5.5.0 to 5.5.1 (#2498)
marmid74 Aug 5, 2024
5e581ef
FIX-2515 Add required properties for creating new objects (#2516)
eliasbruvik Aug 5, 2024
c89225c
#2475 Command palette with better actions ux flow for query editor (#…
matusmlichsk Aug 7, 2024
ea895cb
fix: support for using Button.Group in custom Button component (#2518)
matusmlichsk Aug 13, 2024
ba756de
fix: expanded well overflow after filtering fixed to fit layout aroun…
matusmlichsk Aug 19, 2024
f930bbc
Add WEx demo videos to Readme's (#2527)
eliasbruvik Aug 21, 2024
f6d3133
Api.Workers tests #1907 (#2523)
robertbasti Aug 23, 2024
d02b540
Video fix (#2531)
eliasbruvik Aug 23, 2024
1861258
Video fix (#2532)
eliasbruvik Aug 23, 2024
bf5d04d
FIX-2540 Import LAS - Depth Logs (#2541)
eliasbruvik Sep 3, 2024
46b175d
Global log curve priority (#2544)
robertbasti Sep 13, 2024
2503924
Database should be designed to prevent of duplicate prioritized log c…
robertbasti Sep 16, 2024
244c36a
Add more demo videos (#2547)
eliasbruvik Sep 17, 2024
69b5f0b
update readme (#2549)
eliasbruvik Sep 17, 2024
5092c18
Bump desktop version (#2550)
eliasbruvik Sep 17, 2024
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
Prev Previous commit
Next Next commit
FIX-2503 Sort log curves in table by active (#2504)
eliasbruvik authored Aug 5, 2024
commit f9899ee96c5b36dbfd920069fbc995fbf046593e
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ import {
} from "@tanstack/react-table";
import {
activeId,
booleanSortingFn,
calculateColumnWidth,
componentSortingFn,
expanderId,
@@ -35,6 +36,7 @@ declare module "@tanstack/react-table" {
interface SortingFns {
[measureSortingFn]: SortingFn<unknown>;
[componentSortingFn]: SortingFn<unknown>;
[booleanSortingFn]: SortingFn<unknown>;
}
}

@@ -65,7 +67,7 @@ export const useColumnDef = (
header: column.label,
size: width,
meta: { type: column.type },
sortingFn: getSortingFn(column.type),
sortingFn: getSortingFn(column),
enableColumnFilter: column.type !== ContentType.Component,
filterFn: getFilterFn(column),
...addComponentCell(column.type),
@@ -235,11 +237,13 @@ const getCheckableRowsColumnDef = (
};
};

const getSortingFn = (contentType: ContentType) => {
if (contentType == ContentType.Measure) {
const getSortingFn = (column: ContentTableColumn) => {
if (column.type == ContentType.Measure) {
return measureSortingFn;
} else if (contentType == ContentType.Number) {
} else if (column.type == ContentType.Number) {
return "alphanumeric";
} else if (column.label === activeId) {
return booleanSortingFn;
}
return "text";
};
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@ import {
TableContainer
} from "components/ContentViews/table/contentTableStyles";
import {
booleanSortingFn,
calculateHorizontalSpace,
calculateRowHeight,
componentSortingFn,
@@ -133,6 +134,15 @@ export const ContentTable = React.memo(
const a = rowA.getValue(columnId) == null;
const b = rowB.getValue(columnId) == null;
return a === b ? 0 : a ? -1 : 1;
},
[booleanSortingFn]: (
rowA: Row<any>,
rowB: Row<any>,
columnId: string
) => {
const a = rowA.getValue(columnId);
const b = rowB.getValue(columnId);
return a === b ? 0 : a ? 1 : -1;
}
},
columnResizeMode: "onChange",
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ export const expanderId = "expander";
export const activeId = "active"; //implemented specifically for LogCurveInfoListView, needs rework if other views will also use filtering
export const measureSortingFn = "measure";
export const componentSortingFn = "component";
export const booleanSortingFn = "boolean";

export const constantTableOptions = {
enableColumnResizing: true,