Skip to content

Commit

Permalink
Update parsed label to accept null as argument
Browse files Browse the repository at this point in the history
Signed-off-by: Ian Bolton <[email protected]>
  • Loading branch information
ibolton336 committed Feb 27, 2024
1 parent ef21a37 commit 033e878
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ export const CustomRules: React.FC = () => {
filteredItems?.forEach((item) => {
const { source, target, total } = parseRules(item);

const sourceLabelName = source ? getParsedLabel(source)?.labelValue : "";
const targetLabelName = target ? getParsedLabel(target)?.labelValue : "";
const sourceLabelName = getParsedLabel(source)?.labelValue ?? "";
const targetLabelName = getParsedLabel(target)?.labelValue ?? "";
const sourceTargetLabel = `${sourceLabelName} / ${targetLabelName}`;

rows.push({
Expand Down
11 changes: 10 additions & 1 deletion client/src/app/utils/rules-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,25 @@ interface ParsedLabel {
labelValue: string;
}

export const getParsedLabel = (label: string): ParsedLabel => {
export const getParsedLabel = (label: string | null): ParsedLabel => {
if (label === null) {
return {
labelType: "",
labelValue: "",
};
}

const char1 = label.indexOf("/") + 1;
const char2 = label.lastIndexOf("=");
const type = label.substring(char1, char2);
const value = label.split("=").pop();

return {
labelType: type || "",
labelValue: value || "",
};
};

export const getLabels = (labels: string[]) =>
labels.reduce(
(map: ILabelMap, label) => {
Expand Down

0 comments on commit 033e878

Please sign in to comment.