Merge branch 'master' into enhancement/component-logging-details

Author: Tharanishwaran

converter/k8s.go

@@ -19,6 +19,7 @@ func (k *K8sConverter) Convert(patternFile string) (string, error) {
 	}
 
 	patterns.ProcessAnnotations(pattern)
+	patterns.ProcessComponentStatus(pattern)
 	return NewK8sManifestsFromPatternfile(pattern)
 }
 

models/meshmodel/registry/v1beta1/component_filter.go

@@ -72,14 +72,12 @@ func (componentFilter *ComponentFilter) Get(db *database.Handler) ([]entity.Enti
 		Joins("JOIN category_dbs ON model_dbs.category_id = category_dbs.id").
 		Joins("JOIN connections ON connections.id = model_dbs.connection_id")
 
-	// TODO(@MUzairS15): Refactor this once Status is made a first class field in ComponentFilter
-	status := "enabled"
-
-	if componentFilter.Status != "" {
-		status = componentFilter.Status
-	}
-
-	finder = finder.Where("model_dbs.status = ?", status)
+	componentStatus := "enabled"
+    if componentFilter.Status != "" {
+        componentStatus = componentFilter.Status
+    }
+    finder = finder.Where("component_definition_dbs.status = ?", componentStatus)
+	
 	if componentFilter.Greedy {
 		if componentFilter.Name != "" && componentFilter.DisplayName != "" {
 			finder = finder.Where("component_definition_dbs.component->>'kind' LIKE ? OR display_name LIKE ?", "%"+componentFilter.Name+"%", componentFilter.DisplayName+"%")

models/patterns/pattern.go

@@ -47,3 +47,19 @@ func ProcessAnnotations(pattern *pattern.PatternFile) {
 	}
 	pattern.Components = components
 }
+
+func ProcessComponentStatus(pattern *pattern.PatternFile) {
+	components := []*component.ComponentDefinition{}
+
+	hasComponentStatus := func(component *component.ComponentDefinition) bool {
+		return component != nil && component.Status != nil
+	}
+
+	for _, component := range pattern.Components {
+		if hasComponentStatus(component) && string(*component.Status) == "ignored" {
+			continue
+		}
+		components = append(components, component)
+	}
+	pattern.Components = components
+}

registry/component.go

@@ -59,7 +59,7 @@ type ComponentCSV struct {
 func (c *ComponentCSV) CreateComponentDefinition(isModelPublished bool, defVersion string) (component.ComponentDefinition, error) {
 	status := entity.Enabled
 	if c.Status != "" {
-		if utils.ReplaceSpacesAndConvertToLowercase(c.Status) == "false" {
+		if utils.ReplaceSpacesAndConvertToLowercase(c.Status) == "ignored" {
 			status = entity.Ignored
 		}
 	}
@@ -95,7 +95,7 @@ var compStyleValues = []string{
 func (c *ComponentCSV) UpdateCompDefinition(compDef *component.ComponentDefinition) error {
 	status := entity.Enabled
 	if c.Status != "" {
-		if utils.ReplaceSpacesAndConvertToLowercase(c.Status) == "false" {
+		if utils.ReplaceSpacesAndConvertToLowercase(c.Status) == "ignored" {
 			status = entity.Ignored
 		}
 	}

utils/csv/csv.go

@@ -16,7 +16,7 @@ type CSV[E any] struct {
 	reader       *csv.Reader
 	filePath     string
 	lineForColNo int
-	// Stores the mapping for coumn name to golang equivalent attribute name.
+	// Stores the mapping for column name to golang equivalent attribute name.
 	// It is optional and default mapping is the lower case representation with spaces replaced with "_"
 	// eg: ColumnnName: Descritption, equivalent golang attribute to which it will be mapped during unmarshal "description".
 	columnToNameMapping map[string]string