Skip to content

fix(trustlab): handle internal and external org links dynamically via CMS #1492

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
kilemensi merged 8 commits into from
Jun 22, 2026
Merged

fix(trustlab): handle internal and external org links dynamically via CMS #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b85d53d
feat(trustlab): add includeLink toggle and update linkGroup on Organi…
kilemensi Jun 22, 2026
341963e
refactor(trustlab): resolve org links from per-org link fields instea…
kilemensi Jun 22, 2026
6abbfa4
fix(trustlab): remove redundant blockify call from pagifyOpportunities
kilemensi Jun 22, 2026
c46b603
fix(trustlab): remove hardcoded target=_blank from org chip links
kilemensi Jun 22, 2026
c48b46d
Add missing `required:true` to `includeLink` field
kilemensi Jun 22, 2026
3796fbc
fix(trustlab): make org linkGroup optional when includeLink is unchecked
kilemensi Jun 22, 2026
0102ff7
fix(trustlab): update payload-types
kilemensi Jun 22, 2026
ae28aaf
Bump trustlab version: 0.0.21 → 0.0.22
kilemensi Jun 22, 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
2 changes: 1 addition & 1 deletion apps/trustlab/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "trustlab",
"version": "0.0.21",
"version": "0.0.22",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
138 changes: 128 additions & 10 deletions apps/trustlab/payload-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,14 @@ export interface Page {
};
[k: string]: unknown;
};
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
card: {
title: string;
cardType?: ("items" | "richtext") | null;
Expand Down Expand Up @@ -1109,6 +1117,14 @@ export interface Page {
};
[k: string]: unknown;
} | null;
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
opportunityType: "incubator" | "intelligence-briefing" | "baraza";
hasFilters?: boolean | null;
filterByLabel?: string | null;
Expand Down Expand Up @@ -1347,7 +1363,7 @@ export interface Page {
subtitle?: string | null;
variant: "chip" | "card";
/**
* Select organizations to display in this list
* Select organisations to display in this list
*/
organizations?: (string | Organisation)[] | null;
/**
Expand Down Expand Up @@ -1687,6 +1703,14 @@ export interface Page {
};
[k: string]: unknown;
};
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
image: string | Media;
/**
* Logo or signature image displayed below the description
Expand Down Expand Up @@ -2104,6 +2128,14 @@ export interface Post {
};
[k: string]: unknown;
};
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
card: {
title: string;
cardType?: ("items" | "richtext") | null;
Expand Down Expand Up @@ -2720,6 +2752,14 @@ export interface Post {
};
[k: string]: unknown;
} | null;
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
opportunityType: "incubator" | "intelligence-briefing" | "baraza";
hasFilters?: boolean | null;
filterByLabel?: string | null;
Expand Down Expand Up @@ -2958,7 +2998,7 @@ export interface Post {
subtitle?: string | null;
variant: "chip" | "card";
/**
* Select organizations to display in this list
* Select organisations to display in this list
*/
organizations?: (string | Organisation)[] | null;
/**
Expand Down Expand Up @@ -3298,6 +3338,14 @@ export interface Post {
};
[k: string]: unknown;
};
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
image: string | Media;
/**
* Logo or signature image displayed below the description
Expand Down Expand Up @@ -3468,16 +3516,15 @@ export interface Organisation {
[k: string]: unknown;
} | null;
image?: (string | null) | Media;
link: {
label: string;
includeLink: boolean;
link?: {
linkType?: ("custom" | "internal") | null;
doc?: {
relationTo: "pages";
value: string | Page;
} | null;
url?: string | null;
href: string;
newTab?: boolean | null;
};
blocks?:
| (
Expand Down Expand Up @@ -3707,6 +3754,14 @@ export interface Organisation {
};
[k: string]: unknown;
};
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
card: {
title: string;
cardType?: ("items" | "richtext") | null;
Expand Down Expand Up @@ -4326,6 +4381,14 @@ export interface Organisation {
};
[k: string]: unknown;
} | null;
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
opportunityType: "incubator" | "intelligence-briefing" | "baraza";
hasFilters?: boolean | null;
filterByLabel?: string | null;
Expand Down Expand Up @@ -4564,7 +4627,7 @@ export interface Organisation {
subtitle?: string | null;
variant: "chip" | "card";
/**
* Select organizations to display in this list
* Select organisations to display in this list
*/
organizations?: (string | Organisation)[] | null;
/**
Expand Down Expand Up @@ -4904,6 +4967,14 @@ export interface Organisation {
};
[k: string]: unknown;
};
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
image: string | Media;
/**
* Logo or signature image displayed below the description
Expand Down Expand Up @@ -5012,7 +5083,7 @@ export interface Organisation {
}
)[]
| null;
slug?: string | null;
slug: string;
updatedAt: string;
createdAt: string;
}
Expand Down Expand Up @@ -5439,6 +5510,14 @@ export interface Opportunity {
};
[k: string]: unknown;
};
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
card: {
title: string;
cardType?: ("items" | "richtext") | null;
Expand Down Expand Up @@ -6058,6 +6137,14 @@ export interface Opportunity {
};
[k: string]: unknown;
} | null;
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
opportunityType: "incubator" | "intelligence-briefing" | "baraza";
hasFilters?: boolean | null;
filterByLabel?: string | null;
Expand Down Expand Up @@ -6296,7 +6383,7 @@ export interface Opportunity {
subtitle?: string | null;
variant: "chip" | "card";
/**
* Select organizations to display in this list
* Select organisations to display in this list
*/
organizations?: (string | Organisation)[] | null;
/**
Expand Down Expand Up @@ -6636,6 +6723,14 @@ export interface Opportunity {
};
[k: string]: unknown;
};
/**
* Background color in hex format
*/
backgroundColor: string;
/**
* Text color in hex format
*/
textColor: string;
image: string | Media;
/**
* Logo or signature image displayed below the description
Expand Down Expand Up @@ -7061,6 +7156,8 @@ export interface PagesSelect<T extends boolean = true> {
| {
title?: T;
content?: T;
backgroundColor?: T;
textColor?: T;
card?:
| T
| {
Expand Down Expand Up @@ -7356,6 +7453,8 @@ export interface PagesSelect<T extends boolean = true> {
| {
title?: T;
description?: T;
backgroundColor?: T;
textColor?: T;
opportunityType?: T;
hasFilters?: T;
filterByLabel?: T;
Expand Down Expand Up @@ -7672,6 +7771,8 @@ export interface PagesSelect<T extends boolean = true> {
| {
title?: T;
description?: T;
backgroundColor?: T;
textColor?: T;
image?: T;
signatureIcon?: T;
id?: T;
Expand Down Expand Up @@ -7837,6 +7938,8 @@ export interface PostsSelect<T extends boolean = true> {
| {
title?: T;
content?: T;
backgroundColor?: T;
textColor?: T;
card?:
| T
| {
Expand Down Expand Up @@ -8132,6 +8235,8 @@ export interface PostsSelect<T extends boolean = true> {
| {
title?: T;
description?: T;
backgroundColor?: T;
textColor?: T;
opportunityType?: T;
hasFilters?: T;
filterByLabel?: T;
Expand Down Expand Up @@ -8448,6 +8553,8 @@ export interface PostsSelect<T extends boolean = true> {
| {
title?: T;
description?: T;
backgroundColor?: T;
textColor?: T;
image?: T;
signatureIcon?: T;
id?: T;
Expand Down Expand Up @@ -8576,15 +8683,14 @@ export interface OrganisationsSelect<T extends boolean = true> {
name?: T;
description?: T;
image?: T;
includeLink?: T;
link?:
| T
| {
label?: T;
linkType?: T;
doc?: T;
url?: T;
href?: T;
newTab?: T;
};
blocks?:
| T
Expand Down Expand Up @@ -8676,6 +8782,8 @@ export interface OrganisationsSelect<T extends boolean = true> {
| {
title?: T;
content?: T;
backgroundColor?: T;
textColor?: T;
card?:
| T
| {
Expand Down Expand Up @@ -8971,6 +9079,8 @@ export interface OrganisationsSelect<T extends boolean = true> {
| {
title?: T;
description?: T;
backgroundColor?: T;
textColor?: T;
opportunityType?: T;
hasFilters?: T;
filterByLabel?: T;
Expand Down Expand Up @@ -9287,6 +9397,8 @@ export interface OrganisationsSelect<T extends boolean = true> {
| {
title?: T;
description?: T;
backgroundColor?: T;
textColor?: T;
image?: T;
signatureIcon?: T;
id?: T;
Expand Down Expand Up @@ -9541,6 +9653,8 @@ export interface OpportunitiesSelect<T extends boolean = true> {
| {
title?: T;
content?: T;
backgroundColor?: T;
textColor?: T;
card?:
| T
| {
Expand Down Expand Up @@ -9836,6 +9950,8 @@ export interface OpportunitiesSelect<T extends boolean = true> {
| {
title?: T;
description?: T;
backgroundColor?: T;
textColor?: T;
opportunityType?: T;
hasFilters?: T;
filterByLabel?: T;
Expand Down Expand Up @@ -10152,6 +10268,8 @@ export interface OpportunitiesSelect<T extends boolean = true> {
| {
title?: T;
description?: T;
backgroundColor?: T;
textColor?: T;
image?: T;
signatureIcon?: T;
id?: T;
Expand Down
Loading