@corva/create-app 0.45.0-0 → 0.45.0-1

package/lib/flows/lib/api.js

@@ -114,17 +114,24 @@ export class Api {
    *
    * @public
    *
-   * @param {string} status
+   * @param {string[]} statuses
+   * @param {number} companyId
    * @param {number} perPage
    *
    * @returns  {Promise<object[]>}
    */
-  async getAllAssets(status = 'active', perPage = 1000) {
-    const { data } = await this.#api
-      .get(`v2/assets`, {
-        searchParams: { status, per_page: perPage },
-      })
-      .json();
+  async getAllAssets(statuses = ['active'], companyId = null, perPage = 2000) {
+    const searchParams = [['per_page', perPage]];
+
+    if (companyId) {
+      searchParams.push(['company_id', companyId]);
+    }
+
+    if (statuses?.length) {
+      searchParams.push(...statuses.map((status) => ['status[]', status]));
+    }
+
+    const { data } = await this.#api.get(`v2/assets`, { searchParams: new URLSearchParams(searchParams) }).json();
 
     return data;
   }
@@ -145,7 +152,7 @@ export class Api {
       })
       .json();
 
-    if (!wells.length) {
+    if (!wells || !wells.length) {
       throw new Error(`Could not found wells by asset ID - ${assetId}`);
     }
 

package/lib/flows/steps/rerun/create-task.js

@@ -24,6 +24,8 @@ export const CREATE_TASK_STEP = {
       logger.write(`\n\n${chalk.yellow.bold('There is no asset ID to create a new task')}`);
     }
 
+    let i = 1;
+
     for (const assetId of assets) {
       const wellId = mappedAssetsToWells.get(parseInt(assetId)).id;
       const streamId = mappedAssetsToStreams.get(parseInt(assetId)).id;
@@ -48,7 +50,7 @@ export const CREATE_TASK_STEP = {
           });
 
         logger.write(
-          `\n    Created a new task with ID ${chalk.yellow(result.id)} for asset ID - ${chalk.green(assetId)}`,
+          `\n    ${i}. Created a new task with ID ${chalk.yellow(result.id)} for asset ID - ${chalk.green(assetId)}`,
         );
 
         logger.write(
@@ -56,6 +58,7 @@ export const CREATE_TASK_STEP = {
             CORVA_API_ENV === 'production' ? '.' : `.${CORVA_API_ENV}.`
           }corva.ai/dev-center/apps/${app.id}/runner`,
         );
+        i++;
       } catch (e) {
         logger.write(
           `\n\n${chalk.red.underline.bold(

package/lib/flows/steps/rerun/ensure-that-app-in-stream.js

@@ -45,7 +45,7 @@ const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest) =>
     return;
   }
 
-  const newConnection = await api.connectAppToStream(appId, stream.id, manifest.settings.app);
+  const newConnection = await api.connectAppToStream(appId, stream.id, manifest.manifest.settings.app);
 
   logger.write(
     `\n\n${chalk.black.underline.bold(

package/lib/flows/steps/rerun/get-app-version.js

@@ -72,9 +72,24 @@ const getAppVersion = async (appId, optionAppVersion, api) => {
 
   // if there are several versions, show versions list to user
   const choices = appPackages.map((appPackage) => {
+    const parts = [];
+    const { notes, label, version } = appPackage.attributes;
+
+    if (label) {
+      parts.push(label);
+    }
+
+    if (notes) {
+      parts.push(notes);
+    }
+
+    if (version) {
+      parts.push(version);
+    }
+
     return {
       value: appPackage.attributes.version,
-      name: appPackage.attributes.version,
+      name: parts.join(' '),
     };
   });
 

package/lib/flows/steps/rerun/prepare-data.js

@@ -4,13 +4,17 @@ import _ from 'lodash';
 import { logger } from '../../../helpers/logger.js';
 import { StepError } from '../../lib/step-error.js';
 
-const MAX_ASSET_IDS_COUNT = 10;
+const MAX_ASSET_IDS_COUNT = 300;
 
 export const PREPARE_DATA_TASK_STEP = {
   message: 'Preparing and checking data...',
   fn: async (context) => {
     const { manifest, options, api } = context;
-    let { assets, interval } = options;
+    let { assets, interval, companyId } = options;
+
+    if (companyId) {
+      assets = await getAssetsByCompanyId(companyId, api);
+    }
 
     assets = _.uniq(assets);
 
@@ -83,6 +87,24 @@ const promptAreYouSure = async () => {
   return answers.option;
 };
 
+/**
+ *  Get all suitable assets for rerun by company ID
+ *
+ * @param {number} comanyId
+ * @param {object} api
+ *
+ * @returns {number[]}
+ */
+const getAssetsByCompanyId = async (companyId, api) => {
+  logger.write('\n    Try to find all suitable assets by Company ID...');
+
+  const assets = await api.getAllAssets(['complete', 'idle', 'paused', 'unknown'], companyId);
+
+  logger.write(`\n\n Found ${chalk.yellow.bold(assets.length)} assets, for the company ID ${companyId}!`);
+
+  return assets.map((asset) => asset.id);
+};
+
 /**
  *  Check if current runs already exist
  *

package/lib/flows/steps/rerun/prepare-well-and-stream-data.js

@@ -151,7 +151,7 @@ const prepareWellAndStreamData = async (assets, api, manifest) => {
 
       const streams = await api.getStreamsByAssetIds([assetId], manifest.manifest.application.segments);
 
-      if (!streams.length) {
+      if (!streams || !streams.length) {
         throw new Error(`Could not found streams for asset ID - ${assetId}`);
       }
 

package/lib/main.js

@@ -226,7 +226,8 @@ export async function run() {
     .addOption(envOption)
     .addOption(silentOption)
     .addOption(appVersion)
-    .addOption(new Option('--assets [assets...]', 'Assets ids list', []))
+    .addOption(new Option('--assets [assets...]', 'Assets IDs list', []).conflicts('companyId'))
+    .addOption(new Option('--company-id [number]', 'Company ID', []))
     .addOption(new Option('--interval [number]', 'Interval for scheduler apps (exp. 1200)'))
     .addOption(originalCwdOption)
     .action(async (dirName, options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/create-app",
-  "version": "0.45.0-0",
+  "version": "0.45.0-1",
   "private": false,
   "description": "Create an app to use it in CORVA.AI",
   "keywords": [
@@ -57,6 +57,7 @@
     "terminal-link": "^3.0.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.11.0",
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-syntax-import-assertions": "^7.20.0",
     "@commitlint/cli": "^17.3.0",
@@ -64,9 +65,21 @@
     "@corva/eslint-config-browser": "^0.0.4",
     "@corva/eslint-config-node": "^5.0.0",
     "@types/cross-spawn": "^6.0.2",
+    "@typescript-eslint/eslint-plugin": "^5.42.1",
+    "@typescript-eslint/parser": "^5.42.1",
     "conventional-changelog-cli": "^2.1.0",
+    "eslint": "^8.2.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^27.1.5",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-require-sort": "^1.3.0",
     "husky": "^8.0.2",
-    "standard-version": "^9.0.0"
+    "prettier": "^2.0.0",
+    "prettier-plugin-packagejson": "^2.3.0",
+    "standard-version": "^9.0.0",
+    "typescript": "^4.8.4"
   },
   "engines": {
     "node": ">=16"