@pega/custom-dx-components 23.1.11 → 23.1.13

package/src/tasks/publish-all/index.js

@@ -16,8 +16,8 @@ import {
 
 export function getCustomTasks(componentKey, sourceMap, devBuild, content, options) {
   const sDevBuild = devBuild ? '(dev build)' : '';
-  // eslint-disable-next-line no-unneeded-ternary
-  const doFetch = options.params.length >= 7 ? false : true;
+  // eslint-disable no-unneeded-ternary,no-nested-ternary
+  const doFetch = options.params.length >= 7 ? (options.params[6] === 'noFetch' ? false : true) : true;
   return new Listr(
     [
       {
@@ -26,13 +26,6 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
           await validate(componentKey);
         }
       },
-      {
-        title: `Bundle Component ${sDevBuild}`,
-        task: async () => {
-          await bundleComponent(componentKey, sourceMap, devBuild);
-        },
-        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
-      },
       {
         title: 'Lint component',
         task: async () => {
@@ -41,6 +34,13 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
           await lintComponent(targetDirectory);
         }
       },
+      {
+        title: `Bundle Component ${sDevBuild}`,
+        task: async () => {
+          await bundleComponent(componentKey, sourceMap, devBuild);
+        },
+        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
+      },
       {
         title: 'Zip Component',
         task: async () => {
@@ -55,9 +55,7 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
         }
       }
     ],
-    {
-      exitOnError: true
-    }
+    { concurrent: false, exitOnError: true }
   );
 }
 
@@ -76,7 +74,7 @@ export default async options => {
   let devBuild;
   let content;
 
-  if (options.params.length >= 7) {
+  if (options.params.length >= 6) {
     const rulesetName = options.params[3];
     const rulesetVersion = options.params[4];
     const dBuild = options.params[5];
@@ -94,16 +92,17 @@ export default async options => {
   }
 
   // eslint-disable-next-line no-shadow
-  for (const componentKey of components) {
+  for await (const componentKey of components) {
     console.log(chalk.bold.green(`Publishing: ${componentKey}`));
 
     const myCustomTasks = getCustomTasks(componentKey, sourceMap, devBuild, content, options);
 
-    // eslint-disable-next-line no-await-in-loop
-    await myCustomTasks.run().catch(err => {
+    try {
+      await myCustomTasks.run();
+    } catch (err) {
       console.log(chalk.bold.red(err.toString()));
       process.exit(1);
-    });
+    }
   }
 
   // once done, remove leftover directories

package/src/tasks/revert-webpack/index.js

@@ -8,7 +8,8 @@ import { up } from 'inquirer/lib/utils/readline.js';
 
 import {
   convertIntoPascalCase,
-  showVersion
+  showVersion,
+  updateUseWebPackPromotion
 } from '../../util.js';
 import {
   WEBPACK_CONFIG_JS_FILENAME,
@@ -33,37 +34,17 @@ export const renamePromotedWebPack = async () => {
     process.exit();
   }
 
+  console.log(chalk.bold.green("Bundler reverted to using internal webpack.config.js."));
   console.log(chalk.bold.green(`File ${promoteWebPackDir} marked as not used.`));
 
 }
 
-export const revertBuilder = async () => {
 
-  const builderIndexDir = fileURLToPath(new URL(BUILDER_INDEX_FILE_PATH, import.meta.url));
-
-  let indexFileJS = fs.readFileSync(builderIndexDir, { encoding: 'utf8' });
-
-  if (indexFileJS.length > 0) {
-    // uncomment out original webpack reference
-    indexFileJS = indexFileJS.replaceAll("// import configFactory from './webpack.config.js';", "import configFactory from './webpack.config.js';");
-
-    // comment out promoted webpack reference
-    if (indexFileJS.indexOf("// import configFactory from '../../../../../../../webpack.config.js';") < 0) {
-      indexFileJS = indexFileJS.replaceAll("import configFactory from '../../../../../../../webpack.config.js';", "// import configFactory from '../../../../../../../webpack.config.js';");
-    }
-
-    fs.writeFileSync(builderIndexDir, indexFileJS, { encoding: 'utf8' });
-
-    console.log(chalk.bold.green(`Bundler reverted to using internal webpack.config.js.`));
-  }
-
-
-}
 
 export default async options => {
   showVersion();
 
   await renamePromotedWebPack();
-  await revertBuilder();
+  await updateUseWebPackPromotion(false);
 
 };

package/src/util.js

@@ -19,22 +19,80 @@ import {
   OOTB_COMPONENT_SERVICE_REST_ENDPOINT,
   DELETE_COMPONENT_SERVICE_REST_ENDPOINT,
   LP_DELETE_COMPONENT_SERVICE_REST_ENDPOINT,
-  OOTB_COMPONENTS
+  OOTB_COMPONENTS,
+  USE_PROMOTED_WEB_PACK
 } from './constants.js';
 
 const access = promisify(fs.access);
 
-export const checkPathAccess = async (path, options = {}) => {
+export const checkPathAccess = async (path, options = {}, throwError = false) => {
   const { errorMessage } = options;
 
   try {
     await access(path, fs.constants.R_OK);
   } catch (err) {
-    const message =
-      errorMessage || `${chalk.red.bold('ERROR')} Could not able to access path - ${path}`;
-    console.error(message);
+    if (throwError) {
+      throw new Error(err);
+    } else {
+      const message =
+        errorMessage || `${chalk.red.bold('ERROR')} Could not able to access path - ${path}`;
+      console.error(message);
+      process.exit(1);
+    }
+  }
+};
+
+export const getUseWebPackPromotion = async () => {
+  const currentDirectory = process.cwd();
+  const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
+
+  try {
+    // force to throw error and not console log
+    await checkPathAccess(pegaConfigJsonPath, {}, true);
+  } catch (ex) {
+    // when can't find it, always be false, assume no webpack override.
+    // This is IMPORTANT for init (npx install)
+    return false;
+  }
+
+  let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
+  data = JSON.parse(data);
+
+  if (!data[COMPONENTS_DIRECTORY_PATH]) {
+    console.error(
+      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
+    );
+    process.exit(1);
+  }
+
+  if (data[USE_PROMOTED_WEB_PACK] == null) {
+    // value doesn't exist in task config, so add it with default of false
+    data[USE_PROMOTED_WEB_PACK] = false;
+    await updateUseWebPackPromotion(false);
+  }
+
+  return data[USE_PROMOTED_WEB_PACK];
+};
+
+export const updateUseWebPackPromotion = async (useValue = false) => {
+  const currentDirectory = process.cwd();
+  const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
+
+  await checkPathAccess(pegaConfigJsonPath);
+
+  let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
+  data = JSON.parse(data);
+
+  if (!data[COMPONENTS_DIRECTORY_PATH]) {
+    console.error(
+      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
+    );
     process.exit(1);
   }
+
+  data.usePromotedWebPack = useValue;
+
+  fs.writeFileSync(pegaConfigJsonPath, JSON.stringify(data, null, 4), { encoding: 'utf8' });
 };
 
 export const deleteLocalComponent = async componentKey => {
@@ -199,6 +257,23 @@ export const getComponentDefaults = async () => {
   return config.component;
 };
 
+export const getServerType = async () => {
+  const defaultPegaServerConfig = await getPegaServerConfig();
+  return defaultPegaServerConfig.serverType;
+};
+
+export const setServerType = async serverType => {
+  const currentDirectory = process.cwd();
+  const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
+  const configData = await getPegaConfig();
+  const serverConfig = configData['server-config'];
+  serverConfig.serverType = serverType;
+
+  // update file
+  // stringify "4", makes the json string look like JSON in the file, formated instead of a single line
+  fs.writeFileSync(pegaConfigJsonPath, JSON.stringify(configData, null, 4), { encoding: 'utf8' });
+};
+
 export const getComponentDirectoryPath = async componentKey => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
@@ -360,46 +435,50 @@ export const deleteInfinityServerComponent = async componentKey => {
 
     if (OauthData) {
       const { access_token: accessToken, token_type: tokenType } = JSON.parse(OauthData);
-      fetch(deleteUrl, {
+
+      const response = await fetch(deleteUrl, {
         method: 'DELETE',
         agent: getHttpsAgent(serverConfig),
         headers: {
           Authorization: `${tokenType} ${accessToken}`
         }
-      })
-        .then(response => {
-          status = response.status;
-          return response.text();
-        })
-        .then(resp => {
-          let respData;
-          try {
-            respData = JSON.parse(resp);
-          } catch (e) {
-            console.log(chalk.bold.redBright(`Failure : ${resp}`));
-            process.exit(1);
-          }
+      });
+
+      status = response.status;
+      if (!response.ok) {
+        if (status === 401) {
+          throw new Error('Error occurred in authentication. Please regenerate using authenticate');
+          // console.log(accessTokenUri, refreshToken);
+          /* TODO - Handle refresh_token */
+        } else if (status === 404) {
+          throw new Error('404: Server resource not found');
+        } else if (status === 405) {
+          throw new Error('405: Server method not allowed');
+        } else if (status === 408) {
+          throw new Error('408: Server timed out');
+        } else if (response.status === 403) {
+          throw new Error('Error forbidden: User does not have privileges to Publish.');
+        }
+      }
 
-          if (status === 200) {
-            console.log(chalk.bold.green(`Success : ${respData.message}`));
-          } else {
-            throw new Error(`${respData.message}`);
-          }
-        })
-        .catch(e => {
-          if (status === 403) {
-            // eslint-disable-next-line prefer-promise-reject-errors
-            Promise.reject(
-              `${chalk.bold.red('Error forbidden: User does not have privileges to Delete.')}`
-            );
-          } else {
-            // eslint-disable-next-line prefer-promise-reject-errors
-            Promise.reject(`${chalk.bold.red(e)}`);
-          }
-        });
+      try {
+        const respData = await response.json();
+        console.log(chalk.bold.green(`Success : ${respData.message}`));
+
+        if (status === 500) {
+          status = 999;
+          throw new Error(respData.message);
+        }
+      } catch (err) {
+        if (status === 500) {
+          throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+        } else if (status === 999) {
+          throw new Error(err);
+        }
+      }
     }
   } catch (error) {
-    console.log(`\n${chalk.bold.red(error)}`);
+    throw new Error(error);
   }
 };
 
@@ -430,42 +509,47 @@ export const deleteLaunchpadServerComponent = async componentKey => {
         componentName
       };
 
-      fetch(deleteUrl, {
+      const response = await fetch(deleteUrl, {
         method: 'DELETE',
         agent: new https.Agent({ rejectUnauthorized: false }),
         headers,
         body: JSON.stringify(apiBody)
-      })
-        .then(response => {
-          status = response.status;
-          return response.text();
-        })
-        .then(response => {
-          if (status === 401) {
-            throw new Error(
-              'Error occurred in authentication. Please regenerate using authenticate'
-            );
-            // console.log(accessTokenUri, refreshToken);
-            /* TODO - Handle refresh_token */
-          } else if (status === 200 || status === 201) {
-            console.log(chalk.bold.green(`Success : ${response}`));
-          } else {
-            throw new Error(`${response.message}`);
-          }
-        })
-        .catch(e => {
-          if (status === 403) {
-            // eslint-disable-next-line prefer-promise-reject-errors
-            Promise.reject(
-              `${chalk.bold.red('Error forbidden: User does not have privileges to Delete.')}`
-            );
-          } else {
-            // eslint-disable-next-line prefer-promise-reject-errors
-            Promise.reject(`${chalk.bold.red(e)}`);
-          }
-        });
+      });
+
+      status = response.status;
+      if (!response.ok) {
+        if (status === 401) {
+          throw new Error('Error occurred in authentication. Please regenerate using authenticate');
+          // console.log(accessTokenUri, refreshToken);
+          /* TODO - Handle refresh_token */
+        } else if (status === 404) {
+          throw new Error('404: Server resource not found');
+        } else if (status === 405) {
+          throw new Error('405: Server method not allowed');
+        } else if (status === 408) {
+          throw new Error('408: Server timed out');
+        } else if (response.status === 403) {
+          throw new Error('Error forbidden: User does not have privileges to Publish.');
+        }
+      }
+
+      try {
+        const respData = await response.text();
+        console.log(chalk.bold.green(`Success : ${respData}`));
+
+        if (status === 500) {
+          status = 999;
+          throw new Error(respData.message);
+        }
+      } catch (err) {
+        if (status === 500) {
+          throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+        } else if (status === 999) {
+          throw new Error(err);
+        }
+      }
     }
   } catch (error) {
-    console.log(`\n${chalk.bold.red(error)}`);
+    throw new Error(error);
   }
 };

package/tests/assets/components/create/Pega_DXIL_MyTestText/demo.stories.tsx

@@ -2,19 +2,22 @@
 /* eslint-disable react/jsx-no-useless-fragment */
 // @ts-nocheck
 import { useState } from 'react';
-import { withKnobs } from '@storybook/addon-knobs';
+import type { Meta, StoryObj } from '@storybook/react';
 
 import { stateProps, configProps } from './mock';
 
 import PegaDxilMyTestText from './index';
 
-export default {
+const meta: Meta<typeof PegaDxilMyTestText> = {
   title: 'PegaDxilMyTestText',
-  decorators: [withKnobs],
-  component: PegaDxilMyTestText
+  component: PegaDxilMyTestText,
+  excludeStories: /.*Data$/
 };
 
-export const BasePegaDxilMyTestText = () => {
+export default meta;
+type Story = StoryObj<typeof PegaDxilMyTestText>;
+
+export const BasePegaDxilMyTestText: Story = args => {
 
   const [value, setValue] = useState(configProps.value);
 
@@ -48,7 +51,21 @@ export const BasePegaDxilMyTestText = () => {
 
   return (
     <>
-      <PegaDxilMyTestText {...props} />
+      <PegaDxilMyTestText {...props} {...args} />
     </>
   );
 };
+
+BasePegaDxilMyTestText.args = {
+  label: configProps.label,
+  helperText: configProps.helperText,
+  placeholder: configProps.placeholder,
+  testId: configProps.testId,
+  readOnly: configProps.readOnly,
+  disabled: configProps.disabled,
+  required: configProps.required,
+  status: configProps.status,
+  hideLabel: configProps.hideLabel,
+  displayMode: configProps.displayMode,
+  validatemessage: configProps.validatemessage
+};

package/tests/assets/components/create/Pega_DXIL_MyTestText/index.tsx

@@ -1,5 +1,4 @@
-import PropTypes from 'prop-types';
-import { Input } from '@pega/cosmos-react-core';
+import { Input, withConfiguration } from '@pega/cosmos-react-core';
 
 import type { PConnFieldProps } from './PConnProps';
 
@@ -21,8 +20,8 @@ interface StateProps {
 
 // props passed in combination of props from property panel (config.json) and run time props from Constellation
 // any default values in config.pros should be set in defaultProps at bottom of this file
-export default function PegaDxilMyTestText(props: PegaDxilMyTestTextProps) {
-  const { getPConnect, value, placeholder, disabled, readOnly, required, label, hideLabel, testId } = props;
+function PegaDxilMyTestText(props: PegaDxilMyTestTextProps) {
+  const { getPConnect, value, placeholder, disabled = false, readOnly = false, required = false, label, hideLabel = false, testId } = props;
 
   const pConn = getPConnect();
   const actions = pConn.getActionsApi();
@@ -52,22 +51,5 @@ export default function PegaDxilMyTestText(props: PegaDxilMyTestTextProps) {
   );
 };
 
-PegaDxilMyTestText.defaultProps = {
-  value: '',
-  placeholder: '',
-  disabled: false,
-  readOnly: false,
-  required: false,
-  testId: ''
-};
 
-PegaDxilMyTestText.propTypes = {
-  label: PropTypes.string,
-  value: PropTypes.string,
-  placeholder: PropTypes.string,
-  getPConnect: PropTypes.func.isRequired,
-  disabled: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
-  readOnly: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
-  required: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
-  testId: PropTypes.string
-};
+export default withConfiguration(PegaDxilMyTestText);

package/tests/assets/components/create/Pega_DXIL_MyTestText/mock.ts

@@ -6,7 +6,14 @@ export const configProps = {
   placeholder: 'Text Placeholder',
   helperText: 'Text Helper Text',
   testId: 'Text-12345678',
-  hasSuggestions: false
+  hasSuggestions: false,
+  displayMode: '',
+  hideLabel: false,
+  readOnly: false,
+  required: false,
+  disabled: false,
+  status: '',
+  validatemessage: ''
 };
 
 export const stateProps = {

package/tests/assets/components/create/Pega_DXIL_MyTestText/styles.ts

@@ -1,15 +1,8 @@
-
-// utilizing theming, comment out, if want individual style
-import styled from 'styled-components';
-import { Configuration } from '@pega/cosmos-react-core';
-
-export default styled(Configuration)``;
-
 // individual style, comment out above, and uncomment here and add styles
-// import styled, { css } from 'styled-components';
-//
-// export default styled.div(() => {
-//  return css`
-//    margin: 0px 0;
-//  `;
-// });
+import styled, { css } from 'styled-components';
+
+export default styled.div(() => {
+  return css`
+    margin: 0px 0;
+  `;
+});

package/tests/assets/components/create/_components.md

@@ -0,0 +1 @@
+# directory for components #

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyBoolean/Boolean.ts

@@ -0,0 +1,35 @@
+function Boolean(value: any, { allowEmpty = true, tick = '', cross = '' } = {}) {
+  if (
+    (!allowEmpty && !value) ||
+    value === false ||
+    value?.toString()?.toLowerCase() === 'false' ||
+    value === 0 ||
+    value === '0'
+  ) {
+    return cross || '';
+  }
+  if (
+    value === true ||
+    value?.toString()?.toLowerCase() === 'true' ||
+    value === 1 ||
+    value === '1'
+  ) {
+    return tick || '';
+  }
+  if (
+    allowEmpty &&
+    (value === 'null' || value === '' || value === null || typeof value === 'undefined')
+  ) {
+    return '––';
+  }
+  return value;
+}
+
+export default {
+  TrueFalse: (value: any, options: Object) =>
+    Boolean(value, {
+      ...options,
+      tick: 'True',
+      cross: 'False'
+    })
+};

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyBoolean/demo.stories.tsx

@@ -2,19 +2,22 @@
 /* eslint-disable react/jsx-no-useless-fragment */
 // @ts-nocheck
 import { useState } from 'react';
-import { withKnobs } from '@storybook/addon-knobs';
+import type { Meta, StoryObj } from '@storybook/react';
 
 import { configProps, stateProps } from './mock';
 
 import PegaDxilMyBoolean from './index';
 
-export default {
+const meta: Meta<typeof PegaDxilMyBoolean> = {
   title: 'PegaDxilMyBoolean',
-  decorators: [withKnobs],
-  component: PegaDxilMyBoolean
+  component: PegaDxilMyBoolean,
+  excludeStories: /.*Data$/
 };
 
-export const BasePegaDxilMyBoolean = () => {
+export default meta;
+type Story = StoryObj<typeof PegaDxilMyBoolean>;
+
+export const BasePegaDxilMyBoolean: Story = args => {
 
   const [value, setValue] = useState(configProps.value);
 
@@ -58,7 +61,21 @@ export const BasePegaDxilMyBoolean = () => {
 
   return (
     <>
-      <PegaDxilMyBoolean {...props} />
+      <PegaDxilMyBoolean {...props} {...args} />
     </>
   );
 };
+
+BasePegaDxilMyBoolean.args = {
+  label: configProps.label,
+  helperText: configProps.helperText,
+  caption: configProps.caption,
+  testId: configProps.testId,
+  readOnly: configProps.readOnly,
+  disabled: configProps.disabled,
+  required: configProps.required,
+  status: configProps.status,
+  hideLabel: configProps.hideLabel,
+  displayMode: configProps.displayMode,
+  validatemessage: configProps.validatemessage
+};