Skip to content

Commit ce4ffa7

Browse files
authored
fix(global-header): update config.d.ts, update theme (#1027)
1 parent 2c9cb46 commit ce4ffa7

6 files changed

Lines changed: 24 additions & 11 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@red-hat-developer-hub/backstage-plugin-global-header': patch
3+
---
4+
5+
Update config.d.ts to expect the updated app-config schema

workspaces/global-header/packages/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"@mui/material": "5.17.1",
5252
"@red-hat-developer-hub/backstage-plugin-global-header": "workspace:^",
5353
"@red-hat-developer-hub/backstage-plugin-global-header-test": "workspace:^",
54-
"@red-hat-developer-hub/backstage-plugin-theme": "^0.9.0",
54+
"@red-hat-developer-hub/backstage-plugin-theme": "^0.9.1",
5555
"react": "^18.0.2",
5656
"react-dom": "^18.0.2",
5757
"react-router": "^6.3.0",

workspaces/global-header/packages/app/src/components/Root/Root.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ export const Root = ({ children = null }: PropsWithChildren<{}>) => {
121121
/>
122122
</div>
123123
<SidebarLayout
124+
id="rhdh-sidebar-layout"
124125
aboveMainContentHeaderHeight={0}
125126
aboveSidebarHeaderHeight={64}
126127
>

workspaces/global-header/plugins/global-header/config.d.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,17 @@ declare module '@backstage/config' {
2121
app?: {
2222
branding?: {
2323
/**
24-
* Base64 URI for the full logo
25-
* @visibility frontend
24+
* Base64 URI for the full logo. If the value is a string, it is used as the logo for both themes.
25+
* @deepVisibility frontend
2626
*/
27-
fullLogo?: string;
27+
fullLogo?:
28+
| string
29+
| {
30+
/** Base64 URI for the logo in light theme */
31+
light: string;
32+
/** Base64 URI for the logo in dark theme */
33+
dark: string;
34+
};
2835
};
2936
};
3037
}

workspaces/global-header/plugins/global-header/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"@backstage/plugin-search-common": "^1.2.18",
6969
"@backstage/test-utils": "^1.7.8",
7070
"@openshift/dynamic-plugin-sdk": "^5.0.1",
71-
"@red-hat-developer-hub/backstage-plugin-theme": "^0.9.0",
71+
"@red-hat-developer-hub/backstage-plugin-theme": "^0.9.1",
7272
"@testing-library/jest-dom": "^6.0.0",
7373
"@testing-library/react": "^14.0.0",
7474
"@testing-library/user-event": "^14.0.0",

workspaces/global-header/yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10938,7 +10938,7 @@ __metadata:
1093810938
"@mui/material": 5.17.1
1093910939
"@mui/styled-engine": 5.16.14
1094010940
"@openshift/dynamic-plugin-sdk": ^5.0.1
10941-
"@red-hat-developer-hub/backstage-plugin-theme": ^0.9.0
10941+
"@red-hat-developer-hub/backstage-plugin-theme": ^0.9.1
1094210942
"@scalprum/react-core": 0.9.5
1094310943
"@testing-library/jest-dom": ^6.0.0
1094410944
"@testing-library/react": ^14.0.0
@@ -10953,9 +10953,9 @@ __metadata:
1095310953
languageName: unknown
1095410954
linkType: soft
1095510955

10956-
"@red-hat-developer-hub/backstage-plugin-theme@npm:^0.9.0":
10957-
version: 0.9.0
10958-
resolution: "@red-hat-developer-hub/backstage-plugin-theme@npm:0.9.0"
10956+
"@red-hat-developer-hub/backstage-plugin-theme@npm:^0.9.1":
10957+
version: 0.9.1
10958+
resolution: "@red-hat-developer-hub/backstage-plugin-theme@npm:0.9.1"
1095910959
dependencies:
1096010960
"@mui/icons-material": ^5.17.1
1096110961
peerDependencies:
@@ -10965,7 +10965,7 @@ __metadata:
1096510965
"@mui/icons-material": ^5.17.1
1096610966
"@mui/material": ^5.0.0
1096710967
react: ^16.13.1 || ^17.0.0 || ^18.0.0
10968-
checksum: 365e81ba8af0fe38587e21bd842ede6eb6ee2d1590dbad26c3e5e6ca42c885b4e19de3cfc9435f43113f67960cf57c4614011596d4332def1bac93b9a6199860
10968+
checksum: 876923b59c7f7bd6cf56218004770dd5b9c34873ca0a04f7ae9b6b9cbe33214de9f867d27702045785bd865cdc7dee23277cb58711447b5859bd1dae1d4a66db
1096910969
languageName: node
1097010970
linkType: hard
1097110971

@@ -15850,7 +15850,7 @@ __metadata:
1585015850
"@playwright/test": 1.53.0
1585115851
"@red-hat-developer-hub/backstage-plugin-global-header": "workspace:^"
1585215852
"@red-hat-developer-hub/backstage-plugin-global-header-test": "workspace:^"
15853-
"@red-hat-developer-hub/backstage-plugin-theme": ^0.9.0
15853+
"@red-hat-developer-hub/backstage-plugin-theme": ^0.9.1
1585415854
"@testing-library/dom": ^9.0.0
1585515855
"@testing-library/jest-dom": ^6.0.0
1585615856
"@testing-library/react": ^14.0.0

0 commit comments

Comments
 (0)