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

Fix: fix charging UI and bugs #75

Merged
merged 1 commit into from
Mar 5, 2024
Merged

Fix: fix charging UI and bugs #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions frontend/src/pages/Charging/ChargingList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ const ChargingList: React.FC<{

return (
<>
<TableCell>{chargingRecordMatch ? chargingRecordMatch.Usage : "-"}</TableCell>
<TableCell>
{chargingRecordMatch
? props.chargingMethod === "Online"
? chargingRecordMatch.QuotaLeft
: chargingRecordMatch.Usage
: "-"}
</TableCell>
<TableCell>{chargingRecordMatch ? chargingRecordMatch.TotalVol : "-"}</TableCell>
<TableCell>{chargingRecordMatch ? chargingRecordMatch.UlVol : "-"}</TableCell>
<TableCell>{chargingRecordMatch ? chargingRecordMatch.DlVol : "-"}</TableCell>
Expand Down Expand Up @@ -73,7 +79,7 @@ const ChargingList: React.FC<{
return (
<Table>
<TableHead>
<h3>Offline Charging</h3>
<h3>{props.chargingMethod} Charging</h3>
<TableRow>
{tableColumnNames.map((colName, idx) => {
return <TableCell key={idx}>{colName}</TableCell>;
Expand Down
28 changes: 26 additions & 2 deletions frontend/src/pages/SubscriberCreate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,11 +472,21 @@ export default function SubscriberCreate() {
}
};

const onDnnDelete = (index: number, dnn: string) => {
const onDnnDelete = (index: number, dnn: string, slice: string) => {
if (data.SessionManagementSubscriptionData !== undefined) {
delete data.SessionManagementSubscriptionData![index].dnnConfigurations![dnn];
setData({ ...data });
}
// Remove all flow-based charging rule in this DNN
if (data.ChargingDatas !== undefined) {
for (let i = 0; i < data.ChargingDatas!.length; i++) {
if (data.ChargingDatas![i].dnn === dnn && data.ChargingDatas![i].snssai === slice) {
data.ChargingDatas!.splice(i, 1);
i--;
}
}
}
setData({ ...data });
};

const onFlowRulesDelete = (dnn: string, flowKey: string, qosRef: number | undefined) => {
Expand Down Expand Up @@ -504,6 +514,14 @@ export default function SubscriberCreate() {
}
}
}
if (data.ChargingDatas !== undefined) {
for (let i = 0; i < data.ChargingDatas!.length; i++) {
if (data.ChargingDatas![i].qosRef === qosRef) {
data.ChargingDatas!.splice(i, 1);
i--;
}
}
}
setData({ ...data });
};

Expand Down Expand Up @@ -1722,7 +1740,13 @@ export default function SubscriberCreate() {
<Button
color="secondary"
variant="contained"
onClick={() => onDnnDelete(index, dnn)}
onClick={() =>
onDnnDelete(
index,
dnn,
toHex(row.singleNssai!.sst!) + row.singleNssai!.sd!,
)
}
sx={{
m: 2,
backgroundColor: "red",
Expand Down
Loading