Skip to content

Commit 10abedf

Browse files
committed
fix(security): avoid gitleaks false positive on LayerTileRow family field
Gitleaks generic-api-key matches TypeScript members like \ amilyKey: October7thMergedFamilyKey\. Rename the discriminated-union field to \mergedFamily\ and update call sites.
1 parent 08168dc commit 10abedf

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/map/layers/layerNameUtils.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ describe("buildLayerTileRows", () => {
7474
const fam0 = rows[0]!;
7575
expect(fam0.kind).toBe("family");
7676
if (fam0.kind !== "family") throw new Error("expected family");
77-
expect(fam0.familyKey).toBe("ביזה");
77+
expect(fam0.mergedFamily).toBe("ביזה");
7878
expect(fam0.members.map((m) => m.id)).toEqual(["ביזה-אזור", "ביזה-נקודה"]);
7979
const fam1 = rows[1]!;
8080
expect(fam1.kind).toBe("family");
8181
if (fam1.kind !== "family") throw new Error("expected family");
82-
expect(fam1.familyKey).toBe("חדירה_לישוב");
82+
expect(fam1.mergedFamily).toBe("חדירה_לישוב");
8383
expect(fam1.members.map((m) => m.id)).toEqual(["חדירה_לישוב-אזור", "חדירה_לישוב-נקודה", "חדירה_לישוב-ציר"]);
8484
const fam2 = rows[2]!;
8585
expect(fam2.kind).toBe("family");
8686
if (fam2.kind !== "family") throw new Error("expected family");
87-
expect(fam2.familyKey).toBe("מאבק_וגבורה");
87+
expect(fam2.mergedFamily).toBe("מאבק_וגבורה");
8888
expect(fam2.members.map((m) => m.id)).toEqual(["מאבק_וגבורה_נקודה"]);
8989
});
9090
});

src/map/layers/layerNameUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export type LayerTileRow =
131131
| { kind: "layer"; layer: LayerManifestEntry; label: string }
132132
| {
133133
kind: "family";
134-
familyKey: October7thMergedFamilyKey;
134+
mergedFamily: October7thMergedFamilyKey;
135135
label: string;
136136
members: LayerManifestEntry[];
137137
};
@@ -155,7 +155,7 @@ export function buildLayerTileRows(packId: string, layers: LayerManifestEntry[])
155155
const members = october7thManifestMembersForFamilyKey(layers, fam);
156156
out.push({
157157
kind: "family",
158-
familyKey: fam,
158+
mergedFamily: fam,
159159
label: october7thMergedFamilyLabel(fam),
160160
members,
161161
});

src/pages/MapPage/LayerTilesGrid.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default function LayerTilesGrid({ rows, isLayerOn, onToggleLayer, onToggl
5858
? `השלם או בטל שכבות בקבוצה: ${row.label} (מצב חלקי)`
5959
: `הפעל קבוצת שכבות: ${row.label}`;
6060
return (
61-
<li key={`family:${row.familyKey}`} className="layer-tiles-grid__item">
61+
<li key={`family:${row.mergedFamily}`} className="layer-tiles-grid__item">
6262
<button
6363
type="button"
6464
className={

0 commit comments

Comments
 (0)