Merge pull request #716 from SteveHNH/itless_widgets

Widgets for itless environment
RedHatInsights · Nov 12, 2024 · f806bc4 · f806bc4
2 parents b078fd1 + 3ddf227
commit f806bc4
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/rest/models/DashboardTemplate.go b/rest/models/DashboardTemplate.go
@@ -353,6 +353,7 @@ type ModuleFederationMetadata struct {
 	Scope      string               `json:"scope"`
 	Module     string               `json:"module"`
 	ImportName string               `json:"importName,omitempty"`
+	FeatureFlag string              `json:"featureFlag,omitempty"`
 	Defaults   BaseWidgetDimensions `json:"defaults"`
 	Config     WidgetConfiguration  `json:"config"`
 }

diff --git a/rest/routes/dashboardTemplate.go b/rest/routes/dashboardTemplate.go
@@ -9,6 +9,7 @@ import (
 	"github.com/RedHatInsights/chrome-service-backend/rest/models"
 	"github.com/RedHatInsights/chrome-service-backend/rest/service"
 	"github.com/RedHatInsights/chrome-service-backend/rest/util"
+	"github.com/RedHatInsights/chrome-service-backend/rest/featureflags"
 	"github.com/go-chi/chi/v5"
 	"github.com/sirupsen/logrus"
 	"gorm.io/gorm"
@@ -271,10 +272,32 @@ func DecodeDashboardTemplate(w http.ResponseWriter, r *http.Request) {
 	handleDashboardResponse[models.DashboardTemplate](resp, err, w)
 }
 
+
+// FilterWidgetMapping removes hidden widgets from the mapping by using feature flags stored with the widget definition.
+func FilterWidgetMapping(widgetMapping models.WidgetModuleFederationMapping) models.WidgetModuleFederationMapping {
+	for key, value := range widgetMapping {
+		if featureflags.IsEnabled(value.FeatureFlag) {
+			delete(widgetMapping, key)	
+		}
+	}
+
+	return widgetMapping
+}
+
 func GetWidgetMappings(w http.ResponseWriter, r *http.Request) {
 	var err error
-	resp := util.EntityResponse[models.WidgetModuleFederationMapping]{
-		Data: service.WidgetMapping,
+	var resp util.EntityResponse[models.WidgetModuleFederationMapping]
+
+	if featureflags.IsEnabled("chrome-service.filterWidgets.enable") {
+		filteredWidgetMapping := FilterWidgetMapping(service.WidgetMapping)
+
+		resp = util.EntityResponse[models.WidgetModuleFederationMapping]{
+			Data: filteredWidgetMapping,
+		}
+	} else {
+		resp = util.EntityResponse[models.WidgetModuleFederationMapping]{
+			Data: service.WidgetMapping,
+		}
 	}
 
 	handleDashboardResponse[models.WidgetModuleFederationMapping](resp, err, w)

diff --git a/rest/service/dashboardTemplate.go b/rest/service/dashboardTemplate.go
@@ -27,7 +27,7 @@ var (
 			Scope:    "landing",
 			Module:   "./ExploreCapabilities",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 3, 5, 10, 1),
-
+			FeatureFlag: "widget.exploreCapabilities.hidden",
 			Config: models.WidgetConfiguration{
 				Icon:  models.RocketIcon,
 				Title: "Explore capabilities",
@@ -37,6 +37,7 @@ var (
 			Scope:    "landing",
 			Module:   "./EdgeWidget",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 1, 4, 10, 1),
+			FeatureFlag: "widget.edge.hidden",
 			Config: models.WidgetConfiguration{
 				Icon:  models.EdgeIcon,
 				Title: "Edge Management",
@@ -46,6 +47,7 @@ var (
 			Scope:    "landing",
 			Module:   "./AnsibleWidget",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 1, 4, 10, 1),
+			FeatureFlag: "widget.ansible.hidden",
 			Config: models.WidgetConfiguration{
 				Icon:  models.AnsibleIcon,
 				Title: "Ansible Automation Platform",
@@ -55,6 +57,7 @@ var (
 			Scope:    "landing",
 			Module:   "./RhelWidget",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 1, 4, 10, 1),
+			FeatureFlag: "widget.rhel.hidden",
 			Config: models.WidgetConfiguration{
 				Icon:  models.RhelIcon,
 				Title: "Red Hat Enterprise Linux",
@@ -64,6 +67,7 @@ var (
 			Scope:    "landing",
 			Module:   "./OpenShiftWidget",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 1, 4, 10, 1),
+			FeatureFlag: "widget.openshift.hidden",
 			Config: models.WidgetConfiguration{
 				Icon:  models.OpenShiftIcon,
 				Title: "Red Hat OpenShift",
@@ -73,6 +77,7 @@ var (
 			Scope:    "landing",
 			Module:   "./QuayWidget",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 1, 4, 10, 1),
+			FeatureFlag: "widget.quay.hidden",
 			Config: models.WidgetConfiguration{
 				Icon:  models.QuayIcon,
 				Title: "Quay.io",
@@ -82,6 +87,7 @@ var (
 			Scope:    "landing",
 			Module:   "./AcsWidget",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 1, 4, 10, 1),
+			FeatureFlag: "widget.acs.hidden",
 			Config: models.WidgetConfiguration{
 				Icon:  models.ACSIcon,
 				Title: "Advanced Cluster Security",
@@ -91,6 +97,7 @@ var (
 			Scope:    "landing",
 			Module:   "./OpenShiftAiWidget",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 1, 4, 10, 1),
+			FeatureFlag: "widget.openshiftAI.hidden",
 			Config: models.WidgetConfiguration{
 				Icon:  models.OpenShiftAiIcon,
 				Title: "Red Hat OpenShift AI",
@@ -100,6 +107,7 @@ var (
 			Scope:    "landing",
 			Module:   "./RecentlyVisited",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 1, 7, 10, 1),
+			FeatureFlag: "widget.recentlyVisited.hidden",
 			Config: models.WidgetConfiguration{
 				Icon:  models.HistoryIcon,
 				Title: "Recently visited",
@@ -109,6 +117,7 @@ var (
 			Scope:    "chrome",
 			Module:   "./DashboardFavorites",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 1, 6, 10, 1),
+			FeatureFlag: "widget.favoriteServices.hidden",
 			Config: models.WidgetConfiguration{
 				HeaderLink: models.WidgetHeaderLink{
 					Title: "View all services",
@@ -122,6 +131,7 @@ var (
 			Scope:    "notifications",
 			Module:   "./DashboardWidget",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 1, 3, 10, 1),
+			FeatureFlag: "widget.notificationsEvents.hidden",
 			Config: models.WidgetConfiguration{
 				HeaderLink: models.WidgetHeaderLink{
 					Title: "View event log",
@@ -140,6 +150,7 @@ var (
 			Scope:    "learningResources",
 			Module:   "./BookmarkedLearningResourcesWidget",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 2, 4, 10, 1),
+			FeatureFlag: "widget.learningResources.hidden",
 			Config: models.WidgetConfiguration{
 				Icon:  models.OutlinedBookmarkIcon,
 				Title: "Bookmarked learning resources",
@@ -149,6 +160,7 @@ var (
 			Scope:    "landing",
 			Module:   "./SupportCaseWidget",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 2, 4, 10, 1),
+			FeatureFlag: "widget.supportCases.hidden",
 			Config: models.WidgetConfiguration{
 				HeaderLink: models.WidgetHeaderLink{
 					Title: "Open a support case",
@@ -162,6 +174,7 @@ var (
 			Scope:    "subscriptionInventory",
 			Module:   "./SubscriptionsWidget",
 			Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 4, 4, 10, 1),
+			FeatureFlag: "widget.subscriptions.hidden",
 			Config: models.WidgetConfiguration{
 				HeaderLink: models.WidgetHeaderLink{
 					Title: "Manage subscriptions",
@@ -190,6 +203,7 @@ var (
 		Scope:    "sources",
 		Module:   "./IntegrationsWidget",
 		Defaults: models.BaseWidgetDimensions.InitDimensions(models.BaseWidgetDimensions{}, 2, 4, 10, 1),
+		FeatureFlag: "widget.integrations.hidden",
 		Config: models.WidgetConfiguration{
 			HeaderLink: models.WidgetHeaderLink{
 				Title: "Explore integrations",