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

SC-196 RemoteXDA Instance Sorting #489

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

SC-196 RemoteXDA Instance Sorting #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be8719c
SC-196 fixed remote meter and remote asset sorting
KulinduC Aug 16, 2024
63cdca7
SC-196 fixed button layout
KulinduC Aug 16, 2024
de4dccc
SC-196 fixed spelling of Obfuscated
KulinduC Aug 16, 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
4 changes: 2 additions & 2 deletions .../Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteAssetForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ const BlankRemoteXDAAsset: OpenXDA.Types.RemoteXDAAsset = {
RemoteAssetCreatedByDataPusher: false,
LocalAssetName: null,
LocalAssetKey: null,
RemoteAssetName: '',
RemoteAssetKey: ''
RemoteAssetName: null,
RemoteAssetKey: null
}


Expand Down
14 changes: 6 additions & 8 deletions ...e/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteAssetTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,17 @@ const RemoteAssetTab = (props: IProps) => {
<ReactTable.Column<OpenXDA.Types.RemoteXDAAsset>
Key={'RemoteAssetName'}
AllowSort={true}
Field={'RemoteXDAAssetKey'}
Field={'RemoteAssetName'}
HeaderStyle={{ width: 'auto' }}
RowStyle={{ width: 'auto' }}
Content={({ item }) => item.Obsfucate ? item.RemoteXDAAssetKey : item.LocalAssetName }
> Remote Asset Name
</ReactTable.Column>
<ReactTable.Column<OpenXDA.Types.RemoteXDAAsset>
Key={'RemoteAssetKey'}
AllowSort={true}
Field={'RemoteXDAAssetKey'}
Field={'RemoteAssetKey'}
HeaderStyle={{ width: 'auto' }}
RowStyle={{ width: 'auto' }}
Content={({ item }) => item.Obsfucate ? item.RemoteXDAAssetKey : item.LocalAssetKey }
> Remote Asset Key
</ReactTable.Column>
<ReactTable.Column<OpenXDA.Types.RemoteXDAAsset>
Expand All @@ -167,7 +165,7 @@ const RemoteAssetTab = (props: IProps) => {
HeaderStyle={{ width: 'auto' }}
RowStyle={{ width: 'auto' }}
Content={({ item }) => item.Obsfucate ? HeavyCheckMark : null }
> Obsfucated
> Obfuscated
</ReactTable.Column>
<ReactTable.Column<OpenXDA.Types.RemoteXDAAsset>
Key={'Synced'}
Expand Down Expand Up @@ -240,7 +238,7 @@ const RemoteAssetTab = (props: IProps) => {
<div className="card-footer">
<div className="add-new-asset">
<button
className={"btn btn-primary" + (hasPermissions() ? '' : ' disabled')}
className={"btn btn-info" + (hasPermissions() ? '' : ' disabled')}
type="submit" data-tooltip='AddAssets' onMouseEnter={() => setHover('submit')} onMouseLeave={() => setHover('none')}
onClick={(e) => {
if (hasPermissions()) {
Expand Down Expand Up @@ -293,8 +291,8 @@ const RemoteAssetTab = (props: IProps) => {
RemoteAssetCreatedByDataPusher: false,
LocalAssetName: "",
LocalAssetKey: "",
RemoteAssetName: '',
RemoteAssetKey: ''
RemoteAssetName: "",
RemoteAssetKey: ""
}
dispatch(RemoteXDAAssetSlice.DBAction({ verb: "POST", record: newRemote }));
});
Expand Down
2 changes: 1 addition & 1 deletion .../Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteMeterForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const BlankRemoteXDAMeter: OpenXDA.Types.RemoteXDAMeter = {
LocalAlias: null,
LocalMeterName: null,
LocalAssetKey: null,
RemoteAlias: ''
RemoteAlias: null
}

function RemoteMeterComparator(remoteMeter_1: OpenXDA.Types.RemoteXDAMeter, remoteMeter_2: OpenXDA.Types.RemoteXDAMeter): boolean {
Expand Down
11 changes: 5 additions & 6 deletions ...e/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/RemoteMeterTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ const RemoteMeterTab = (props: IProps) => {
> Remote Meter Name
</ReactTable.Column>
<ReactTable.Column<OpenXDA.Types.RemoteXDAMeter>
Key={'RemoteAssetKey'}
Key={'RemoteXDAAssetKey'}
AllowSort={true}
Field={'RemoteXDAAssetKey'}
HeaderStyle={{ width: 'auto' }}
Expand All @@ -197,10 +197,9 @@ const RemoteMeterTab = (props: IProps) => {
<ReactTable.Column<OpenXDA.Types.RemoteXDAMeter>
Key={'RemoteAlias'}
AllowSort={true}
Field={'RemoteXDAName'}
Field={'RemoteAlias'}
HeaderStyle={{ width: 'auto' }}
RowStyle={{ width: 'auto' }}
Content={({ item }) => item.Obsfucate ? item.RemoteXDAName : item.LocalAlias }
> Remote Meter Alias
</ReactTable.Column>
<ReactTable.Column<OpenXDA.Types.RemoteXDAMeter>
Expand All @@ -210,7 +209,7 @@ const RemoteMeterTab = (props: IProps) => {
HeaderStyle={{ width: 'auto' }}
RowStyle={{ width: 'auto' }}
Content={({ item }) => item.Obsfucate ? HeavyCheckMark : null }
> Obsfucated
> Obfuscated
</ReactTable.Column>
<ReactTable.Column<OpenXDA.Types.RemoteXDAMeter>
Key={'Synced'}
Expand Down Expand Up @@ -283,7 +282,7 @@ const RemoteMeterTab = (props: IProps) => {
<div className="card-footer">
<div className="add-new-meter">
<button
className={"btn btn-primary" + (hasPermissions() ? '' : ' disabled')}
className={"btn btn-info" + (hasPermissions() ? '' : ' disabled')}
type="submit" data-tooltip='AddMeters' onMouseEnter={() => setHover('submit')} onMouseLeave={() => setHover('none')}
onClick={(e) => {
if (hasPermissions()) {
Expand Down Expand Up @@ -361,7 +360,7 @@ const RemoteMeterTab = (props: IProps) => {
LocalAlias: "",
LocalMeterName: "",
LocalAssetKey: "",
RemoteAlias: ''
RemoteAlias: ""
}
dispatch(RemoteXDAMeterSlice.DBAction({ verb: "POST", record: newRemote }));
setSelectedMeter(newRemote); // Technically, this is a race condition with setAssetCount
Expand Down
2 changes: 1 addition & 1 deletion ...pplications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/RemoteXDA/SystemSettingsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const SystemSettingsTab = (props: IProps) => {
</ToolTip>
<div className="btn-group mr-2">
<button
className={"btn btn-default" + (RemoteXDAInstanceComparator(baseInstance, formInstance) ? '' : ' disabled')}
className={"btn btn-warning" + (RemoteXDAInstanceComparator(baseInstance, formInstance) ? '' : ' disabled')}
data-tooltip="clear" onClick={() => {
setBaseInstance(_.cloneDeep(connection));
}}
Expand Down