Skip to content

fix(desktop): align collection header controls #66

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

Merged
santosli merged 2 commits into from
Aug 30, 2026
Merged

fix(desktop): align collection header controls #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d18781
fix(desktop): align collection header controls
santosli Aug 29, 2026
6d7307d
test(core): satisfy current clippy lint
santosli Aug 29, 2026
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
19 changes: 18 additions & 1 deletion apps/desktop/src/cardLayout.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,12 +555,19 @@ test('collection review keeps child selection and collection type controls insid
/function CandidateReviewList\(\{(?<body>[\s\S]*?)\n\}\n\nfunction CollectionSelectionCheckbox/
)?.groups.body || '';
const collectionRule = css.match(/\.collectionReviewCard\s*\{(?<body>[^}]*)\}/s)?.groups.body || '';
const collectionHeaderRule = css.match(/\.collectionReviewHeader\s*\{(?<body>[^}]*)\}/s)?.groups.body || '';
const childRule = css.match(/\.collectionChildRow\s*\{(?<body>[^}]*)\}/s)?.groups.body || '';
const collectionActionsRule = css.match(/\.collectionReviewActions\s*\{(?<body>[^}]*)\}/s)?.groups.body || '';
const collectionTypeRule = css.match(/\.collectionReviewTypeAction\s*\{(?<body>[^}]*)\}/s)?.groups.body || '';
const collectionSelectionRule = css.match(
/\.collectionReviewSelectionAction\s*\{(?<body>[^}]*)\}/s
)?.groups.body || '';
const requiredCollectionTypeRule = css.match(
/\.collectionReviewTypeAction\.required\s*\{(?<body>[^}]*)\}/s
)?.groups.body || '';
const narrowCollectionRules = css.match(
/@media \(max-width: 920px\)\s*\{(?<body>[\s\S]*)\n\}/
)?.groups.body || '';

assert.match(collectionSource, /aria-controls={disclosureId}/);
assert.match(collectionSource, /collection\.children\.map/);
Expand Down Expand Up @@ -604,9 +611,19 @@ test('collection review keeps child selection and collection type controls insid
assert.match(collectionSource, /readOnlyLabel \?/);
assert.match(collectionSource, /relativePath/);
assert.match(collectionRule, /min-width:\s*0;/);
assert.match(collectionActionsRule, /display:\s*flex;/);
assert.match(collectionHeaderRule, /display:\s*grid;/);
assert.match(collectionHeaderRule, /grid-template-columns:\s*minmax\(0,\s*1fr\) minmax\(470px,\s*auto\);/);
assert.match(collectionHeaderRule, /align-items:\s*flex-start;/);
assert.match(collectionActionsRule, /display:\s*grid;/);
assert.match(collectionActionsRule, /width:\s*470px;/);
assert.match(collectionActionsRule, /grid-template-columns:\s*248px minmax\(0,\s*210px\);/);
assert.match(collectionActionsRule, /align-self:\s*start;/);
assert.match(collectionTypeRule, /width:\s*248px;/);
assert.match(collectionTypeRule, /box-sizing:\s*border-box;/);
assert.match(collectionSelectionRule, /grid-column:\s*2;/);
assert.match(collectionSelectionRule, /align-items:\s*flex-start;/);
assert.match(narrowCollectionRules, /\.collectionReviewActions\s*\{[^}]*grid-template-columns:\s*minmax\(0,\s*1fr\);/s);
assert.match(narrowCollectionRules, /\.collectionReviewSelectionAction\s*\{[^}]*grid-column:\s*1;/s);
assert.match(requiredCollectionTypeRule, /border-color:\s*var\(--skillbox-amber-border\);/);
assert.match(requiredCollectionTypeRule, /background:\s*var\(--skillbox-surface-orange\);/);
assert.match(css, /\.candidateCheck input:indeterminate \+ span/);
Expand Down
32 changes: 18 additions & 14 deletions apps/desktop/src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6290,10 +6290,10 @@ dd {
}

.collectionReviewHeader {
display: flex;
display: grid;
min-width: 0;
grid-template-columns: minmax(0, 1fr) minmax(470px, auto);
align-items: flex-start;
justify-content: space-between;
gap: 16px;
}

Expand Down Expand Up @@ -6330,10 +6330,13 @@ dd {
}

.collectionReviewActions {
display: flex;
flex: 0 0 auto;
align-items: flex-start;
justify-content: flex-end;
display: grid;
width: 470px;
max-width: 100%;
grid-template-columns: 248px minmax(0, 210px);
align-items: start;
align-self: start;
justify-content: end;
gap: 12px;
min-width: 0;
}
Expand Down Expand Up @@ -6390,9 +6393,12 @@ dd {

.collectionReviewSelectionAction {
display: flex;
grid-column: 2;
min-height: 38px;
align-items: center;
align-items: flex-start;
box-sizing: border-box;
gap: 8px;
padding: 8px 0;
}

.collectionReviewSelectAll {
Expand Down Expand Up @@ -7067,15 +7073,14 @@ dd {

@media (max-width: 1100px) {
.collectionReviewHeader {
align-items: stretch;
flex-direction: column;
grid-template-columns: minmax(0, 1fr);
gap: 10px;
}

.collectionReviewActions {
width: 100%;
align-items: flex-end;
justify-content: space-between;
grid-template-columns: 248px minmax(0, 210px);
justify-content: end;
}

.usageRankingControls {
Expand Down Expand Up @@ -7171,13 +7176,11 @@ dd {
}

.collectionReviewHeader {
flex-direction: column;
gap: 8px;
}

.collectionReviewActions {
align-items: stretch;
flex-direction: column;
grid-template-columns: minmax(0, 1fr);
justify-content: flex-end;
}

Expand All @@ -7186,6 +7189,7 @@ dd {
}

.collectionReviewSelectionAction {
grid-column: 1;
justify-content: flex-end;
}

Expand Down
54 changes: 29 additions & 25 deletions crates/skillbox-core/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,31 +1841,35 @@ fn mutation_lock_preserves_parent_and_symlink_resolution_before_creation() {
let executable = std::env::current_exe().unwrap();
for case in ["relative-parent", "symlink-parent"] {
let root = temp_dir(&format!("managed-root-resolution-{case}"));
let holder_cwd;
let contender_cwd;
let holder_arg;
let contender_arg;
let expected;
if case == "relative-parent" {
holder_cwd = root.join("holder");
contender_cwd = root.join("contender");
fs::create_dir_all(&holder_cwd).unwrap();
fs::create_dir_all(&contender_cwd).unwrap();
holder_arg = PathBuf::from("../SkillBox");
contender_arg = PathBuf::from("../SkillBox");
expected = root.join("SkillBox");
} else {
let real_parent = root.join("real");
holder_cwd = root.join("holder");
contender_cwd = root.join("contender");
fs::create_dir_all(real_parent.join("child")).unwrap();
fs::create_dir_all(&holder_cwd).unwrap();
fs::create_dir_all(&contender_cwd).unwrap();
std::os::unix::fs::symlink(real_parent.join("child"), root.join("alias")).unwrap();
holder_arg = root.join("alias/../SkillBox");
contender_arg = real_parent.join("SkillBox");
expected = real_parent.join("SkillBox");
}
let (holder_cwd, contender_cwd, holder_arg, contender_arg, expected) =
if case == "relative-parent" {
let holder_cwd = root.join("holder");
let contender_cwd = root.join("contender");
fs::create_dir_all(&holder_cwd).unwrap();
fs::create_dir_all(&contender_cwd).unwrap();
(
holder_cwd,
contender_cwd,
PathBuf::from("../SkillBox"),
PathBuf::from("../SkillBox"),
root.join("SkillBox"),
)
} else {
let real_parent = root.join("real");
let holder_cwd = root.join("holder");
let contender_cwd = root.join("contender");
fs::create_dir_all(real_parent.join("child")).unwrap();
fs::create_dir_all(&holder_cwd).unwrap();
fs::create_dir_all(&contender_cwd).unwrap();
std::os::unix::fs::symlink(real_parent.join("child"), root.join("alias")).unwrap();
(
holder_cwd,
contender_cwd,
root.join("alias/../SkillBox"),
real_parent.join("SkillBox"),
real_parent.join("SkillBox"),
)
};
let barrier = temp_dir(&format!("managed-root-resolution-barrier-{case}"));
let ready = barrier.join("ready");
let release = barrier.join("release");
Expand Down