Skip to content

Commit 43388fd

Browse files
authored
Manual cherrypick for PR-1426 (#1437)
* merge conflicts * Fixed merge conflicts * Removing merge conflict header
1 parent 20ac277 commit 43388fd

File tree

26 files changed

+234
-197
lines changed

26 files changed

+234
-197
lines changed

assemblies/assembly-configuring-the-quickstarts.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ include::modules/configuring-the-quickstarts/con-about-quickstarts.adoc[leveloff
77

88
include::modules/configuring-the-quickstarts/proc-customize-rhdh-quickstart.adoc[leveloffset=+1]
99

10-
include::modules/configuring-the-quickstarts/proc-starting-and-completing-modules-in-quickstarts.adoc[leveloffset=+1]
10+
include::modules/configuring-the-quickstarts/proc-disabling-rhdh-quickstart.adoc[leveloffset=+2]
11+
12+
include::modules/configuring-the-quickstarts/proc-starting-and-completing-modules-in-quickstarts.adoc[leveloffset=+1]

assemblies/assembly-customizing-the-appearance.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
[id="{context}"]
44
= Customizing {product} appearance
55

6+
By modifying the visual aspects of the interface, organizations can align {product} with their branding guidelines and improve the overall user experience.
7+
68
The following default theme configurations are available for {product}:
79

810
The {product} theme:: Default theme configurations to make your developer portal look like a standard {product} instance. For more information, see xref:ref-customize-rhdh-default-rhdh_{context}[]
911

1012
The Backstage theme:: Default theme configurations to make your developer portal look like a standard Backstage instance. For more information, see xref:ref-customize-rhdh-default-backstage_{context}[]
1113

12-
You can change or disable particular parameters in a default theme or create a fully customized theme by modifying the `app-config-rhdh.yaml` file. From the `app-config-rhdh.yaml` file, you can customize common theme components, including the following:
14+
You can change or disable particular parameters in a default theme or create a fully customized theme by modifying the `app-config-rhdh.yaml` file. From the `app-config-rhdh.yaml` file, you can customize common theme components, including the following components:
1315

1416
* Company name and logo
1517
* Font color, size, and style of text in paragraphs, headings, headers, and buttons

modules/configuring-a-floating-action-button/proc-configuring-floating-action-button-as-a-dynamic-plugin.adoc

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ To configure a floating action button as a dynamic plugin, complete any of the f
1313

1414
* Specify the `global.floatingactionbutton/config` mount point in your `app-config-dynamic.yaml` file. For example:
1515
+
16-
.Example of a bulk-import plugin as a floating action button
1716
[source,yaml]
1817
----
1918
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
@@ -25,10 +24,10 @@ To configure a floating action button as a dynamic plugin, complete any of the f
2524
# Start of the floating action button configuration
2625
mountPoints:
2726
- mountPoint: global.floatingactionbutton/config
28-
importName: BulkImportPage # <1>
27+
importName: BulkImportPage
2928
config:
3029
slot: 'page-end'
31-
icon: <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#e8eaed"><g><rect fill="none" height="24" width="24"/></g><g><path d="M11,7L9.6,8.4l2.6,2.6H2v2h10.2l-2.6,2.6L11,17l5-5L11,7z M20,19h-8v2h8c1.1,0,2-0.9,2-2V5c0-1.1-0.9-2-2-2h-8v2h8V19z"/></g></svg> # <2>
30+
icon: <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#e8eaed"><g><rect fill="none" height="24" width="24"/></g><g><path d="M11,7L9.6,8.4l2.6,2.6H2v2h10.2l-2.6,2.6L11,17l5-5L11,7z M20,19h-8v2h8c1.1,0,2-0.9,2-2V5c0-1.1-0.9-2-2-2h-8v2h8V19z"/></g></svg>
3231
label: 'Bulk import'
3332
toolTip: 'Register multiple repositories in bulk'
3433
to: /bulk-import/repositories
@@ -43,12 +42,11 @@ To configure a floating action button as a dynamic plugin, complete any of the f
4342
icon: bulkImportIcon
4443
text: Bulk import
4544
----
46-
<1> (Required) The import name with an associated component to the mount point.
47-
<2> Use the `svg` value to display a black BulkImportPage icon.
45+
`frontend:mountPoints:importName`:: (Required) The import name with an associated component to the mount point.
46+
`frontend:mountPoints:importName:icon`:: Use the `svg` value to display a black `BulkImportPage` icon.
4847
4948
* To configure an action as a floating action button that opens an external link, specify the `global.floatingactionbutton/config` mount point in your `dynamic-plugins.yaml` file within the `backstage-plugin-global-floating-action-button` plugin. For example:
5049
+
51-
.Example of a floating action button that opens GitHub
5250
[source,yaml]
5351
----
5452
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-floating-action-button
@@ -61,9 +59,9 @@ To configure a floating action button as a dynamic plugin, complete any of the f
6159
- mountPoint: application/listener
6260
importName: DynamicGlobalFloatingActionButton
6361
- mountPoint: global.floatingactionbutton/config
64-
importName: NullComponent # <1>
62+
importName: NullComponent
6563
config:
66-
icon: '<svg viewBox="0 0 250 300" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M200.134 0l55.555 117.514-55.555 117.518h-47.295l55.555-117.518L152.84 0h47.295zM110.08 99.836l20.056-38.092-2.29-8.868L102.847 0H55.552l48.647 102.898 5.881-3.062zm17.766 74.433l-17.333-39.034-6.314-3.101-48.647 102.898h47.295l25-52.88v-7.883z" fill="#40B4E5"/><path d="M152.842 235.032L97.287 117.514 152.842 0h47.295l-55.555 117.514 55.555 117.518h-47.295zm-97.287 0L0 117.514 55.555 0h47.296L47.295 117.514l55.556 117.518H55.555z" fill="#003764"/></svg>' # <2>
64+
icon: '<svg viewBox="0 0 250 300" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M200.134 0l55.555 117.514-55.555 117.518h-47.295l55.555-117.518L152.84 0h47.295zM110.08 99.836l20.056-38.092-2.29-8.868L102.847 0H55.552l48.647 102.898 5.881-3.062zm17.766 74.433l-17.333-39.034-6.314-3.101-48.647 102.898h47.295l25-52.88v-7.883z" fill="#40B4E5"/><path d="M152.842 235.032L97.287 117.514 152.842 0h47.295l-55.555 117.514 55.555 117.518h-47.295zm-97.287 0L0 117.514 55.555 0h47.296L47.295 117.514l55.556 117.518H55.555z" fill="#003764"/></svg>'
6765
label: 'Quay'
6866
showLabel: true
6967
toolTip: 'Quay'
@@ -76,12 +74,11 @@ To configure a floating action button as a dynamic plugin, complete any of the f
7674
toolTip: 'Github'
7775
to: https://github.com/redhat-developer/rhdh-plugins
7876
----
79-
<1> (Required) The import name with an associated component to the mount point.
80-
<2> Use the `svg` value to display the `Quay` icon.
77+
`frontend:mountPoints:importName`:: (Required) The import name with an associated component to the mount point.
78+
`frontend:mountPoints:importName:icon`:: Use the `svg` value to display the `Quay` icon.
8179
8280
* To configure a floating action button that contains a submenu, define the `global.floatingactionbutton/config` mount point in the same `slot` field in your `dynamic-plugins.yaml` file for multiple actions. The default slot is `page-end` when not specified. For example:
8381
+
84-
.Example of a floating action button with submenu actions
8582
[source,yaml]
8683
----
8784
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
@@ -93,7 +90,7 @@ To configure a floating action button as a dynamic plugin, complete any of the f
9390
# Start of fab config
9491
mountPoints:
9592
- mountPoint: global.floatingactionbutton/config
96-
importName: BulkImportPage # <1>
93+
importName: BulkImportPage
9794
config:
9895
slot: 'page-end'
9996
icon: <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#e8eaed"><g><rect fill="none" height="24" width="24"/></g><g><path d="M11,7L9.6,8.4l2.6,2.6H2v2h10.2l-2.6,2.6L11,17l5-5L11,7z M20,19h-8v2h8c1.1,0,2-0.9,2-2V5c0-1.1-0.9-2-2-2h-8v2h8V19z"/></g></svg>
@@ -121,26 +118,25 @@ To configure a floating action button as a dynamic plugin, complete any of the f
121118
- mountPoint: application/listener
122119
importName: DynamicGlobalFloatingActionButton
123120
- mountPoint: global.floatingactionbutton/config
124-
importName: NullComponent # <1>
121+
importName: NullComponent
125122
config:
126123
icon: github
127124
label: 'Git'
128125
toolTip: 'Github'
129126
to: https://github.com/redhat-developer/rhdh-plugins
130127
- mountPoint: global.floatingactionbutton/config
131-
importName: NullComponent # <1>
128+
importName: NullComponent
132129
config:
133130
icon: '<svg viewBox="0 0 250 300" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M200.134 0l55.555 117.514-55.555 117.518h-47.295l55.555-117.518L152.84 0h47.295zM110.08 99.836l20.056-38.092-2.29-8.868L102.847 0H55.552l48.647 102.898 5.881-3.062zm17.766 74.433l-17.333-39.034-6.314-3.101-48.647 102.898h47.295l25-52.88v-7.883z" fill="#40B4E5"/><path d="M152.842 235.032L97.287 117.514 152.842 0h47.295l-55.555 117.514 55.555 117.518h-47.295zm-97.287 0L0 117.514 55.555 0h47.296L47.295 117.514l55.556 117.518H55.555z" fill="#003764"/></svg>'
134131
label: 'Quay'
135132
showLabel: true
136133
toolTip: 'Quay'
137134
to: 'https://quay.io'
138135
----
139-
<1> (Required) The import name with an associated component to the mount point.
136+
`frontend:mountPoints:importName`:: (Required) The import name with an associated component to the mount point.
140137
141138
* To configure a floating action button to display only on specific pages, configure the `global.floatingactionbutton/config` mount point in the `backstage-plugin-global-floating-action-button` plugin and set the `visibleOnPaths` property as shown in the following example:
142139
+
143-
.Example of a floating action button to display specific pages
144140
[source,yaml]
145141
----
146142
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
@@ -171,11 +167,10 @@ To configure a floating action button as a dynamic plugin, complete any of the f
171167
icon: bulkImportIcon
172168
text: Bulk import
173169
----
174-
<1> (Required) The import name with an associated component to the mount point.
170+
`frontend:mountPoints:importName`:: (Required) The import name with an associated component to the mount point.
175171
176172
* To hide a floating action button on specific pages, configure the `global.floatingactionbutton/config` mount point in the `backstage-plugin-global-floating-action-button` plugin and set the `excludeOnPaths` property as shown in the following example:
177173
+
178-
.Example of a floating action button to hide specific pages
179174
[source,yaml]
180175
----
181176
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
@@ -206,4 +201,5 @@ To configure a floating action button as a dynamic plugin, complete any of the f
206201
icon: bulkImportIcon
207202
text: Bulk import
208203
----
209-
<1> (Required) The import name with an associated component to the mount point.
204+
`frontend:mountPoints:importName`:: (Required) The import name with an associated component to the mount point.
205+
`frontend:mountPoints:importName:icon`:: Use the `svg` value to display a black `BulkImportPage` icon.

modules/configuring-the-global-header/con-quicklinks-and-starred-items-in-global-header.adoc

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ The *Quicklinks* matrix, organized by sections (for example, Documentation or De
77

88
The default configuration includes the following components:
99

10-
*StarredDropdown*: Displays the *Starred Items* menu in the global header by default, as shown in the following configuration:
11-
10+
* *StarredDropdown*: Displays the *Starred Items* menu in the global header by default, as shown in the following configuration:
11+
+
1212
[source,yaml]
1313
----
1414
# Group: Global Header
@@ -19,8 +19,8 @@ The default configuration includes the following components:
1919
priority: 85
2020
----
2121

22-
*ApplicationLauncherDropdown*: Provides the *Quicklinks* matrix (application launcher) by default, as shown in the following configuration:
23-
22+
* *ApplicationLauncherDropdown*: Provides the *Quicklinks* matrix (application launcher) by default, as shown in the following configuration:
23+
+
2424
[source,yaml]
2525
----
2626
# Group: Global Header
@@ -31,8 +31,8 @@ The default configuration includes the following components:
3131
priority: 82
3232
----
3333

34-
*MenuItemLink entries*: Define sections, titles, icons, and links within the *Quicklinks* matrix. The default configuration includes links to the {product-short} documentation and an {product-very-short} Local, as shown in the following configurations:
35-
34+
* *MenuItemLink entries*: Define sections, titles, icons, and links within the *Quicklinks* matrix. The default configuration includes links to the {product-short} documentation and an {product-very-short} Local, as shown in the following configurations:
35+
+
3636
[source,yaml,subs="+attributes"]
3737
----
3838
- mountPoint: global.header/application-launcher
@@ -59,8 +59,4 @@ The default configuration includes the following components:
5959
[NOTE]
6060
====
6161
When upgrading from previous versions, the installer does not overwrite your existing `dynamic-plugins.yaml` configuration. If you had not configured *Starred Items* or *Quicklinks* previously, they remain disabled after the upgrade and must be manually enabled.
62-
====
63-
64-
65-
66-
62+
====

modules/configuring-the-global-header/proc-configuring-logo-in-the-global-header.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ This component supports the following props, which are provided through configur
1414

1515
. To display a custom company logo in the global header, update the configuration with a mount point for `CompanyLogo`:
1616
+
17-
.Example: Configuring company logo
1817
+
1918
[source,yaml,subs="+attributes,+quotes"]
2019
----
@@ -48,7 +47,6 @@ red-hat-developer-hub.backstage-plugin-global-header:
4847

4948
. (Optional) If you do not provide `logo` props to the `CompanyLogo` component, the component instead uses values defined under `app.branding` in your `{my-app-config-file}` file. You can configure the `CompanyLogo` as shown in the following configuration:
5049
+
51-
.Example: Fallback configuration
5250
+
5351
[source,yaml,subs="+attributes,+quotes"]
5452
----

modules/configuring-the-global-header/proc-customize-rhdh-global-header.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@
44
You can use the `red-hat-developer-hub.backstage-plugin-global-header` dynamic plugin to extend the global header with additional buttons and customize the order and position of icons and features. Additionally, you can create and integrate your custom dynamic header plugins using the mount points provided by this new header feature, allowing you to further tailor to suit your needs.
55
For more information about enabling dynamic plugins, see {installing-and-viewing-plugins-book-link}[{installing-and-viewing-plugins-book-title}].
66

7-
.Default global header configuration
8-
97
[source,yaml,subs="+attributes,+quotes"]
108
----
119
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-header
1210
disabled: false
1311
pluginConfig:
1412
app:
1513
sidebar:
16-
search: false <1>
17-
settings: false <2>
14+
search: false
15+
settings: false
1816
dynamicPlugins:
1917
frontend:
20-
default.main-menu-items: <3>
18+
default.main-menu-items:
2119
menuItems:
2220
default.create:
2321
title: ''
@@ -74,10 +72,12 @@ For more information about enabling dynamic plugins, see {installing-and-viewing
7472
config:
7573
priority: 10
7674
----
77-
<1> *search*: Hides the *Search* modal in the sidebar menu. Change it to `true` to display the *Search* modal in the sidebar.
78-
<2> *settings*: Hides the *Settings* button in the sidebar menu. Change it to `true` to display the *Settings* button in the sidebar.
79-
<3> `default.main-menu-items`: Hides the *Self-service* button from the sidebar menu. Remove this field to display the *Self-service* button in the sidebar.
80-
<4> *position*: Defines the position of the header. Options: `above-main-content` or `above-sidebar`.
75+
where:
76+
77+
*search*:: Hides the *Search* modal in the sidebar menu. Change it to `true` to display the *Search* modal in the sidebar.
78+
*settings*:: Hides the *Settings* button in the sidebar menu. Change it to `true` to display the *Settings* button in the sidebar.
79+
`default.main-menu-items`:: Hides the *Self-service* button from the sidebar menu. Remove this field to display the *Self-service* button in the sidebar.
80+
*position*:: Defines the position of the header. Options: `above-main-content` or `above-sidebar`.
8181

8282
To extend the functionality of the default global header, include any the following attributes in your global header entry:
8383

modules/configuring-the-global-header/proc-displaying-preferred-username-in-profile-drop-down.adoc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
You can display the preferred username in the global header profile drop-down list by configuring `spec.profile.displayName` in the user entity. When not configured, the application falls back to a `metadata.title`. If neither is configured, it defaults to a user-friendly name generated by the `useProfileInfo` hook.
55

66
.Procedure
7-
.Example when you configure `spec.profile.displayName`
87

8+
* When you configure `spec.profile.displayName`, use the following code:
9+
+
910
[source,yaml,subs="+attributes,+quotes"]
1011
----
1112
apiVersion: backstage.io/v1alpha1
@@ -22,8 +23,8 @@ spec:
2223
memberOf: [janus-authors]
2324
----
2425

25-
.Example when you do not configure `spec.profile.displayname` but configure `metadata.title`
26-
26+
* When you do not configure `spec.profile.displayname` but configure `metadata.title`, use the following code:
27+
+
2728
[source,yaml,subs="+attributes,+quotes"]
2829
----
2930
apiVersion: backstage.io/v1alpha1
@@ -37,8 +38,8 @@ spec:
3738
memberOf: [janus-authors]
3839
----
3940

40-
.Example when you do not configure the `spec.profile.displayname` and the `metadata.title`
41-
41+
* When you do not configure the `spec.profile.displayname` and the `metadata.title`, use the following code:
42+
+
4243
[source,yaml,subs="+attributes,+quotes"]
4344
----
4445
apiVersion: backstage.io/v1alpha1

modules/configuring-the-global-header/proc-enabling-logo-in-the-sidebar.adoc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ You can configure a logo in the sidebar of the {product} ({product-very-short}).
77

88
. To display the logo in the sidebar, set the value of the `app.sidebar.logo` parameter to `true` as shown in the following example:
99
+
10-
.Example: Enabling the logo in only the sidebar
11-
+
1210
[source,yaml,subs="+attributes,+quotes"]
1311
----
1412
app:
@@ -23,8 +21,6 @@ To display the logo in only the sidebar, remove the `CompanyLogo` component from
2321

2422
. To display the same logo in the sidebar for all themes, update the configuration as shown in the following configuration:
2523
+
26-
.Example: Configuring sidebar logo for all themes
27-
+
2824
[source,yaml,subs="+attributes,+quotes"]
2925
----
3026
app:
@@ -37,8 +33,6 @@ app:
3733

3834
. For theme-specific logos, you can configure the sidebar logo as shown in the following configuration:
3935
+
40-
.Example: Theme-specific logos
41-
+
4236
[source,yaml,subs="+attributes,+quotes"]
4337
----
4438
app:

modules/configuring-the-global-header/proc-mount-points.adoc

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ Controls the header position. Use `config.position` to set placement as either `
88

99
global.header/component::
1010
Configures header components. Use `config.priority` to set the order of components, and pass properties (including CSS styles) via `config.props`.
11+
12+
* *Self-service* button
1113
+
12-
.Example adding a *Self-service* button
1314
[source,yaml,subs="attributes,quotes"]
1415
----
1516
- mountPoint: global.header/component
@@ -21,8 +22,9 @@ Configures header components. Use `config.priority` to set the order of componen
2122
icon: add
2223
to: create
2324
----
25+
26+
* Spacer element
2427
+
25-
.Example adding a spacer element
2628
[source,yaml]
2729
----
2830
- mountPoint: global.header/component
@@ -32,8 +34,9 @@ Configures header components. Use `config.priority` to set the order of componen
3234
props:
3335
growFactor: 0
3436
----
37+
38+
* Divider element
3539
+
36-
.Example adding a divider element
3740
[source,yaml]
3841
----
3942
mountPoints:
@@ -45,8 +48,10 @@ mountPoints:
4548

4649
global.header/profile::
4750
Configures the profile dropdown list when the `ProfileDropdown` component is enabled.
51+
52+
53+
* Adding a settings link to the profile dropdown
4854
+
49-
.Example adding a settings link to the profile dropdown
5055
[source,yaml]
5156
----
5257
- mountPoint: global.header/profile
@@ -61,8 +66,9 @@ Configures the profile dropdown list when the `ProfileDropdown` component is ena
6166

6267
global.header/create::
6368
Configures the create dropdown list when the `CreateDropdown` component is enabled.
69+
70+
* Adding a section for registering a component
6471
+
65-
.Example adding a section for registering a component
6672
[source,yaml]
6773
----
6874
- mountPoint: global.header/create

0 commit comments

Comments
 (0)