Skip to content

Commit 41a326f

Browse files
authored
feat: New library sync icon [FC-0114] (#2739)
Updates the library sync icon with new states: error, broken, ready to sync and with overrides
1 parent b7dd670 commit 41a326f

15 files changed

Lines changed: 311 additions & 47 deletions

File tree

src/course-outline/card-header/TitleButton.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ const TitleButton = ({
4747
onClick={onTitleClick}
4848
title={title}
4949
>
50-
{prefixIcon}
50+
<div className="mr-2">
51+
{prefixIcon}
52+
</div>
5153
<span className={`${namePrefix}-card-title mb-0 truncate-1-line`}>
5254
{title}
5355
</span>

src/course-outline/card-header/TitleLink.tsx

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,23 @@ const TitleLink = ({
1414
namePrefix,
1515
prefixIcon,
1616
}: TitleLinkProps) => (
17-
<Button
18-
as={Link}
19-
variant="tertiary"
20-
data-testid={`${namePrefix}-card-header__title-link`}
21-
className="item-card-header__title-btn align-items-end"
22-
to={titleLink}
23-
title={title}
24-
>
25-
{prefixIcon}
26-
<span className={`${namePrefix}-card-title mb-0 truncate-1-line`}>
27-
{title}
28-
</span>
29-
</Button>
17+
<>
18+
<div className="mr-2">
19+
{prefixIcon}
20+
</div>
21+
<Button
22+
as={Link}
23+
variant="tertiary"
24+
data-testid={`${namePrefix}-card-header__title-link`}
25+
className="item-card-header__title-btn align-items-end"
26+
to={titleLink}
27+
title={title}
28+
>
29+
<span className={`${namePrefix}-card-title mb-0 truncate-1-line text-left`}>
30+
{title}
31+
</span>
32+
</Button>
33+
</>
3034
);
3135

3236
export default TitleLink;

src/course-outline/section-card/SectionCard.test.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ const section = {
7575
versionDeclined: null,
7676
errorMessage: null,
7777
downstreamCustomized: [] as string[],
78+
upstreamName: 'Upstream',
7879
},
7980
} satisfies Partial<XBlock> as XBlock;
8081

src/course-outline/section-card/SectionCard.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,13 @@ const SectionCard = ({
257257
isExpanded={isExpanded}
258258
onTitleClick={handleExpandContent}
259259
namePrefix={namePrefix}
260-
prefixIcon={<UpstreamInfoIcon upstreamInfo={upstreamInfo} />}
260+
prefixIcon={(
261+
<UpstreamInfoIcon
262+
upstreamInfo={upstreamInfo}
263+
size="md"
264+
openSyncModal={openSyncModal}
265+
/>
266+
)}
261267
/>
262268
);
263269

src/course-outline/subsection-card/SubsectionCard.test.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ const subsection: XBlock = {
7979
versionDeclined: null,
8080
errorMessage: null,
8181
downstreamCustomized: [] as string[],
82+
upstreamName: 'Upstream',
8283
},
8384
} satisfies Partial<XBlock> as XBlock;
8485

src/course-outline/subsection-card/SubsectionCard.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,13 @@ const SubsectionCard = ({
205205
isExpanded={isExpanded}
206206
onTitleClick={handleExpandContent}
207207
namePrefix={namePrefix}
208-
prefixIcon={<UpstreamInfoIcon upstreamInfo={upstreamInfo} />}
208+
prefixIcon={(
209+
<UpstreamInfoIcon
210+
upstreamInfo={upstreamInfo}
211+
size="sm"
212+
openSyncModal={openSyncModal}
213+
/>
214+
)}
209215
/>
210216
);
211217

src/course-outline/unit-card/UnitCard.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
font-weight: var(--pgn-typography-headings-font-weight);
1111
line-height: var(--pgn-typography-headings-line-height);
1212
color: var(--pgn-color-headings-base);
13+
align-self: center;
1314
}
1415
}

src/course-outline/unit-card/UnitCard.test.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ const unit = {
6969
versionDeclined: null,
7070
errorMessage: null,
7171
downstreamCustomized: [] as string[],
72+
upstreamName: 'Upstream',
7273
},
7374
} satisfies Partial<XBlock> as XBlock;
7475

src/course-outline/unit-card/UnitCard.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,13 @@ const UnitCard = ({
170170
title={displayName}
171171
titleLink={getTitleLink(id)}
172172
namePrefix={namePrefix}
173-
prefixIcon={<UpstreamInfoIcon upstreamInfo={upstreamInfo} size="sm" />}
173+
prefixIcon={(
174+
<UpstreamInfoIcon
175+
upstreamInfo={upstreamInfo}
176+
size="xs"
177+
openSyncModal={openSyncModal}
178+
/>
179+
)}
174180
/>
175181
);
176182

src/data/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export interface UpstreamChildrenInfo {
5757
export interface UpstreamInfo {
5858
readyToSync: boolean,
5959
upstreamRef: string,
60+
upstreamName: string,
6061
versionSynced: number,
6162
versionAvailable: number | null,
6263
versionDeclined: number | null,

0 commit comments

Comments
 (0)