Skip to content

Commit

Permalink
simplified tab logic
Browse files Browse the repository at this point in the history
  • Loading branch information
@collins-self
collins-self committed Nov 22, 2024
1 parent 9ce488f commit f047dde
Showing 1 changed file with 9 additions and 121 deletions.
130 changes: 9 additions & 121 deletions ...e/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/NewMeterWizard/AssetPage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,14 @@ export default function AssetPage(props: IProps) {
switch (newEditAsset.AssetType) {
case 'Transformer':
return [
{ Id: "default", Label: "Primary Side"},
{ Id: "secondary", Label: "Secondary Side"},
{ Id: "tertiary", Label: "Tertiary Side"}
{ Id: "0", Label: "Primary Side"},
{ Id: "1", Label: "Secondary Side"},
{ Id: "2", Label: "Tertiary Side"}
];
case 'Breaker':
return [
{ Id: "default", Label: "Bus Side" },
{ Id: "line", Label: "Line/XFR Side"},
{ Id: "0", Label: "Bus Side" },
{ Id: "1", Label: "Line/XFR Side"},
];
default:
return [{ Label: 'Default', Id: 'default' }];
Expand Down Expand Up @@ -552,138 +552,26 @@ export default function AssetPage(props: IProps) {
/>
)}
<ChannelSelector
Label="Associated Channels"
Label=""
Channels={props.Channels}
SelectedChannels={newEditAsset.Channels.filter((ch) =>
ch.ConnectionPriority === tabToPriority[tab] // Only channels with priority == current priority
ch.ConnectionPriority === parseInt(tab) // Only channels with priority == current priority
)}
UpdateChannels={(c) => {
const updatedChannels = [ // List of new channels
...c.map(ch => ({ ...ch, ConnectionPriority: tabToPriority[tab] })), // 1) updates new ch priority to current priority
...c.map(ch => ({ ...ch, ConnectionPriority: parseInt(tab) })), // 1) updates new ch priority to current priority
...newEditAsset.Channels.filter(ch => !c.some(d => d.ID === ch.ID)) // 2) adds back already selected channels (omits new)
];

const updatedAsset = { ...newEditAsset, Channels: updatedChannels };
setNewEditAsset(updatedAsset);

const globalChannels = props.Channels.map(ch => ({ // updates global chs if in new chs, updating connection priority
...ch, ConnectionPriority: c.some(d => d.ID === ch.ID) ? tabToPriority[tab] : ch.ConnectionPriority
...ch, ConnectionPriority: c.some(d => d.ID === ch.ID) ? parseInt(tab) : ch.ConnectionPriority
}));
props.UpdateChannels(globalChannels);
}}
/>
{/* {newEditAsset.AssetType != 'Transformer' && newEditAsset.AssetType != 'Breaker' ?
<ChannelSelector
Label="Associated Channels"
Channels={props.Channels}
SelectedChannels={newEditAsset.Channels}
UpdateChannels={(c) => {
setNewEditAsset((prev) => ({ ...prev, Channels: c }));
//Update Channels with new ConnectionPriority
let channels = _.clone(props.Channels);
channels = channels.map(ch => ({ ...ch, ConnectionPriority: c.find(d => d.ID == ch.ID) == null ? ch.ConnectionPriority : 0 }));
props.UpdateChannels(channels);
}
}
/>
: null}
{newEditAsset.AssetType == 'Breaker' ? <>
<TabSelector CurrentTab={tab} SetTab={(t: Tab) => setTab(t)} Tabs={TabGroupOne} />
{tab === 'default' ?
<ChannelSelector
Label=""
Channels={props.Channels}
SelectedChannels={newEditAsset.Channels.filter(ch => ch.ConnectionPriority == 0)}
UpdateChannels={(c) => {
let asset = _.clone(newEditAsset as OpenXDA.Types.Asset);
asset.Channels = _.uniqBy(c.map(ch => ({ ...ch, ConnectionPriority: 0 }))
.concat(newEditAsset.Channels.filter(ch => ch.ConnectionPriority == 1)), (ch) => ch.ID);
setNewEditAsset(asset);
//Update Channels with new ConnectionPriority
let channels = _.clone(props.Channels);
channels = channels.map(ch => ({ ...ch, ConnectionPriority: c.find(d => d.ID == ch.ID) == null ? ch.ConnectionPriority : 0 }));
props.UpdateChannels(channels);
}}
/>
: null}
{tab === 'line' ?
<ChannelSelector
Label=""
Channels={props.Channels}
SelectedChannels={newEditAsset.Channels.filter(ch => ch.ConnectionPriority == 1)}
UpdateChannels={(c) => {
let asset = _.clone(newEditAsset as OpenXDA.Types.Asset);
asset.Channels = _.uniqBy(c.map(ch => ({ ...ch, ConnectionPriority: 1 }))
.concat(newEditAsset.Channels.filter(ch => ch.ConnectionPriority == 0)), (ch) => ch.ID);
setNewEditAsset(asset);
//Update Channels with new ConnectionPriority
let channels = _.clone(props.Channels);
channels = channels.map(ch => ({ ...ch, ConnectionPriority: c.find(d => d.ID == ch.ID) == null ? ch.ConnectionPriority : 1 }));
props.UpdateChannels(channels);
}}
/>
: null}
</> : null}
{newEditAsset.AssetType === 'Transformer' ? <>
<TabSelector CurrentTab={tab} SetTab={(t: Tab) => setTab(t)} Tabs={TabGroupTwo} />
{tab === 'default' ?
<ChannelSelector
Label=""
Channels={props.Channels}
SelectedChannels={newEditAsset.Channels.filter(ch => ch.ConnectionPriority == 0)}
UpdateChannels={(c) => {
let asset = _.clone(newEditAsset as OpenXDA.Types.Asset);
asset.Channels = _.uniqBy(c.map(ch => ({ ...ch, ConnectionPriority: 0 }))
.concat(newEditAsset.Channels.filter(ch => ch.ConnectionPriority != 0)), (ch) => ch.ID);
setNewEditAsset(asset);
//Update Channels with new ConnectionPriority
let channels = _.clone(props.Channels);
channels = channels.map(ch => ({ ...ch, ConnectionPriority: c.find(d => d.ID == ch.ID) == null ? ch.ConnectionPriority : 0 }));
props.UpdateChannels(channels);
}}
/>
: null}
{tab === 'secondary' ?
<ChannelSelector
Label=""
Channels={props.Channels}
SelectedChannels={newEditAsset.Channels.filter(ch => ch.ConnectionPriority == 1)}
UpdateChannels={(c) => {
let asset = _.clone(newEditAsset as OpenXDA.Types.Asset);
asset.Channels = _.uniqBy(c.map(ch => ({ ...ch, ConnectionPriority: 1 }))
.concat(newEditAsset.Channels.filter(ch => ch.ConnectionPriority != 1)), (ch) => ch.ID);
setNewEditAsset(asset);
//Update Channels with new ConnectionPriority
let channels = _.clone(props.Channels);
channels = channels.map(ch => ({ ...ch, ConnectionPriority: c.find(d => d.ID == ch.ID) == null ? ch.ConnectionPriority : 1 }));
props.UpdateChannels(channels);
}}
/>
: null}
{tab === 'tertiary' ?
<ChannelSelector
Label=""
Channels={props.Channels}
SelectedChannels={newEditAsset.Channels.filter(ch => ch.ConnectionPriority == 2)}
UpdateChannels={(c) => {
let asset = _.clone(newEditAsset as OpenXDA.Types.Asset);
asset.Channels = _.uniqBy(c.map(ch => ({ ...ch, ConnectionPriority: 2 }))
.concat(newEditAsset.Channels.filter(ch => ch.ConnectionPriority != 2)), (ch) => ch.ID);
setNewEditAsset(asset);
//Update Channels with new ConnectionPriority
let channels = _.clone(props.Channels);
channels = channels.map(ch => ({ ...ch, ConnectionPriority: c.find(d => d.ID == ch.ID) == null ? ch.ConnectionPriority : 2}));
props.UpdateChannels(channels);
}}
/>
: null}
</>: null} */}
</div>
</div>
</div>
Expand Down

0 comments on commit f047dde

Please sign in to comment.