Saas improve step (#340)

Author: itai-codefresh

lib/interface/cli/commands/step/get.cmd.js

@@ -26,13 +26,34 @@ const command = new Command({
                 describe: 'Step name/id',
             })
             .option('name', {
-                describe: 'Filter steps by name',
+                describe: 'Filter by name pattern',
             })
-            .option('label', {
-                describe: 'Filter by a label',
-                alias: 'l',
+            .option('tag', {
+                describe: 'Filter by a tag',
+                alias: 't',
                 default: [],
             })
+            .option('category', {
+                describe: 'Filter by category',
+                alias: 'c',
+                default: [],
+            })
+            .option('stage', {
+                describe: 'Filter by stage',
+                choices: ['graduated', 'incubating'],
+            })
+            .option('official', {
+                describe: 'Filter only official steps',
+                boolean: true,
+            })
+            .option('public', {
+                describe: 'Filter only public steps',
+                boolean: true,
+            })
+            .option('private', {
+                describe: 'Filter only private steps',
+                boolean: true,
+            })
             .option('limit', {
                 describe: 'Limit amount of returned results',
                 default: DEFAULTS.GET_LIMIT_RESULTS,
@@ -46,7 +67,12 @@ const command = new Command({
         const { id: ids, name } = argv;
         const limit = argv.limit;
         const offset = (argv.page - 1) * limit;
-        const labels = prepareKeyValueFromCLIEnvOption(argv.label);
+        const isPublic = argv.public;
+        const isPrivate = argv.private;
+        const category = argv.category;
+        const stage = argv.stage;
+        const official = argv.official;
+        const tag = argv.tag;
 
         if (!_.isEmpty(ids)) {
             const steps = [];
@@ -73,7 +99,12 @@ const command = new Command({
                 limit,
                 offset,
                 id: name,
-                labels,
+                public: isPublic,
+                private: isPrivate,
+                category,
+                stage,
+                official,
+                tag,
             });
             Output.print(_.map(_.get(steps, 'docs'), Step.fromResponse));
         }

lib/logic/entities/Step.js

@@ -6,16 +6,19 @@ class Step extends Entity {
         super();
         this.entityType = 'step';
         this.info = data;
-        this.id = this.info.metadata.id;
         this.name = this.info.metadata.name;
+        this.visibility = this.info.metadata.isPublic ? 'public' : 'private';
+        this.official = this.info.metadata.official ? "true": "false";
+        this.category = this.info.metadata.categories;
+        this.stage = this.info.metadata.stage;
         this.created = this.info.metadata.created_at ? new Date(this.info.metadata.created_at) : undefined;
         this.updated = this.info.metadata.updated_at ? new Date(this.info.metadata.updated_at) : undefined;
-        this.defaultColumns = ['name', 'updated', 'created'];
-        this.wideColumns = ['id'].concat(this.defaultColumns);
+        this.defaultColumns = ['name', 'category', 'official', 'visibility', 'stage', 'updated', 'created'];
+        this.wideColumns = this.defaultColumns;
     }
 
     static fromResponse(response) {
-        return new Step(_.pick(response, 'id', 'version', 'kind', 'metadata', 'spec'));
+        return new Step(_.pick(response, 'version', 'kind', 'metadata', 'spec'));
     }
 }
 

openapi.json

@@ -5407,36 +5407,77 @@
         ],
         "parameters": [
           {
-            "name": "offset",
+            "name": "id",
             "in": "query",
             "schema": {
-              "type": "integer"
+              "type": "string"
             },
-            "description": "Offset"
+            "description": "Id or name"
           },
           {
-            "name": "id",
             "in": "query",
+            "name": "official",
             "schema": {
               "type": "string"
             },
-            "description": "Id"
+            "description": "Filter only official steps"
           },
           {
             "in": "query",
-            "name": "limit",
+            "name": "category",
             "schema": {
               "type": "string"
             },
-            "description": "Limit"
+            "description": "Filter by a specific category"
           },
           {
             "in": "query",
-            "name": "labels",
+            "name": "tag",
             "schema": {
               "type": "string"
             },
-            "description": "Labels"
+            "description": "Filter by a specific tag"
+          },
+          {
+            "in": "query",
+            "name": "public",
+            "schema": {
+              "type": "string"
+            },
+            "description": "Filter only public steps"
+          },
+          {
+            "in": "query",
+            "name": "private",
+            "schema": {
+              "type": "string"
+            },
+            "description": "Filter only private steps"
+          },
+          {
+            "in": "query",
+            "name": "stage",
+            "schema": {
+              "type": "string",
+              "enum": ["graduated", "incubating"]
+            },
+            "description": "Filter by stage"
+          },
+          {
+            "name": "offset",
+            "in": "query",
+            "schema": {
+              "type": "integer"
+            },
+            "description": "Offset"
+          },
+          {
+            "in": "query",
+            "name": "limit",
+            "schema": {
+              "type": "string"
+            },
+            "description": "Limit"
           }
         ],
         "operationId": "steps-list",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.21.1",
+  "version": "0.23.0",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,