@corva/create-app 0.72.0-0 → 0.72.0-2

package/lib/commands/create.js

@@ -17,7 +17,7 @@ import { ensureBumpVersion, ensureLatestVersion } from '../helpers/cli-version.j
 import { logger } from '../helpers/logger.js';
 import { IS_WINDOWS, resolveAppRuntime } from '../helpers/resolve-app-runtime.js';
 import { tryGitCommit, tryGitInit } from '../helpers/versioning.js';
-import { copyFolderRecursiveSync, putVariablesInEnvFile } from '../helpers/utils.js';
+import { addUiAppFile, copyFolderRecursiveSync, getExcludedFiles, putVariablesInEnvFile } from '../helpers/utils.js';
 import { getDefaultsForPackageJson } from '../constants/package.js';
 import { getRealWorkingDir } from '../helpers/commands.js';
 import { Manifest } from '../flows/lib/manifest.js';
@@ -201,7 +201,9 @@ async function addTemplate(root, manifest, runtime, opts) {
 
   const templateFolder = join(cliRoot, 'templates', manifest.templateName, runtime.language);
 
-  copyFolderRecursiveSync(templateFolder, root);
+  const excludeFiles = getExcludedFiles(manifest);
+
+  copyFolderRecursiveSync(templateFolder, root, excludeFiles);
 
   if (manifest.isNode()) {
     copyFolderRecursiveSync(join(cliRoot, 'common', 'node'), root);
@@ -244,6 +246,10 @@ async function addTemplate(root, manifest, runtime, opts) {
     logger.log(chalk.red('Error: applying app extensions!'));
     logger.log(e);
   }
+
+  if (manifest.isUi()) {
+    addUiAppFile(templateFolder, root, runtime, manifest, opts);
+  }
 }
 
 /**

package/lib/flows/lib/api.js

@@ -246,6 +246,7 @@ export class Api {
       return {
         id: data.id,
         status: data.attributes.status,
+        isDeletedDueToLimit: data.attributes.deleted_due_to_limit,
       };
     } catch (e) {
       throw new StepError(`${JSON.parse(e.response.body).message || ''} \nPOST: ${uploadURL} failed.`, { cause: e });

package/lib/flows/steps/release/upload-zip-to-corva.js

@@ -1,8 +1,10 @@
 import FormData from 'form-data';
+import chalk from 'chalk';
 import { createReadStream } from 'node:fs';
 import { resolve } from 'node:path';
 import { RELEASE } from '../../../constants/messages.js';
 import { StepError } from '../../lib/step-error.js';
+import { logger } from '../../../helpers/logger.js';
 
 async function deleteAppPackage({ api, appId, appPkgVersion }) {
   const appPackages = await api.getAppPackages(appId);
@@ -34,7 +36,13 @@ export const UPLOAD_ZIP_TO_CORVA_STEP = {
 
       form.append('package', createReadStream(resolve(dirName, zipFileName)), 'package.zip');
 
-      const { id: packageId } = await api.uploadPackages(appKey, form);
+      const { id: packageId, isDeletedDueToLimit } = await api.uploadPackages(appKey, form);
+
+      if (isDeletedDueToLimit) {
+        logger.write(
+          `\n${chalk.yellow`NOTE`}: Version number limit reached. The oldest version without label was deleted.`,
+        );
+      }
 
       return { packageId };
     }

package/lib/helpers/utils.js

@@ -1,5 +1,29 @@
 import path, { join } from 'node:path';
 import fs from 'fs-extra';
+import chalk from 'chalk';
+import { logger } from './logger.js';
+
+export const addUiAppFile = (templateFolder, root, runtime, manifest, opts) => {
+  try {
+    logger.log(chalk.green('adding app file'));
+
+    const fileExtension = runtime.language === 'typescript' ? 'tsx' : 'js';
+    const segment = opts.segments === 'completion' ? 'completion' : 'drilling';
+    const appFilePath = join(templateFolder, 'src', `App.${segment}.${fileExtension}`);
+
+    copyFileSync(appFilePath, join(root, 'src', `App.${fileExtension}`));
+    logger.log(chalk.green('Done: adding app file!'));
+  } catch (e) {
+    logger.log(chalk.red('Error: adding app file!'));
+    logger.log(e);
+  }
+};
+
+export const getExcludedFiles = (manifest) => {
+  if (manifest.isUi()) return ['App.drilling.js', 'App.completion.js', 'App.drilling.tsx', 'App.completion.tsx'];
+
+  return [];
+};
 
 export function copyFileSync(source, target) {
   let targetFile = target;
@@ -18,7 +42,7 @@ export function copyFileSync(source, target) {
   fs.chmodSync(targetFile, targetMode);
 }
 
-export function copyFolderRecursiveSync(sourceFolder, targetFolder) {
+export function copyFolderRecursiveSync(sourceFolder, targetFolder, excludeFiles = []) {
   // check if folder needs to be created or integrated
   if (!fs.existsSync(targetFolder)) {
     fs.mkdirSync(targetFolder);
@@ -32,10 +56,12 @@ export function copyFolderRecursiveSync(sourceFolder, targetFolder) {
   const items = fs.readdirSync(sourceFolder);
 
   for (const item of items) {
+    if (excludeFiles.includes(item)) continue; // Skip the files in the exclude list
+
     const curSource = path.join(sourceFolder, item);
 
     if (fs.lstatSync(curSource).isDirectory()) {
-      copyFolderRecursiveSync(curSource, path.join(targetFolder, item));
+      copyFolderRecursiveSync(curSource, path.join(targetFolder, item), excludeFiles);
 
       continue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/create-app",
-  "version": "0.72.0-0",
+  "version": "0.72.0-2",
   "private": false,
   "description": "Create an app to use it in CORVA.AI",
   "keywords": [

package/templates/ui/javascript/config-overrides.js

@@ -4,7 +4,7 @@ const { merge } = require('webpack-merge');
 module.exports = (env, argv) => {
   return merge(
     getWebpackConfig(env, argv),
-    // NOTE: Custom webpack 4 plugins and module rules can be provided here
+    // NOTE: Custom webpack 5 plugins and module rules can be provided here
     {}
   );
 };

package/templates/ui/javascript/src/App.completion.js

@@ -0,0 +1,64 @@
+import { AppHeader } from '@corva/ui/components';
+
+import { DEFAULT_SETTINGS } from './constants';
+import logo from './assets/logo.svg';
+
+import styles from './App.css';
+
+/**
+ * @param {Object} props
+ * @param {boolean} props.isExampleCheckboxChecked
+ * @param {Object} props.appHeaderProps
+ * @param {Object} props.fracFleet
+ * @param {Object} props.well
+ * @param {Object[]} props.wells
+ * @returns
+ */
+function App({
+  appHeaderProps,
+  isExampleCheckboxChecked = DEFAULT_SETTINGS.isExampleCheckboxChecked,
+  fracFleet,
+  well,
+  wells,
+}) {
+  // NOTE: On general type dashboard app receives wells array
+  // on asset type dashboard app receives well object
+  const wellsList = wells || [well];
+
+  return (
+    <div className={styles.container}>
+      <AppHeader {...appHeaderProps} />
+      <div className={styles.content}>
+        <div>
+          <img src={logo} alt="logo" className={styles.logo} />
+          <p>
+            Edit <code>src/App.js</code> and save to reload.
+            <br />
+            <br />
+          </p>
+          <p>
+            Frac Fleet: {fracFleet?.name || 'No Frac Fleet'}
+            <br />
+            Wells: {wellsList.map(well => well.name).join(', ')}
+          </p>
+          <a
+            className="App-link"
+            href="https://reactjs.org"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Learn React
+          </a>
+        </div>
+        <div>
+          Settings &quot;Example&quot; checkbox is{' '}
+          {isExampleCheckboxChecked ? 'checked' : 'unchecked'}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+// Important: Do not change root component default export (App.js). Use it as container
+//  for your App. It's required to make build and zip scripts work as expected;
+export default App;

package/templates/ui/javascript/src/{App.js → App.drilling.js}

@@ -7,13 +7,17 @@ import styles from './App.css';
 
 /**
  * @param {Object} props
- * @param {boolean} props.isExampleCheckboxChecked
  * @param {Object} props.appHeaderProps
+ * @param {boolean} props.isExampleCheckboxChecked
+ * @param {Object} props.rig
+ * @param {Object} props.well
  * @returns
  */
 function App({
-  isExampleCheckboxChecked = DEFAULT_SETTINGS.isExampleCheckboxChecked,
   appHeaderProps,
+  isExampleCheckboxChecked = DEFAULT_SETTINGS.isExampleCheckboxChecked,
+  rig,
+  well,
 }) {
   return (
     <div className={styles.container}>
@@ -26,6 +30,11 @@ function App({
             <br />
             <br />
           </p>
+          <p>
+            Rig: {rig.name}
+            <br />
+            Well: {well.name}
+          </p>
           <a
             className="App-link"
             href="https://reactjs.org"

package/templates/ui/javascript/src/__mocks__/mockAppProps.js

@@ -577,4 +577,14 @@ export const mockAppProps = {
     type: 'general',
     pdfReportMode: false,
   },
+  // Completion segment app props
+  fracFleet: {
+    current_pad_id: 101,
+    id: 1002,
+    name: 'Magic Frac Fleet',
+  },
+  wells: [
+    { id: 1, name: 'Well 1' },
+    { id: 2, name: 'Well 2' },
+  ],
 };

package/templates/ui/typescript/config-overrides.js

@@ -4,7 +4,7 @@ const { merge } = require('webpack-merge');
 module.exports = (env, argv) => {
   return merge(
     getWebpackConfig(env, argv),
-    // NOTE: Custom webpack 4 plugins and module rules can be provided here
+    // NOTE: Custom webpack 5 plugins and module rules can be provided here
     {}
   );
 };

package/templates/ui/typescript/src/App.completion.tsx

@@ -0,0 +1,66 @@
+import { AppHeader } from '@corva/ui/components';
+
+import { DEFAULT_SETTINGS } from './constants';
+import logo from './assets/logo.svg';
+
+import styles from './App.css';
+
+type AppProps = {
+  appHeaderProps: {
+    [key: string]: any;
+    app: any;
+  };
+  isExampleCheckboxChecked?: boolean;
+  fracFleet?: { name: string };
+  well?: { name: string };
+  wells?: { name: string }[];
+};
+
+function App({
+  appHeaderProps,
+  isExampleCheckboxChecked = DEFAULT_SETTINGS.isExampleCheckboxChecked,
+  fracFleet,
+  well,
+  wells,
+}: AppProps): JSX.Element {
+  // NOTE: On general type dashboard app receives wells array
+  // on asset type dashboard app receives well object
+  const wellsList = wells || [well];
+
+  return (
+    <div className={styles.container}>
+      <AppHeader {...appHeaderProps} />
+      <div className={styles.content}>
+        <div>
+          <img src={logo} alt="logo" className={styles.logo} />
+          <p>
+            Edit <code>src/App.js</code> and save to reload.
+            <br />
+            <br />
+          </p>
+          <p>
+            Frac Fleet: {fracFleet?.name || 'No Frac Fleet'}
+            <br />
+            Wells: {wellsList.map(well => well.name).join(', ')}
+          </p>
+          <a
+            className="App-link"
+            href="https://reactjs.org"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Learn React
+          </a>
+        </div>
+        <div>
+          Settings &quot;Example&quot; checkbox is{' '}
+          {isExampleCheckboxChecked ? 'checked' : 'unchecked'}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+// Important: Do not change root component default export (App.js). Use it as container
+//  for your App. It's required to make build and zip scripts work as expected;
+export default App;

package/templates/ui/typescript/src/{App.tsx → App.drilling.tsx}

@@ -6,16 +6,20 @@ import logo from './assets/logo.svg';
 import styles from './App.css';
 
 type AppProps = {
-  isExampleCheckboxChecked?: boolean;
   appHeaderProps: {
     [key: string]: any;
     app: any;
   };
+  isExampleCheckboxChecked?: boolean;
+  rig: { name: string };
+  well: { name: string };
 };
 
 function App({
-  isExampleCheckboxChecked = DEFAULT_SETTINGS.isExampleCheckboxChecked,
   appHeaderProps,
+  isExampleCheckboxChecked = DEFAULT_SETTINGS.isExampleCheckboxChecked,
+  rig,
+  well,
 }: AppProps): JSX.Element {
   return (
     <div className={styles.container}>
@@ -28,6 +32,11 @@ function App({
             <br />
             <br />
           </p>
+          <p>
+            Rig: {rig.name}
+            <br />
+            Well: {well.name}
+          </p>
           <a
             className="App-link"
             href="https://reactjs.org"

package/templates/ui/typescript/src/__mocks__/mockAppProps.ts

@@ -577,4 +577,14 @@ export const mockAppProps = {
     type: 'general',
     pdfReportMode: false,
   },
+  // Completion segment app props
+  fracFleet: {
+    current_pad_id: 101,
+    id: 1002,
+    name: 'Magic Frac Fleet',
+  },
+  wells: [
+    { id: 1, name: 'Well 1' },
+    { id: 2, name: 'Well 2' },
+  ],
 };

package/templates/ui/javascript/.env

@@ -1,2 +0,0 @@
-HOST=app.local.corva.ai
-PORT=8080

package/templates/ui/javascript/.env.sample

@@ -1,5 +0,0 @@
-# You need to add: 127.0.0.1 app.local.corva.ai to /etc/hosts
-HOST=app.local.corva.ai
-
-# Single sign-on works ONLY with PORTS 8080, 9000 or 80.
-PORT=8080

package/templates/ui/typescript/.env

@@ -1,2 +0,0 @@
-HOST=app.local.corva.ai
-PORT=8080

package/templates/ui/typescript/.env.sample

@@ -1,5 +0,0 @@
-# You need to add: 127.0.0.1 app.local.corva.ai to /etc/hosts
-HOST=app.local.corva.ai
-
-# Single sign-on works ONLY with PORTS 8080, 9000 or 80.
-PORT=8080