Merge pull request #72918 from mburke5678/ROSA-fix-custom-web

OCPBUGS30632: ROSA/OSD hide customizing the web console

Author: mburke5678

_topic_maps/_topic_map_osd.yml

@@ -205,10 +205,10 @@ Topics:
 # cannot patch resource "consoles", insufficient permissions to read any Cluster configuration
 #- Name: Configuring the web console
 #  File: configuring-web-console
-#  Distros: openshift-rosa
-- Name: Customizing the web console
-  File: customizing-the-web-console
-  Distros: openshift-dedicated
+#  Distros: openshift-dedicated
+#- Name: Customizing the web console
+#  File: customizing-the-web-console
+#  Distros: openshift-dedicated
 - Name: Dynamic plugins
   Dir: dynamic-plugin
   Distros: openshift-dedicated

_topic_maps/_topic_map_rosa.yml

@@ -390,9 +390,9 @@ Topics:
 #- Name: Configuring the web console
 #  File: configuring-web-console
 #  Distros: openshift-rosa
-- Name: Customizing the web console
-  File: customizing-the-web-console
-  Distros: openshift-rosa
+#- Name: Customizing the web console
+#  File: customizing-the-web-console
+#  Distros: openshift-rosa
 - Name: Dynamic plugins
   Dir: dynamic-plugin
   Distros: openshift-rosa

web_console/customizing-the-web-console.adoc

@@ -11,7 +11,10 @@ product name, links, notifications, and command line downloads. This is
 especially helpful if you need to tailor the web console to meet specific
 corporate or government requirements.
 
+// Hiding in ROSA/OSD, as Hive overwrites changes to console config
+ifndef::openshift-rosa,openshift-dedicated[]
 include::modules/adding-a-custom-logo.adoc[leveloffset=+1]
+endif::openshift-rosa,openshift-dedicated[]
 
 // Hiding in ROSA/OSD, as dedicated-admins cannot create resource "consolelinks"
 ifndef::openshift-rosa,openshift-dedicated[]
@@ -49,9 +52,15 @@ include::modules/odc-customizing-a-perspective-using-YAML-view.adoc[leveloffset=
 include::modules/odc-customizing-a-perspective-using-form-view.adoc[leveloffset=+2]
 endif::openshift-rosa,openshift-dedicated[]
 
+// Hiding in ROSA/OSD, as Hive overwrites changes to console config
+ifndef::openshift-rosa,openshift-dedicated[]
 include::modules/odc_con_customizing-a-developer-catalog-or-its-sub-catalogs.adoc[leveloffset=+1]
+endif::openshift-rosa,openshift-dedicated[]
 
+// Hiding in ROSA/OSD, as Hive overwrites changes to console config
+ifndef::openshift-rosa,openshift-dedicated[]
 include::modules/odc_customizing-a-developer-catalog-or-its-sub-catalogs-using-the-yaml-view.adoc[leveloffset=+2]
+endif::openshift-rosa,openshift-dedicated[]
 
 // Hiding in ROSA/OSD, as dedicated-admins do not have sufficient permissions to read any cluster configuration
 ifndef::openshift-rosa,openshift-dedicated[]