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.

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

Jump to bottom

#1939 Expand Rigs group in sidebar #1969

Merged
merged 2 commits into from
Jun 27, 2023
Merged

#1939 Expand Rigs group in sidebar #1969

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86676d8
#1939 Expand Rigs group in sidebar
petrlicman Jun 27, 2023
0f96884
Fix of context menu for #1939
petrlicman Jun 27, 2023
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
2 changes: 1 addition & 1 deletion Src/WitsmlExplorer.Api/Services/ObjectService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public interface IObjectService

public class ObjectService : WitsmlService, IObjectService
{
private readonly List<EntityType> _expandableObjects = new() { EntityType.FluidsReport, EntityType.MudLog, EntityType.Trajectory, EntityType.Tubular, EntityType.WbGeometry };
private readonly List<EntityType> _expandableObjects = new() { EntityType.FluidsReport, EntityType.MudLog, EntityType.Rig, EntityType.Trajectory, EntityType.Tubular, EntityType.WbGeometry };
private readonly ILogger<ObjectService> _logger;

public ObjectService(IWitsmlClientProvider witsmlClientProvider, ILogger<ObjectService> logger) : base(witsmlClientProvider)
Expand Down
8 changes: 7 additions & 1 deletion Src/WitsmlExplorer.Frontend/components/Sidebar/ObjectOnWellboreItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ const ObjectOnWellboreItem = (props: ObjectOnWellboreItemProps): React.ReactElem
nodeId={nodeId}
labelText={objectOnWellbore.name}
selected={selected}
onLabelClick={() => dispatchNavigation({ type: NavigationType.SelectObject, payload: { object: objectOnWellbore, wellbore, well, objectType } })}
onLabelClick={() => {
if (objectType === ObjectType.Rig) {
dispatchNavigation({ type: NavigationType.SelectObjectGroup, payload: { wellUid: well.uid, wellboreUid: wellbore.uid, objectType: objectType, objects: null } });
} else {
dispatchNavigation({ type: NavigationType.SelectObject, payload: { object: objectOnWellbore, wellbore, well, objectType } });
}
}}
onContextMenu={(event: React.MouseEvent<HTMLLIElement>) => onContextMenu(event)}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion Src/WitsmlExplorer.Frontend/components/Sidebar/WellboreItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const WellboreItem = (props: WellboreItemProps): React.ReactElement => {
</ObjectGroupItem>
<ObjectGroupItem objectType={ObjectType.Message} />
<ObjectGroupItem objectsOnWellbore={wellbore?.mudLogs} objectType={ObjectType.MudLog} ObjectContextMenu={MudLogContextMenu} />
<ObjectGroupItem objectType={ObjectType.Rig} />
<ObjectGroupItem objectsOnWellbore={wellbore?.rigs} objectType={ObjectType.Rig} />
petrlicman marked this conversation as resolved.
Show resolved Hide resolved
<ObjectGroupItem objectType={ObjectType.Risk} />
<ObjectGroupItem objectsOnWellbore={wellbore?.trajectories} objectType={ObjectType.Trajectory} ObjectContextMenu={TrajectoryContextMenu} />
<ObjectGroupItem
Expand Down
16 changes: 9 additions & 7 deletions Tests/WitsmlExplorer.Api.Tests/Services/ObjectServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,19 @@ public async Task GetExpandableObjectsCount_FourTypesExist_ReturnCount()
{
SetupReturnsObjectList(EntityType.FluidsReport, 0);
SetupReturnsObjectList(EntityType.MudLog, 2);
SetupReturnsObjectList(EntityType.Trajectory, 3);
SetupReturnsObjectList(EntityType.Tubular, 4);
SetupReturnsObjectList(EntityType.WbGeometry, 5);
SetupReturnsObjectList(EntityType.Rig, 3);
SetupReturnsObjectList(EntityType.Trajectory, 4);
SetupReturnsObjectList(EntityType.Tubular, 5);
SetupReturnsObjectList(EntityType.WbGeometry, 6);

Dictionary<EntityType, int> result = await _service.GetExpandableObjectsCount("uidWell", "uidWellbore");
Assert.Equal(5, result.Count);
Assert.Equal(6, result.Count);
Assert.Equal(0, result[EntityType.FluidsReport]);
Assert.Equal(2, result[EntityType.MudLog]);
Assert.Equal(3, result[EntityType.Trajectory]);
Assert.Equal(4, result[EntityType.Tubular]);
Assert.Equal(5, result[EntityType.WbGeometry]);
Assert.Equal(3, result[EntityType.Rig]);
Assert.Equal(4, result[EntityType.Trajectory]);
Assert.Equal(5, result[EntityType.Tubular]);
Assert.Equal(6, result[EntityType.WbGeometry]);
}

private void SetupReturnsObjectList(EntityType type, int count)
Expand Down