Skip to content

Add AssetGroups and Customers tabs to Asset and Meter records. #956

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

Draft
nbeatty-gpa wants to merge 14 commits into
base: master
Choose a base branch
from
Draft

Add AssetGroups and Customers tabs to Asset and Meter records. #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c41d42f
add hooks for PagedSearch and GetOne
nbeatty-gpa Sep 18, 2026
20a2917
create generic components for tabbed record layouts
nbeatty-gpa Sep 18, 2026
6a6db0e
add default filter prop to controller select popup
nbeatty-gpa Sep 18, 2026
3482ec0
use new generic components for remote xda tabbed record layout
nbeatty-gpa Sep 18, 2026
28d438a
include new components in project
nbeatty-gpa Sep 18, 2026
52a25f4
remove remote xda and other unused slices and unused imports
nbeatty-gpa Sep 18, 2026
9933f45
update gemstone
nbeatty-gpa Sep 18, 2026
beb4265
add props and component documentation
nbeatty-gpa Sep 21, 2026
9fe62fd
minor GenericRelation improvements
nbeatty-gpa Sep 23, 2026
e3aa386
minor ControllerSelectPopup improvements
nbeatty-gpa Sep 23, 2026
737342c
create AssetGroupRelation component with endpoints
nbeatty-gpa Sep 23, 2026
900a659
create CustomerRelation component
nbeatty-gpa Sep 23, 2026
f10a2dc
add Customer and AssetGroup tabs to Asset and Meter records
nbeatty-gpa Sep 23, 2026
c12d6eb
add new components to project
nbeatty-gpa Sep 23, 2026
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
5 changes: 5 additions & 0 deletions ...Applications/SystemCenter/Controllers/OpenXDA/AssetGroups/OpenXDAAssetGroupsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,4 +531,9 @@ public override IHttpActionResult Patch([FromBody] AssetGroupView record)
}
}

[RoutePrefix("api/OpenXDA/MeterAssetGroup")]
public class MeterAssetGroupController : ModelController<MeterAssetGroup> { }

[RoutePrefix("api/OpenXDA/AssetAssetGroup")]
public class AssetAssetGroupController : ModelController<AssetAssetGroup> { }
}
8 changes: 8 additions & 0 deletions Source/Applications/SystemCenter/SystemCenter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,7 @@
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\AssetAttribute\FawgLineSegmentWizard\TapSelect.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\AssetAttribute\SourceImpedanceWindow.tsx" />
<Content Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\AdditionalFieldsKeyModal.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\AssetGroups\AssetGroupRelation.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\AdditionalFieldsValueField.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\ChannelGroup\ByChannelGroup.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\ChannelGroup\ChannelGroupItemForm.tsx" />
Expand All @@ -618,15 +619,21 @@
<Content Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\Restrictions\EditionLockPage.tsx" />
<Content Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\Restrictions\EditionLockModal.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\AssetGroupWindow.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\ControllerSelectPopup.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\ExtDBTaskStatusModal.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\FileGroupAnalysisJobPriority.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\GenericForm.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\GenericInfo.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\GenericRecord.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\GenericRelation.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\ProcessingStatus.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\Restrictions\EditionRestrictionTooltip.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\Restrictions\RoleRestrictionTooltip.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\ExternalDBUpdate.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\StatusDetails.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\StatusGroup.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\CommonComponents\StatusItem.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\Customer\CustomerRelation.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\DeviceHealthReport\AppStatus.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\ExternalDB\ExternalDBTable.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\ExternalDB\ExternalDBTableFields.tsx" />
Expand Down Expand Up @@ -818,6 +825,7 @@
<Content Include="wwwroot\Scripts\TSX\SystemCenter\Store\AdditionalUserFieldSlice.tsx" />
<Content Include="wwwroot\Scripts\TSX\SystemCenter\Matcher.tsx" />
<Content Include="wwwroot\Scripts\TSX\SystemCenter\Store\ConfigurationSlice.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\Store\UserSettings.ts" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\User\AdditionalUserFieldsWindow.tsx" />
<Content Include="wwwroot\Scripts\TSX\SystemCenter\User\UserGroup\ByUserGroup.tsx" />
<TypeScriptCompile Include="wwwroot\Scripts\TSX\SystemCenter\User\User\Permissions.tsx" />
Expand Down
62 changes: 31 additions & 31 deletions Source/Applications/SystemCenter/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Source/Applications/SystemCenter/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"webpack-cli": "4.7.2"
},
"dependencies": {
"@gpa-gemstone/react-graph": "1.0.115",
"@gpa-gemstone/react-graph": "1.0.116",
"@turf/turf": "7.4.0",
"@arcgis/core": "5.1.17",
"proj4leaflet": "^1.0.2",
"@gpa-gemstone/common-pages": "0.0.190",
"@gpa-gemstone/common-pages": "0.0.191",
"@reduxjs/toolkit": "1.8.3",
"assert": "2.0.0",
"buffer": "6.0.3",
Expand Down
10 changes: 8 additions & 2 deletions Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Asset/Asset.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ import { LoadingScreen, TabSelector, Warning } from '@gpa-gemstone/react-interac
import SourceImpedanceWindow from '../AssetAttribute/SourceImpedanceWindow';
import { useAppSelector } from '../hooks';
import { SelectRoles } from '../Store/UserSettings';
import AssetGroupRelation from '../AssetGroups/AssetGroupRelation';
import CustomerRelation from '../Customer/CustomerRelation';

declare var homePath: string;
declare type Tab = 'notes' | 'assetInfo' | 'substations' | 'meters' | 'connections' | 'additionalFields' | 'extDB' | 'segments' | 'sourceImpedances' | 'channels';
declare type Tab = 'notes' | 'assetInfo' | 'substations' | 'meters' | 'connections' | 'additionalFields' | 'extDB' | 'segments' | 'sourceImpedances' | 'channels' | 'assetGroups' | 'customers';

interface IProps { AssetID: number, Tab: Tab }

Expand Down Expand Up @@ -144,6 +146,8 @@ function Asset(props: IProps) {
{ Id: "meters", Label: "Meters" },
{ Id: "channels", Label: "Channels" },
{ Id: "connections", Label: "Connections" },
{ Id: "assetGroups", Label: "Asset Groups" },
{ Id: "customers", Label: "Customers"}
];

if (assetType == 'Line') {
Expand Down Expand Up @@ -180,7 +184,9 @@ function Asset(props: IProps) {
{tab === "channels" ? <AssetChannelWindow Name={asset.AssetName} ID={asset.ID} />: null}
{tab === 'connections' ? <AssetConnectionWindow Name={asset.AssetName} ID={asset.ID} TypeID={asset["AssetTypeID"]} />: null}
{tab === 'sourceImpedances' ? <SourceImpedanceWindow ID={asset.ID} />: null}
{tab === 'segments' ? <LineSegmentWindow ID={asset.ID} LineKey={asset.AssetKey} LineName={asset.AssetName} OnChange={() => { setForceReload(x => !x) }} />: null}
{tab === 'segments' ? <LineSegmentWindow ID={asset.ID} LineKey={asset.AssetKey} LineName={asset.AssetName} OnChange={() => { setForceReload(x => !x) }} /> : null}
{tab === 'assetGroups' ? <AssetGroupRelation Record={asset} /> : null}
{tab === 'customers' ? <CustomerRelation Record={asset} /> : null }

<Warning Message={'This will permanently delete this Asset and cannot be undone.'} Show={showDelete} Title={'Delete ' + (asset?.AssetName ?? 'Asset')} CallBack={(conf) => { if (conf) deleteAsset(); setShowDelete(false); }} />
<LoadingScreen Show={loadDelete} />
Expand Down
Loading