Merge pull request #66 from nevermined-io/fix/remove_commits_manually

remove unapproved commits

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nevermined-io/cli",
-  "version": "0.5.1",
+  "version": "0.5.0",
   "main": "index.js",
   "repository": "[email protected]:nevermined-io/cli.git",
   "author": "Nevermined",

resources/commands.json

@@ -315,11 +315,6 @@
 					"type": "number",
 					"default": "1",
 					"description": "The page to show"
-				}, {
-					"name": "onlyMetadata",
-					"type": "boolean",
-					"default": false,
-					"description": "True if we only want to get metadata"
 				}]
 			}, {
 				"name": "download [did]",

src/cli.ts

@@ -116,9 +116,8 @@ const cmdHandler = async (
       logger
     )
     if (argv.json) {
-      logger.mark(executionOutput)
+      logger.mark(JSON.stringify(executionOutput))
     }
-
     if (executionOutput.status > 0) {
       logger.error(`Command error: ${executionOutput.errorMessage}`)
     }
@@ -199,4 +198,4 @@ commandsParser.commands.map((_cmd) => {
     })
   })
 })
-y.argv
+y.argv

src/commands/assets/searchAsset.ts

@@ -1,5 +1,4 @@
 import { Account, Nevermined } from '@nevermined-io/nevermined-sdk-js'
-import { ServiceMetadata } from '@nevermined-io/nevermined-sdk-js/dist/node/ddo/Service'
 import { StatusCodes, printSearchResult } from '../../utils'
 import chalk from 'chalk'
 import { Logger } from 'log4js'
@@ -13,31 +12,16 @@ export const searchAsset = async (
   config: ConfigEntry,
   logger: Logger
 ): Promise<ExecutionOutput> => {
-  const { verbose, network, query, json, onlyMetadata } = argv
+  const { verbose, network, query } = argv
 
   logger.info(chalk.dim(`Search using query: ${query}`))
 
-  const queryResults = await nvm.assets.search(query, argv.offset, argv.page)
-  let metadataResult
+  const assets = await nvm.assets.search(query, argv.offset, argv.page)
 
-  if (onlyMetadata) {
-    metadataResult =  {
-      page: queryResults.page,
-      totalPages: queryResults.page,
-      totalResults: queryResults.totalResults,
-      results: queryResults.results.map((ddo)=> {
-        const service: ServiceMetadata = ddo.findServiceByType('metadata') as ServiceMetadata
-        service.attributes.encryptedFiles = ""
-        return service      
-      })
-    }
-  }
-
-  if (!json)
-    printSearchResult(queryResults, logger)
+  printSearchResult(assets, logger)
 
   return {
     status: StatusCodes.OK,
-    results: onlyMetadata?JSON.stringify(metadataResult):JSON.stringify(queryResults)
+    results: JSON.stringify(assets)
   }
-}
+}