@pega/custom-dx-components 0.23.34 → 0.23.36

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

@@ -159,55 +159,67 @@ export const publishComponentToServer = async (data, doFetch) => {
           headers.Authorization = `${tokenType} ${accessToken}`;
         }
 
-        fetch(url, {
+
+        const response = await fetch(url, {
           method: 'POST',
           agent: getHttpsAgent(defaultPegaConfig),
-          headers,
+          headers: headers,
           body: JSON.stringify(apiBody)
-        })
-          .then(response => {
-            status = response.status;
-            return response.text();
-          })
-          .then(resp => {
-            const respData = isLaunchpad ? resp : JSON.parse(resp);
-            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(
+        });
+
+        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 = isLaunchpad ? await response.text() : await response.json();
+          console.log(
                 chalk.bold.green(`Success : ${isLaunchpad ? respData : 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 {
-              throw new Error(`${respData.message}`);
-            }
-          })
-          .catch(e => {
-            if (e.code === 'ECONNREFUSED') {
-              // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(
-                `${chalk.bold.red(
-                  'Error occurred in authentication. Please regenerate using authenticate'
-                )}`
-              );
-            } else if (status === 403) {
-              // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(
-                `${chalk.bold.red('Error forbidden: User does not have privileges to Publish.')}`
-              );
-            } else {
-              // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(`${chalk.bold.red(e)}`);
-            }
-          });
+          }
+          else if (status === 999) {
+            throw new Error (err);
+          }
+        }
+
       } else {
         throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
       }
     } catch (err) {
-      throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+      // throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+      throw new Error(err);
     }
   }
 };

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' : 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/util.js

@@ -290,7 +290,7 @@ export const showVersion = () => {
   const hasGit = checkGit(process.cwd());
 
   if (!hasGit) {
-    console.log(chalk.redBright('DX Component Builder - SDK git to be installed.'));
+    console.log(chalk.redBright('DX Component Builder - Git needs to be installed.'));
     process.exit(1);
   }
 };
@@ -360,46 +360,68 @@ 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.')}`
+
+      }
+
+      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 {
-            // eslint-disable-next-line prefer-promise-reject-errors
-            Promise.reject(`${chalk.bold.red(e)}`);
-          }
-        });
+        }
+        else if (status === 999) {
+          throw new Error (err);
+        }
+      }
+
     }
   } catch (error) {
-    console.log(`\n${chalk.bold.red(error)}`);
+
+    throw new Error(error);
   }
 };
 
@@ -430,42 +452,62 @@ 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) {
+      });
+
+      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'
+             `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)}`);
-          }
-        });
+        }
+        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);
 

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/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/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);
 

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyBoolean/index.tsx

@@ -2,10 +2,9 @@ import {
   Checkbox as CosmosCheckbox,
   CheckboxGroup,
   FieldValueList,
-  Text
+  Text,
+  withConfiguration
 } from "@pega/cosmos-react-core";
-import PropTypes from "prop-types";
-
 
 import type { PConnFieldProps } from './PConnProps';
 
@@ -40,19 +39,19 @@ interface ActionsProps {
 
 // 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 PegaDxilMyBoolean(props: PegaDxilMyBooleanProps) {
+function PegaDxilMyBoolean(props: PegaDxilMyBooleanProps) {
   const {
     getPConnect,
-    value,
-    label,
-    helperText,
+    value = false,
+    label = '',
+    helperText = '',
     caption,
     validatemessage,
     hideLabel,
     testId,
-    additionalProps,
+    additionalProps = {},
     displayMode,
-    variant,
+    variant = 'inline',
     trueLabel,
     falseLabel
   } = props;
@@ -62,7 +61,7 @@ export default function PegaDxilMyBoolean(props: PegaDxilMyBooleanProps) {
   const stateProps = pConn.getStateProps() as StateProps;
   const propName: string = stateProps.value;
 
-  let { readOnly, required, disabled } = props;
+  let { readOnly = false, required = false, disabled = false } = props;
   [readOnly, required, disabled] = [readOnly, required, disabled].map(
     (prop) => prop === true || (typeof prop === 'string' && prop === 'true')
   );
@@ -161,40 +160,4 @@ export default function PegaDxilMyBoolean(props: PegaDxilMyBooleanProps) {
 };
 
 
-PegaDxilMyBoolean.defaultProps = {
-  validatemessage: '',
-  value: false,
-  label: '',
-  hideLabel: false,
-  helperText: '',
-  disabled: false,
-  readOnly: false,
-  required: false,
-  testId: '',
-  additionalProps: {},
-  displayMode: null,
-  variant: 'inline',
-  displayValue: 'Yes/No',
-  trueLabel: '',
-  falseLabel: ''
-};
-
-PegaDxilMyBoolean.propTypes = {
-  getPConnect: PropTypes.func.isRequired,
-  validatemessage: PropTypes.string,
-  label: PropTypes.string,
-  hideLabel: PropTypes.bool,
-  helperText: PropTypes.string,
-  value: PropTypes.bool,
-  caption: PropTypes.string.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,
-  additionalProps: PropTypes.objectOf(PropTypes.any),
-  displayMode: PropTypes.string,
-  variant: PropTypes.string,
-  displayValue: PropTypes.string,
-  trueLabel: PropTypes.string,
-  falseLabel: PropTypes.string
-};
+export default withConfiguration(PegaDxilMyBoolean);

package/tests/assets/components/createAll/Constellation/Pega_DXIL_MyBoolean/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;
+  `;
+});