refactor: Update template filter

api/templates/design.go

@@ -570,8 +570,9 @@ var TemplateRequest = Type("TemplateRequest", func() {
 
 var TemplatesRequest = Type("TemplatesRequest", func() {
 	Extend(RepositoryRequest)
-	Attribute("filter", String, "The 'filter' attribute specifies the category of templates to retrieve from the repository.", func() {
-		Enum("keboola.components", "keboola.data-apps")
+	Attribute("filter", String, func() {
+		Description("The 'filter' attribute specifies the category of templates to retrieve from the repository.")
+		Example("keboola.data-apps")
 	})
 })
 

internal/pkg/service/templates/api/openapi/openapi.yaml

@@ -516,9 +516,6 @@ paths:
                   description: The 'filter' attribute specifies the category of templates to retrieve from the repository.
                   required: false
                   type: string
-                  enum:
-                    - keboola.components
-                    - keboola.data-apps
                 - name: repository
                   in: path
                   description: Name of the template repository. Use "keboola" for default Keboola repository.

internal/pkg/service/templates/api/openapi/openapi3.yaml

@@ -977,9 +977,6 @@ paths:
                     type: string
                     description: The 'filter' attribute specifies the category of templates to retrieve from the repository.
                     example: keboola.data-apps
-                    enum:
-                        - keboola.components
-                        - keboola.data-apps
                   example: keboola.data-apps
                 - name: repository
                   in: path
@@ -4051,9 +4048,6 @@ components:
                     type: string
                     description: The 'filter' attribute specifies the category of templates to retrieve from the repository.
                     example: keboola.data-apps
-                    enum:
-                        - keboola.components
-                        - keboola.data-apps
                 repository:
                     type: string
                     description: Name of the template repository. Use "keboola" for default Keboola repository.

internal/pkg/service/templates/api/service/mapper.go

@@ -137,21 +137,9 @@ func TemplatesResponse(ctx context.Context, d dependencies.ProjectRequestScope,
 		}
 
 		if filterBy != nil && *filterBy != "" {
-			t, found := tmpl.DefaultVersion()
-			if !found {
-				continue
-			}
-
 			filterString := *filterBy
-			switch filterString {
-			case KeboolaDataApps:
-				if !slices.Contains(t.Components, filterString) {
-					continue
-				}
-			case KeboolaComponents:
-				if slices.Contains(t.Components, KeboolaDataApps) {
-					continue
-				}
+			if !slices.Contains(tmpl.Requirements.Components, filterString) {
+				continue
 			}
 		}
 

test/templates/api/repositories/template-list-filter/001-list-ok/expected-response.json

@@ -49,7 +49,6 @@
       ],
       "components": [
         "keboola.wr-%s",
-        "foo.bar",
         "keboola.data-apps"
       ],
       "versions": [
@@ -60,31 +59,6 @@
         }
       ]
     },
-    {
-      "id": "my-template-id-6",
-      "name": "My Template-snowflake-6",
-      "deprecated": false,
-      "author": {
-        "name": "Example Author",
-        "url": "https://example.com"
-      },
-      "description": "Full workflow to ...",
-      "defaultVersion": "1.2.3",
-      "categories": [
-        "Other"
-      ],
-      "components": [
-        "keboola.wr-%s",
-        "foo.bar"
-      ],
-      "versions": [
-        {
-          "version": "1.2.3",
-          "stable": false,
-          "description": ""
-        }
-      ]
-    },
     {
       "id": "my-template-id-7",
       "name": "My Template-snowflake-7",
@@ -100,8 +74,8 @@
       ],
       "components": [
         "keboola.wr-%s",
-        "foo.bar",
-        "keboola.data-apps"
+        "keboola.data-apps",
+        "keboola.wr-google-sheets"
       ],
       "versions": [
         {

test/templates/api/repositories/template-list-filter/002-list-ok-data-apps-only/expected-response.json

@@ -24,7 +24,6 @@
       ],
       "components": [
         "keboola.wr-%s",
-        "foo.bar",
         "keboola.data-apps"
       ],
       "versions": [
@@ -50,8 +49,8 @@
       ],
       "components": [
         "keboola.wr-%s",
-        "foo.bar",
-        "keboola.data-apps"
+        "keboola.data-apps",
+        "keboola.wr-google-sheets"
       ],
       "versions": [
         {

test/templates/api/repositories/template-list-filter/003-list-ok-components-only/expected-response.json → test/templates/api/repositories/template-list-filter/003-list-keboola-sheet-only/expected-response.json

@@ -10,8 +10,8 @@
   },
   "templates": [
     {
-      "id": "my-template-id-3",
-      "name": "My Template-snowflake-3",
+      "id": "my-template-id-7",
+      "name": "My Template-snowflake-7",
       "deprecated": false,
       "author": {
         "name": "Example Author",
@@ -24,32 +24,8 @@
       ],
       "components": [
         "keboola.wr-%s",
-        "foo.bar"
-      ],
-      "versions": [
-        {
-          "version": "1.2.3",
-          "stable": false,
-          "description": ""
-        }
-      ]
-    },
-    {
-      "id": "my-template-id-6",
-      "name": "My Template-snowflake-6",
-      "deprecated": false,
-      "author": {
-        "name": "Example Author",
-        "url": "https://example.com"
-      },
-      "description": "Full workflow to ...",
-      "defaultVersion": "1.2.3",
-      "categories": [
-        "Other"
-      ],
-      "components": [
-        "keboola.wr-%s",
-        "foo.bar"
+        "keboola.data-apps",
+        "keboola.wr-google-sheets"
       ],
       "versions": [
         {

test/templates/api/repositories/template-list-filter/003-list-ok-components-only/request.json → test/templates/api/repositories/template-list-filter/003-list-keboola-sheet-only/request.json

@@ -1,5 +1,5 @@
 {
-  "path": "/v1/repositories/keboola/templates?filter=keboola.components",
+  "path": "/v1/repositories/keboola/templates?filter=keboola.wr-google-sheets",
   "method": "GET",
   "headers": {
     "Content-Type": "application/json",

test/templates/api/repositories/template-list-filter/004-list-ok-wrong-id/expected-http-code

@@ -1 +1 @@
-400
+200

test/templates/api/repositories/template-list-filter/004-list-ok-wrong-id/expected-response.json

@@ -1,5 +1,12 @@
 {
-  "statusCode": 400,
-  "error": "templates.invalidEnumValue",
-  "message": "Value of filter must be one of \"keboola.components\", \"keboola.data-apps\" but got value \"312312\"."
+  "repository": {
+    "name": "keboola",
+    "url": "%s/test/templates/api/repositories/template-list-filter/repository",
+    "ref": "",
+    "author": {
+      "name": "Example Author",
+      "url": "https://example.com"
+    }
+  },
+  "templates": []
 }

test/templates/api/repositories/template-list-filter/repository/.keboola/repository.json

@@ -103,6 +103,9 @@
       "requirements": {
         "backends":[
           "bigquery"
+        ],
+        "components": [
+          "keboola.data-apps"
         ]
       },
       "versions": [
@@ -127,6 +130,9 @@
       "requirements": {
         "backends":[
           "snowflake"
+        ],
+        "components": [
+          "keboola.data-apps"
         ]
       },
       "versions": [
@@ -137,7 +143,6 @@
           "path": "v1",
           "components": [
             "<keboola.wr-snowflake>",
-            "foo.bar",
             "keboola.data-apps"
           ]
         }
@@ -151,6 +156,9 @@
       "requirements": {
         "backends":[
           "snowflake"
+        ],
+        "components": [
+          "<keboola.wr-snowflake>"
         ]
       },
       "versions": [
@@ -174,6 +182,10 @@
       "requirements": {
         "backends":[
           "snowflake"
+        ],
+        "components": [
+          "keboola.data-apps",
+          "keboola.wr-google-sheets"
         ]
       },
       "versions": [
@@ -184,8 +196,8 @@
           "path": "v1",
           "components": [
             "<keboola.wr-snowflake>",
-            "foo.bar",
-            "keboola.data-apps"
+            "keboola.data-apps",
+            "keboola.wr-google-sheets"
           ]
         }
       ]