From b2d63b3b16cf486a67df6f539a38b06f64585696 Mon Sep 17 00:00:00 2001 From: regexowl Date: Thu, 24 Apr 2025 13:38:42 +0200 Subject: [PATCH] Wizard: Handle expand based on complete pkg info Expanding rows can no longer be handled based on name only as different application streams share a name of a package. --- .../steps/Packages/Packages.tsx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Components/CreateImageWizard/steps/Packages/Packages.tsx b/src/Components/CreateImageWizard/steps/Packages/Packages.tsx index 9d0addf0..d6e83e8e 100644 --- a/src/Components/CreateImageWizard/steps/Packages/Packages.tsx +++ b/src/Components/CreateImageWizard/steps/Packages/Packages.tsx @@ -940,19 +940,19 @@ const Packages = () => { } }; - const initialExpandedPkgs: IBPackageWithRepositoryInfo['name'][] = []; + const initialExpandedPkgs: IBPackageWithRepositoryInfo[] = []; const [expandedPkgs, setExpandedPkgs] = useState(initialExpandedPkgs); const setPkgExpanded = ( - pkg: IBPackageWithRepositoryInfo['name'], + pkg: IBPackageWithRepositoryInfo, isExpanding: boolean ) => setExpandedPkgs((prevExpanded) => { - const otherExpandedPkgs = prevExpanded.filter((p) => p !== pkg); + const otherExpandedPkgs = prevExpanded.filter((p) => p.name !== pkg.name); return isExpanding ? [...otherExpandedPkgs, pkg] : otherExpandedPkgs; }); - const isPkgExpanded = (pkg: IBPackageWithRepositoryInfo['name']) => + const isPkgExpanded = (pkg: IBPackageWithRepositoryInfo) => expandedPkgs.includes(pkg); const initialExpandedGroups: GroupWithRepositoryInfo['name'][] = []; @@ -1148,15 +1148,14 @@ const Packages = () => { .map((pkg, rowIndex) => ( - setPkgExpanded(pkg.name, !isPkgExpanded(pkg.name)), + isExpanded: isPkgExpanded(pkg), + onToggle: () => setPkgExpanded(pkg, !isPkgExpanded(pkg)), expandId: `${pkg.name}-expandable`, }} /> @@ -1209,7 +1208,7 @@ const Packages = () => { )} - + {