-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2062 from eliasbruvik/FIX-2011
FIX-2011 Implement search list view
- Loading branch information
Showing
24 changed files
with
438 additions
and
223 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 124 additions & 0 deletions
124
Src/WitsmlExplorer.Frontend/components/ContentViews/ObjectSearchListView.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| import { Typography } from "@equinor/eds-core-react"; | ||
| import React, { useContext, useEffect, useState } from "react"; | ||
| import { FilterContext, filterTypeToProperty, getFilterTypeInformation, getSearchRegex, isObjectFilterType, isSitecomSyntax } from "../../contexts/filter"; | ||
| import NavigationContext from "../../contexts/navigationContext"; | ||
| import NavigationType from "../../contexts/navigationType"; | ||
| import OperationContext from "../../contexts/operationContext"; | ||
| import OperationType from "../../contexts/operationType"; | ||
| import LogObject from "../../models/logObject"; | ||
| import ObjectOnWellbore from "../../models/objectOnWellbore"; | ||
| import { ObjectType } from "../../models/objectType"; | ||
| import Well from "../../models/well"; | ||
| import Wellbore, { calculateLogTypeId } from "../../models/wellbore"; | ||
| import ObjectService from "../../services/objectService"; | ||
| import { getContextMenuPosition } from "../ContextMenus/ContextMenu"; | ||
| import { ObjectTypeToContextMenu } from "../ContextMenus/ContextMenuMapping"; | ||
| import LoadingContextMenu from "../ContextMenus/LoadingContextMenu"; | ||
| import { ObjectContextMenuProps } from "../ContextMenus/ObjectMenuItems"; | ||
| import { ContentTable, ContentTableColumn, ContentTableRow, ContentType } from "./table"; | ||
|
|
||
| export interface ObjectSearchRow extends ContentTableRow, ObjectOnWellbore { | ||
| object: ObjectOnWellbore; | ||
| well: Well; | ||
| wellbore: Wellbore; | ||
| objectType: ObjectType; | ||
| } | ||
|
|
||
| export const ObjectSearchListView = (): React.ReactElement => { | ||
| const { | ||
| navigationState: { wells }, | ||
| dispatchNavigation | ||
| } = useContext(NavigationContext); | ||
| const { dispatchOperation } = useContext(OperationContext); | ||
| const { selectedFilter } = useContext(FilterContext); | ||
| const [rows, setRows] = useState<ObjectSearchRow[]>([]); | ||
|
|
||
| useEffect(() => { | ||
| if (isObjectFilterType(selectedFilter.filterType)) { | ||
| const regex = getSearchRegex(selectedFilter.name); | ||
| setRows( | ||
| selectedFilter.searchResults | ||
| .filter((searchResult) => isSitecomSyntax(selectedFilter.name) || regex.test(searchResult.searchProperty)) // If we later want to filter away empty results, use regex.test(searchResult.searchProperty ?? "")) | ||
| .map((searchResult, index) => { | ||
| const well = wells?.find((w) => w.uid == searchResult.wellUid); | ||
| const wellbore = well?.wellbores?.find((wb) => wb.uid == searchResult.wellboreUid); | ||
| return { | ||
| id: index, | ||
| ...searchResult, | ||
| [filterTypeToProperty[selectedFilter.filterType]]: searchResult.searchProperty, | ||
| object: searchResult, | ||
| well, | ||
| wellbore | ||
| }; | ||
| }) | ||
| ); | ||
| } | ||
| }, [selectedFilter]); | ||
|
|
||
| const fetchSelectedObject = async (checkedObjectRow: ObjectSearchRow) => { | ||
| return await ObjectService.getObject(checkedObjectRow.wellUid, checkedObjectRow.wellboreUid, checkedObjectRow.uid, checkedObjectRow.objectType); | ||
| }; | ||
|
|
||
| const onContextMenu = async (event: React.MouseEvent<HTMLLIElement>, {}, checkedObjectRows: ObjectSearchRow[]) => { | ||
| const position = getContextMenuPosition(event); | ||
| dispatchOperation({ type: OperationType.DisplayContextMenu, payload: { component: <LoadingContextMenu />, position } }); | ||
| const wellbore = checkedObjectRows[0].wellbore; | ||
| const objectType = checkedObjectRows[0].objectType; | ||
| const fetchedObject = await fetchSelectedObject(checkedObjectRows[0]); | ||
| const contextProps: ObjectContextMenuProps = { checkedObjects: [fetchedObject], wellbore }; | ||
| const component = ObjectTypeToContextMenu[objectType]; | ||
| if (component) { | ||
| dispatchOperation({ type: OperationType.DisplayContextMenu, payload: { component: React.createElement(component, { ...contextProps }), position } }); | ||
| } | ||
| }; | ||
|
|
||
| const getColumns = () => { | ||
| const columns: ContentTableColumn[] = [ | ||
| { property: "objectType", label: "objectType", type: ContentType.String }, | ||
| { property: "name", label: "name", type: ContentType.String }, | ||
| { property: "wellboreName", label: "wellboreName", type: ContentType.String }, | ||
| { property: "wellName", label: "wellName", type: ContentType.String }, | ||
| { property: "uid", label: "uid", type: ContentType.String }, | ||
| { property: "wellboreUid", label: "wellboreUid", type: ContentType.String }, | ||
| { property: "wellUid", label: "wellUid", type: ContentType.String } | ||
| ]; | ||
|
|
||
| if (filterTypeToProperty[selectedFilter?.filterType] != "name") { | ||
| columns.unshift({ property: filterTypeToProperty[selectedFilter?.filterType], label: filterTypeToProperty[selectedFilter?.filterType], type: ContentType.String }); | ||
| } | ||
|
|
||
| return columns; | ||
| }; | ||
|
|
||
| const onSelect = async (row: ObjectSearchRow) => { | ||
| const objects = await ObjectService.getObjects(row.wellUid, row.wellboreUid, row.objectType); | ||
| if (row.objectType == ObjectType.Log) { | ||
| const logTypeGroup = calculateLogTypeId(row.wellbore, (objects.find((o) => o.uid == row.uid) as LogObject)?.indexType); | ||
| row.wellbore.logs = objects; | ||
| dispatchNavigation({ | ||
| type: NavigationType.SelectLogType, | ||
| payload: { well: row.well, wellbore: row.wellbore, logTypeGroup: logTypeGroup } | ||
| }); | ||
| } else { | ||
| dispatchNavigation({ | ||
| type: NavigationType.SelectObjectGroup, | ||
| payload: { objectType: row.objectType, wellUid: row.wellUid, wellboreUid: row.wellboreUid, objects } | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| return rows.length == 0 ? ( | ||
| <Typography style={{ padding: "1rem", whiteSpace: "pre-line" }}>{getFilterTypeInformation(selectedFilter.filterType)}</Typography> | ||
| ) : ( | ||
| <ContentTable | ||
| viewId="objectOnWellboreListView" | ||
| columns={getColumns()} | ||
| onSelect={onSelect} | ||
| data={rows} | ||
| onContextMenu={onContextMenu} | ||
| downloadToCsvFileName={`${selectedFilter.filterType}_search`} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| export default ObjectSearchListView; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
Src/WitsmlExplorer.Frontend/components/ContextMenus/ContextMenuMapping.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { ObjectType } from "../../models/objectType"; | ||
| import BhaRunContextMenu from "./BhaRunContextMenu"; | ||
| import FluidsReportContextMenu from "./FluidsReportContextMenu"; | ||
| import FormationMarkerContextMenu from "./FormationMarkerContextMenu"; | ||
| import LogObjectContextMenu from "./LogObjectContextMenu"; | ||
| import MessageObjectContextMenu from "./MessageObjectContextMenu"; | ||
| import MudLogContextMenu from "./MudLogContextMenu"; | ||
| import { ObjectContextMenuProps } from "./ObjectMenuItems"; | ||
| import RigContextMenu from "./RigContextMenu"; | ||
| import RiskObjectContextMenu from "./RiskContextMenu"; | ||
| import TrajectoryContextMenu from "./TrajectoryContextMenu"; | ||
| import TubularContextMenu from "./TubularContextMenu"; | ||
| import WbGeometryObjectContextMenu from "./WbGeometryContextMenu"; | ||
|
|
||
| export const ObjectTypeToContextMenu: Record<ObjectType, React.ComponentType<ObjectContextMenuProps> | null> = { | ||
| [ObjectType.BhaRun]: BhaRunContextMenu, | ||
| [ObjectType.ChangeLog]: null, | ||
| [ObjectType.FluidsReport]: FluidsReportContextMenu, | ||
| [ObjectType.FormationMarker]: FormationMarkerContextMenu, | ||
| [ObjectType.Log]: LogObjectContextMenu, | ||
| [ObjectType.Message]: MessageObjectContextMenu, | ||
| [ObjectType.MudLog]: MudLogContextMenu, | ||
| [ObjectType.Rig]: RigContextMenu, | ||
| [ObjectType.Risk]: RiskObjectContextMenu, | ||
| [ObjectType.Trajectory]: TrajectoryContextMenu, | ||
| [ObjectType.Tubular]: TubularContextMenu, | ||
| [ObjectType.WbGeometry]: WbGeometryObjectContextMenu | ||
| }; |
Oops, something went wrong.