@corva/create-app 0.62.0-1 → 0.62.0-3

package/lib/commands/rerun.js

@@ -20,6 +20,7 @@ export const rerunCommand = new Command('rerun')
   .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(new Option('--force-stream-log-type [string]', 'Force stream log type').choices(['time', 'depth']))
   .addOption(originalCwdOption)
   .action(async (dirName, options) => {
     await runFlow(RERUN_FLOW, { dirName: getRealWorkingDir(dirName, options), options });

package/lib/flows/lib/api.js

@@ -155,7 +155,7 @@ export class Api {
       .json();
 
     if (!wells || !wells.length) {
-      throw new StepError(`Could not found wells by asset ID - ${assetId}`);
+      throw new StepError(`Could not find wells by asset ID - ${assetId}`);
     }
 
     return wells;

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

@@ -58,6 +58,8 @@ const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest, cor
 
   const newConnection = await api.connectAppToStream(appId, stream.id, manifest.manifest.settings.app);
 
+  stream.app_connections.push(newConnection);
+
   logger.write(
     `\n\n${chalk.black.underline.bold(
       `Added app to the stream: ${corvaUrl}/config/streams/${stream.id} App: ${corvaUrl}/config/streams/${stream.id}/apps/${newConnection.id}, Asset ID: ${assetId}`,

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

@@ -11,12 +11,17 @@ export const PREPARE_WELL_AND_STREAM_TASK_STEP = {
    */
   fn: async (context) => {
     let { assets } = context;
-    const { api, manifest } = context;
+    const {
+      api,
+      manifest,
+      options: { forceStreamLogType },
+    } = context;
 
     const { mappedAssetsToWells, mappedAssetsToStreams, assetsToDelete } = await prepareWellAndStreamData(
       assets,
       api,
       manifest,
+      forceStreamLogType,
     );
 
     if (assetsToDelete.length) {
@@ -37,14 +42,17 @@ export const PREPARE_WELL_AND_STREAM_TASK_STEP = {
  *  CLI prompt question - Please choose the stream
  *
  * @param {object[]} streams
+ * @param {('time'|'depth')} [forceStreamLogType]
  *
  * @returns {Promise<object>}
  */
-const getStreamWithPrompt = async (streams) => {
-  const choices = streams.map((stream) => {
+const getStreamWithPrompt = async (streams, forceStreamLogType) => {
+  const _streams = forceStreamLogType ? streams.filter((stream) => stream.log_type === forceStreamLogType) : streams;
+
+  const choices = _streams.map((stream) => {
     return {
       value: stream,
-      name: stream.name,
+      name: `${stream.name} (${stream.log_type})`,
     };
   });
 
@@ -128,10 +136,11 @@ const getWellWithPrompt = async (wells, api) => {
  * @param {string[]} assets
  * @param {import('../lib/api').Api} api
  * @param {object} manifest
+ * @param {('time'|'depth')} [forceStreamLogType]
  *
  * @returns {Promise<object>}
  */
-const prepareWellAndStreamData = async (assets, api, manifest) => {
+const prepareWellAndStreamData = async (assets, api, manifest, forceStreamLogType) => {
   const mappedAssetsToWells = new Map();
   const mappedAssetsToStreams = new Map();
   const assetsToDelete = [];
@@ -155,7 +164,7 @@ const prepareWellAndStreamData = async (assets, api, manifest) => {
         throw new Error(`Could not found streams in Complete status for the asset ID - ${assetId}`);
       }
 
-      const stream = await getStreamWithPrompt(streams);
+      const stream = await getStreamWithPrompt(streams, forceStreamLogType);
 
       mappedAssetsToStreams.set(stream.asset_id, stream);
     } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/create-app",
-  "version": "0.62.0-1",
+  "version": "0.62.0-3",
   "private": false,
   "description": "Create an app to use it in CORVA.AI",
   "keywords": [
@@ -40,22 +40,21 @@
   },
   "dependencies": {
     "archiver": "^5.3.0",
-    "chalk": "4.1.0",
+    "chalk": "^4.1.0",
     "commander": "^9.1.0",
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.4",
     "dotenv": "^16.0.0",
-    "eslint-plugin-react": "^7.32.0",
     "figlet": "^1.5.0",
     "form-data": "^4.0.0",
-    "fs-extra": "9.0.1",
+    "fs-extra": "^9.0.1",
     "glob": "^8.0.1",
     "got": "^12.5.1",
     "inquirer": "^8.2.3",
     "is-glob": "^4.0.3",
     "lodash": "^4.17.21",
     "npm-api": "^1.0.0",
-    "semver": "7.3.2",
+    "semver": "^7.3.2",
     "terminal-link": "^3.0.0"
   },
   "devDependencies": {
@@ -80,6 +79,7 @@
     "eslint-plugin-jest": "^27.1.5",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.32.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-require-sort": "^1.3.0",
     "husky": "^8.0.2",