@pega/dx-component-builder-sdk 0.25.7 → 0.26.1

package/src/tasks/create/templates/Constellation/template/DETAILS/demo.stories.tsx.mustache

@@ -1,5 +1,3 @@
-/* eslint-disable no-nested-ternary */
-/* eslint-disable react/jsx-no-useless-fragment */
 // @ts-nocheck
 import type { Meta, StoryObj } from '@storybook/react';
 import { Text, FieldValueList, DateTimeDisplay, useTheme } from '@pega/cosmos-react-core';
@@ -56,7 +54,6 @@ const Region = () => {
   return <></>;
 };
 
-
 const renderField = resolvedProps => {
   const {
     displayAsStatus = false,
@@ -64,7 +61,7 @@ const renderField = resolvedProps => {
     value = '',
     label = '',
     key,
-    // eslint-disable-next-line react-hooks/rules-of-hooks, @typescript-eslint/no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     theme = useTheme()
   } = resolvedProps;
 
@@ -79,16 +76,7 @@ const renderField = resolvedProps => {
       ''
     );
 
-  if (label === 'Create date/time')
-    val = (
-      <DateTimeDisplay
-        value={value}
-        variant='datetime'
-        format='long'
-        clockFormat={null}
-        key={key}
-      />
-    );
+  if (label === 'Create date/time') val = <DateTimeDisplay value={value} variant='datetime' format='long' clockFormat={null} key={key} />;
 
   if (displayAsStatus === true) val = <StatusWorkRenderer value={value} key={key} />;
 
@@ -151,7 +139,6 @@ export const Base{{COMPONENT_CLASS_NAME}}: Story = args => {
           return pyReviewRaw.config.inheritedProps;
         },
         createComponent: config => {
-          // eslint-disable-next-line default-case
           switch (config.config.value) {
             case '@P .pyStatusWork':
               return renderField(pyReviewResolved.highlightedData[0].config);
@@ -169,9 +156,7 @@ export const Base{{COMPONENT_CLASS_NAME}}: Story = args => {
               return renderField(regionChildrenResolved[2]);
           }
         },
-        setInheritedProp: () => {
-          /* nothing */
-        },
+        setInheritedProp: () => undefined,
         resolveConfigProps: config => {
           return config;
         }
@@ -185,16 +170,15 @@ export const Base{{COMPONENT_CLASS_NAME}}: Story = args => {
         <Region
           {...{
             getPConnect: () => ({
-              setInheritedProp: () => {},
+              setInheritedProp: () => undefined,
               getChildren: () =>
                 pyReviewRaw.children[0].children.map((child, index) => {
                   return {
                     getPConnect: () => ({
-                      getRawMetadata: () => pyReviewRaw.children[0].children[index],
-                      getConfigProps: () => {},
+                      getRawMetadata: () => child,
+                      getConfigProps: () => child.config,
                       resolveConfigProps: () => regionChildrenResolved[index],
-                      getComponent: () =>
-                        props.getPConnect().createComponent(pyReviewRaw.children[0].children[index])
+                      getComponent: () => props.getPConnect().createComponent(pyReviewRaw.children[0].children[index])
                     })
                   };
                 })

package/src/tasks/create/templates/Constellation/template/DETAILS/index.tsx.mustache

@@ -21,8 +21,7 @@ interface {{COMPONENT_CLASS_NAME}}Props extends PConnFieldProps {
 // 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
 function {{COMPONENT_CLASS_NAME}}(props: {{COMPONENT_CLASS_NAME}}Props) {
-
-  const { getPConnect, label, showLabel = true, showHighlightedData = false  } = props;
+  const { getPConnect, label, showLabel = true, showHighlightedData = false } = props;
   const propsToUse = { label, showLabel, ...getPConnect().getInheritedProps() };
 
   // storybook doesn't get children of 1 as an array of 1
@@ -40,7 +39,7 @@ function {{COMPONENT_CLASS_NAME}}(props: {{COMPONENT_CLASS_NAME}}Props) {
   });
 
   const numRegions = getAllFields(getPConnect)?.length;
-  const gridRepeat = "repeat(".concat(numRegions).concat(", 1fr)");
+  const gridRepeat = 'repeat('.concat(numRegions).concat(', 1fr)');
 
   const gridContainer: GridContainerProps = { colGap: 6 };
   gridContainer.cols = gridRepeat;
@@ -52,18 +51,17 @@ function {{COMPONENT_CLASS_NAME}}(props: {{COMPONENT_CLASS_NAME}}Props) {
     // @ts-ignore
     const { highlightedData = [] } = getPConnect().getRawMetadata().config;
     // @ts-ignore
-    highlightedDataArr = highlightedData.map((field) => {
+    highlightedDataArr = highlightedData.map(field => {
       return <HighlightRender field={field} getPConnect={props.getPConnect} />;
     });
   }
 
-
   return (
     <Styled{{COMPONENT_CLASS_NAME}}Wrapper>
 {{! pick new delimiters for mustache }}
 {{=<% %>=}}
-    <FieldGroup name={propsToUse.showLabel ? propsToUse.label : ''}>
-      {showHighlightedData && highlightedDataArr.length > 0 && (
+      <FieldGroup name={propsToUse.showLabel ? propsToUse.label : ''}>
+        {showHighlightedData && highlightedDataArr.length > 0 && (
           <>
             <Flex
               // @ts-ignore
@@ -76,28 +74,22 @@ function {{COMPONENT_CLASS_NAME}}(props: {{COMPONENT_CLASS_NAME}}Props) {
             </Flex>
             <StyledHighlightedFieldsHrLine />
           </>
-      )}
-      <Grid
-        as={StyledDetailsGridContainer}
-        container={gridContainer}
-        data-testid={`column-count-${numRegions}`} >
-       {children.map((child: ReactElement, i: number) => (
-
-        <Flex
-            // @ts-ignore
-            container={{ direction: 'column', alignItems: 'normal', colGap: 1, rowGap: 1.5 }}
-            key={`r-${i + 1}`}
-        >
-          <DetailsRender child={child} />
-        </Flex>
-       ))}
-      </Grid>
-    </FieldGroup>
+        )}
+        <Grid as={StyledDetailsGridContainer} container={gridContainer} data-testid={`column-count-${numRegions}`}>
+          {children.map((child: ReactElement, i: number) => (
+            <Flex
+              // @ts-ignore
+              container={{ direction: 'column', alignItems: 'normal', colGap: 1, rowGap: 1.5 }}
+              key={`r-${i + 1}`}
+            >
+              <DetailsRender child={child} />
+            </Flex>
+          ))}
+        </Grid>
+      </FieldGroup>
 <%={{ }}=%>     {{! revert delimiters for mustache }}
     </Styled{{COMPONENT_CLASS_NAME}}Wrapper>
   );
-
 }
 
-
 export default withConfiguration({{COMPONENT_CLASS_NAME}});

package/src/tasks/create/templates/Constellation/template/DETAILS/mock.ts.mustache

@@ -1,4 +1,3 @@
-
 // @ts-nocheck
 export const pyReviewRaw = {
   name: 'pyReview',

package/src/tasks/create/templates/Constellation/template/DETAILS/styles.ts.mustache

@@ -13,12 +13,11 @@ export const StyledDetailsGridContainer = styled.div(() => {
   `;
 });
 
-
 export const StyledHighlightedFieldsHrLine = styled.hr(() => {
   return css`
     line: {
       margin: '0.75rem 0';
-      opacity: '50%'
+      opacity: '50%';
     }
   `;
 });

package/src/tasks/create/templates/Constellation/template/DETAILS/utils.js.mustache

@@ -11,15 +11,15 @@ export function getAllFields(pConnect) {
 
   let allFields = [];
 
-  const makeField = (f) => ({
+  const makeField = f => ({
     ...pConnect().resolveConfigProps(f.config),
     type: f.type
   });
 
   const hasRegions = !!metadata.children[0]?.children;
   if (hasRegions) {
-    allFields = metadata.children.map((region) =>
-      region.children.map((field) => {
+    allFields = metadata.children.map(region =>
+      region.children.map(field => {
         // Do not resolve the config props if is status work, instead create component here as status badge and mark as status display
         if (field.config?.value === '@P .pyStatusWork') {
           field.type = 'TextInput';
@@ -37,8 +37,6 @@ export function getAllFields(pConnect) {
   return allFields;
 }
 
-
-
 export function getFilteredFields(getPConnect) {
   let primaryFieldsRaw;
   let secondaryFieldsRaw;
@@ -52,12 +50,12 @@ export function getFilteredFields(getPConnect) {
   }
 
   // Filter out fields that are not visible and unsupported types for primary fields (for CaseSummary)
-  primaryFieldsRaw = primaryFieldsRaw.filter((item) => {
+  primaryFieldsRaw = primaryFieldsRaw.filter(item => {
     const resolvedItem = getPConnect().resolveConfigProps(item.config);
     return resolvedItem.visibility !== false && item.type !== 'TextContent';
   });
 
-  secondaryFieldsRaw = secondaryFieldsRaw.filter((item) => {
+  secondaryFieldsRaw = secondaryFieldsRaw.filter(item => {
     const resolvedItem = getPConnect().resolveConfigProps(item.config);
     return resolvedItem.visibility !== false && item.type !== 'TextContent';
   });

package/src/tasks/create/templates/Constellation/template/DETAILS-region/Avatar.tsx.mustache

@@ -1,15 +1,13 @@
-import  React from 'react';
+import React from 'react';
 import { useEffect, useState } from 'react';
 import { Avatar as CosmosAvatar, withConfiguration } from '@pega/cosmos-react-core';
 import type { PConnFieldProps } from './PConnProps';
 
-
 // interface for props
 interface {{COMPONENT_CLASS_NAME}}AvatarProps extends PConnFieldProps {
   // If any, enter additional props that only exist on TextInput here
   metaObj: any;
   showStatus: boolean;
-
 }
 
 function Avatar(props: {{COMPONENT_CLASS_NAME}}AvatarProps) {
@@ -21,8 +19,8 @@ function Avatar(props: {{COMPONENT_CLASS_NAME}}AvatarProps) {
   // TODO Below if conditions can be removed once we have apis to get worklist/mywork info
   // This is non CaseView case (Dashboard, MyWork etc)
   if (!metaObj) {
-    userName = PCore.getEnvironmentInfo().getOperatorName() ?? "";
-    userIdentifier = PCore.getEnvironmentInfo().getOperatorIdentifier() ?? "";
+    userName = PCore.getEnvironmentInfo().getOperatorName() ?? '';
+    userIdentifier = PCore.getEnvironmentInfo().getOperatorIdentifier() ?? '';
   } else {
     userName = metaObj.name;
     userIdentifier = metaObj.ID;
@@ -36,23 +34,21 @@ function Avatar(props: {{COMPONENT_CLASS_NAME}}AvatarProps) {
     if (imageKey) {
       PCore.getAssetLoader()
         .getSvcImage(imageKey)
-        .then((blob) => window.URL.createObjectURL(blob))
-        .then((imagePath) => setImageBlobUrl(imagePath as React.SetStateAction<any>));
+        .then(blob => window.URL.createObjectURL(blob))
+        .then(imagePath => setImageBlobUrl(imagePath as React.SetStateAction<any>));
     }
   }, [metaObj]);
 
   if (showStatus) {
     const currentState = PCore.getMessagingServiceManager().getUserPresence().getUserState(userIdentifier);
-    const [userState, setUserState]: any  = useState(currentState === 'online' ? 'active' : 'inactive');
+    const [userState, setUserState]: any = useState(currentState === 'online' ? 'active' : 'inactive');
 
     const handleUserStateChange = ({ state }: any) => {
       setUserState(state === 'online' ? 'active' : 'inactive');
     };
 
     useEffect(() => {
-      const subId = PCore.getMessagingServiceManager()
-        .getUserPresence()
-        .subscribe(userIdentifier, handleUserStateChange, '');
+      const subId = PCore.getMessagingServiceManager().getUserPresence().subscribe(userIdentifier, handleUserStateChange, '');
 
       return function cleanup() {
         PCore.getMessagingServiceManager().getUserPresence().unsubscribe(userIdentifier, subId);
@@ -71,5 +67,4 @@ function Avatar(props: {{COMPONENT_CLASS_NAME}}AvatarProps) {
   return <CosmosAvatar name={userName} imageSrc={imageBlobUrl as React.SetStateAction<any>} />;
 }
 
-
 export default withConfiguration(Avatar);

package/src/tasks/create/templates/Constellation/template/DETAILS-region/DetailsRender.tsx.mustache

@@ -3,7 +3,7 @@ import { FieldValueList } from '@pega/cosmos-react-core';
 
 interface DetailsRenderProps {
   children?: never;
-  child: NonNullable<ReactElement>;
+  child: NonNullable<ReactElement<any>>;
 }
 
 const DetailsRender = (props: DetailsRenderProps) => {
@@ -13,11 +13,9 @@ const DetailsRender = (props: DetailsRenderProps) => {
 
   const displayCompArr: ReactElement[] = [];
 
-  Object.values(kids).forEach((value: any, i :number) => {
+  Object.values(kids).forEach((value: any, i: number) => {
     const { type } = value.getPConnect().getRawMetadata();
-    const { hideLabel, variant, testId, label } = value
-      .getPConnect()
-      .resolveConfigProps(value.getPConnect().getConfigProps());
+    const { hideLabel, variant, testId, label } = value.getPConnect().resolveConfigProps(value.getPConnect().getConfigProps());
 
     let displayComp;
     const key = JSON.stringify(value.getPConnect());
@@ -36,7 +34,7 @@ const DetailsRender = (props: DetailsRenderProps) => {
       displayComp = (
         <Fragment key={key1}>
           <FieldValueList
-            style={{ columnGap: '0'}}
+            style={{ columnGap: '0' }}
             variant={hideLabel ? 'stacked' : variant}
             data-testid={testId}
             fields={[{ id: '1', name: hideLabel ? '' : label, value: displayEl }]}

package/src/tasks/create/templates/Constellation/template/DETAILS-region/Operator.tsx.mustache

@@ -1,16 +1,6 @@
 // @ts-nocheck
 import { useState, useEffect, Fragment } from 'react';
-import {
-  Link,
-  Button,
-  Popover,
-  useOuterEvent,
-  useElement,
-  Progress,
-  FormField,
-  useTheme,
-  withConfiguration
-} from '@pega/cosmos-react-core';
+import { Link, Button, Popover, useOuterEvent, useElement, Progress, FormField, useTheme, withConfiguration } from '@pega/cosmos-react-core';
 import { Glimpse } from '@pega/cosmos-react-work';
 import { EmailDisplay } from '@pega/cosmos-react-core';
 
@@ -18,7 +8,6 @@ import type { PConnFieldProps } from './PConnProps';
 
 import Avatar from './Avatar';
 
-
 // interface for props
 interface {{COMPONENT_CLASS_NAME}}OperatorProps extends PConnFieldProps {
   // If any, enter additional props that only exist on TextInput here
@@ -44,16 +33,12 @@ function Operator(props: {{COMPONENT_CLASS_NAME}}OperatorProps) {
     pTarget = null;
   }, [id]);
 
-
   {{! pick new delimiters for mustache }}
   {{=<% %>=}}
-
   const OperatorPreview = () => {
     const localizedVal = PCore.getLocaleUtils().getLocaleValue;
     const localeCategory = 'Operator';
-    setpopoverContent(
-      <Progress variant='ring' message={localizedVal('Loading operator...', localeCategory)} placement='local' />
-    );
+    setpopoverContent(<Progress variant='ring' message={localizedVal('Loading operator...', localeCategory)} placement='local' />);
     if (externalUser && externalUser.classID !== 'Data-Party-Operator') {
       const fields = [
         {
@@ -64,8 +49,7 @@ function Operator(props: {{COMPONENT_CLASS_NAME}}OperatorProps) {
         {
           id: 'pyEmail1',
           name: localizedVal('Email', localeCategory),
-          value:
-            externalUser.email !== '' ? <Link href={`mailto:${externalUser.email}`}>{externalUser.email}</Link> : ''
+          value: externalUser.email !== '' ? <Link href={`mailto:${externalUser.email}`}>{externalUser.email}</Link> : ''
         },
         {
           id: 'pyPhoneNumber',
@@ -129,18 +113,18 @@ function Operator(props: {{COMPONENT_CLASS_NAME}}OperatorProps) {
                 }}
                 fields={fields}
                 target={pTarget}
-                onDismiss={() => {pTarget = null;}}
+                onDismiss={() => {
+                  pTarget = null;
+                }}
               />
             );
           }
         });
     }
   };
-
   <%={{ }}=%>     {{! revert delimiters for mustache }}
 
   const clickAction = (e: any) => {
-
     setIsOpen(!isOpen);
     if (pTarget === null) {
       pTarget = e.currentTarget;
@@ -212,7 +196,6 @@ function Operator(props: {{COMPONENT_CLASS_NAME}}OperatorProps) {
   }
 
   return comp;
-};
-
+}
 
 export default withConfiguration(Operator);

package/src/tasks/create/templates/Constellation/template/DETAILS-region/PConnProps.d.ts.mustache

@@ -1,4 +1,4 @@
-import  {PConnect } from '@pega/pcore-pconnect-typedefs';
+import { PConnect } from '@pega/pcore-pconnect-typedefs';
 
 // PConnProps.d.ts
 // This gives us a place to have each component (which is most DX Components) that is
@@ -22,25 +22,24 @@ export interface PConnProps {
   // [key: string]: any;
 }
 
-
 // PConnFieldProps extends PConnProps to bring in the common properties that are
 // associated with most field components (ex: Dropdown, TextInput, etc.) in the
 //  components/field directory
 export interface PConnFieldProps extends PConnProps {
-  label: string,
-  required: boolean,
-  disabled: boolean,
-  value: any,
-  validatemessage: string,
-  status?: string,
-  onChange?: any,
-  onBlur?: any,
-  readOnly: boolean,
-  testId: string,
-  helperText: string,
-  displayMode?: string,
-  hideLabel: boolean,
-  placeholder?: string,
-  fieldMetadata?: any,
-  additionalProps?: any
+  label: string;
+  required: boolean;
+  disabled: boolean;
+  value: any;
+  validatemessage: string;
+  status?: string;
+  onChange?: any;
+  onBlur?: any;
+  readOnly: boolean;
+  testId: string;
+  helperText: string;
+  displayMode?: string;
+  hideLabel: boolean;
+  placeholder?: string;
+  fieldMetadata?: any;
+  additionalProps?: any;
 }

package/src/tasks/create/templates/Constellation/template/DETAILS-region/demo.stories.tsx.mustache

@@ -1,5 +1,3 @@
-/* eslint-disable no-nested-ternary */
-/* eslint-disable react/jsx-no-useless-fragment */
 // @ts-nocheck
 import type { Meta, StoryObj } from '@storybook/react';
 import { Text, FieldValueList, DateTimeDisplay, useTheme } from '@pega/cosmos-react-core';
@@ -53,7 +51,7 @@ const renderField = resolvedProps => {
     value = '',
     label = '',
     key,
-    // eslint-disable-next-line react-hooks/rules-of-hooks, @typescript-eslint/no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     theme = useTheme()
   } = resolvedProps;
 
@@ -68,16 +66,7 @@ const renderField = resolvedProps => {
       ''
     );
 
-  if (label === 'Create date/time')
-    val = (
-      <DateTimeDisplay
-        value={value}
-        variant='datetime'
-        format='long'
-        clockFormat={null}
-        key={key}
-      />
-    );
+  if (label === 'Create date/time') val = <DateTimeDisplay value={value} variant='datetime' format='long' clockFormat={null} key={key} />;
 
   if (displayAsStatus === true) val = <StatusWorkRenderer value={value} key={key} />;
 
@@ -140,7 +129,6 @@ export const Base{{COMPONENT_CLASS_NAME}}: Story = args => {
           return pyReviewRaw.config.inheritedProps;
         },
         createComponent: config => {
-          // eslint-disable-next-line default-case
           switch (config.config.value) {
             case '@P .pyStatusWork':
               return renderField(pyReviewResolved.highlightedData[0].config);
@@ -168,47 +156,44 @@ export const Base{{COMPONENT_CLASS_NAME}}: Story = args => {
     }
   };
 
-
   return (
     <{{COMPONENT_CLASS_NAME}} {...props} {...args}>
-        <Region
-          {...{
-            getPConnect: () => ({
-              setInheritedProp: () => {},
-              getChildren: () =>
-                pyReviewRaw.children[0].children.map((child, index) => {
-                  return {
-                    getPConnect: () => ({
-                      getRawMetadata: () => pyReviewRaw.children[0].children[index],
-                      getConfigProps: () => {},
-                      resolveConfigProps: () => regionChildrenResolved[index],
-                      getComponent: () =>
-                        props.getPConnect().createComponent(pyReviewRaw.children[0].children[index])
-                    })
-                  };
-                })
-            })
-          }}
-        />
-        <Region
-          {...{
-            getPConnect: () => ({
-              setInheritedProp: () => {},
-              getChildren: () =>
-                pyReviewRaw.children[1].children.map((child, index) => {
-                  return {
-                    getPConnect: () => ({
-                      getRawMetadata: () => pyReviewRaw.children[1].children[index],
-                      getConfigProps: () => {},
-                      resolveConfigProps: () => regionChildrenResolved[index],
-                      getComponent: () =>
-                        props.getPConnect().createComponent(pyReviewRaw.children[1].children[index])
-                    })
-                  };
-                })
-            })
-          }}
-        />
+      <Region
+        {...{
+          getPConnect: () => ({
+            setInheritedProp: () => undefined,
+            getChildren: () =>
+              pyReviewRaw.children[0].children.map((child, index) => {
+                return {
+                  getPConnect: () => ({
+                    getRawMetadata: () => pyReviewRaw.children[0].children[index],
+                    getConfigProps: () => undefined,
+                    resolveConfigProps: () => regionChildrenResolved[index],
+                    getComponent: () => props.getPConnect().createComponent(pyReviewRaw.children[0].children[index])
+                  })
+                };
+              })
+          })
+        }}
+      />
+      <Region
+        {...{
+          getPConnect: () => ({
+            setInheritedProp: () => undefined,
+            getChildren: () =>
+              pyReviewRaw.children[1].children.map((child, index) => {
+                return {
+                  getPConnect: () => ({
+                    getRawMetadata: () => child,
+                    getConfigProps: () => undefined,
+                    resolveConfigProps: () => regionChildrenResolved[index],
+                    getComponent: () => props.getPConnect().createComponent(pyReviewRaw.children[1].children[index])
+                  })
+                };
+              })
+          })
+        }}
+      />
     </{{COMPONENT_CLASS_NAME}}>
   );
 };

package/src/tasks/create/templates/Constellation/template/DETAILS-region/index.tsx.mustache

@@ -21,8 +21,7 @@ interface {{COMPONENT_CLASS_NAME}}Props extends PConnFieldProps {
 // 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
 function {{COMPONENT_CLASS_NAME}}(props: {{COMPONENT_CLASS_NAME}}Props) {
-
-  const { getPConnect, label, children, showLabel = true, showHighlightedData = false  } = props;
+  const { getPConnect, label, children, showLabel = true, showHighlightedData = false } = props;
   const propsToUse = { label, showLabel, ...getPConnect().getInheritedProps() };
 
   // update children with readonly
@@ -34,7 +33,7 @@ function {{COMPONENT_CLASS_NAME}}(props: {{COMPONENT_CLASS_NAME}}Props) {
   });
 
   const numRegions = getAllFields(getPConnect)?.length;
-  const gridRepeat = "repeat(".concat(numRegions.toString()).concat(", 1fr)");
+  const gridRepeat = 'repeat('.concat(numRegions.toString()).concat(', 1fr)');
 
   const gridContainer: GridContainerProps = { colGap: 6 };
   gridContainer.cols = gridRepeat;
@@ -46,7 +45,7 @@ function {{COMPONENT_CLASS_NAME}}(props: {{COMPONENT_CLASS_NAME}}Props) {
     // @ts-ignore
     const { highlightedData = [] } = getPConnect().getRawMetadata().config;
     // @ts-ignore
-    highlightedDataArr = highlightedData.map((field) => {
+    highlightedDataArr = highlightedData.map(field => {
       return <HighlightRender field={field} getPConnect={props.getPConnect} />;
     });
   }
@@ -55,39 +54,32 @@ function {{COMPONENT_CLASS_NAME}}(props: {{COMPONENT_CLASS_NAME}}Props) {
     <Styled{{COMPONENT_CLASS_NAME}}Wrapper>
 {{! pick new delimiters for mustache }}
 {{=<% %>=}}
-    <FieldGroup name={propsToUse.showLabel ? propsToUse.label : ''}>
-      {showHighlightedData && highlightedDataArr.length > 0 && (
+      <FieldGroup name={propsToUse.showLabel ? propsToUse.label : ''}>
+        {showHighlightedData && highlightedDataArr.length > 0 && (
           <>
-            <Flex
-              container={{ direction: 'row', alignItems: 'start', colGap: 10 }}
-              data-testid={`highlighted-column-count-${numRegions}`}
-            >
+            <Flex container={{ direction: 'row', alignItems: 'start', colGap: 10 }} data-testid={`highlighted-column-count-${numRegions}`}>
               {highlightedDataArr.map((child: any, i: number) => (
                 <Fragment key={`hf-${i + 1}`}>{child}</Fragment>
               ))}
             </Flex>
             <StyledHighlightedFieldsHrLine />
           </>
-      )}
-      <Grid
-        as={StyledDetailsGridContainer}
-        container={gridContainer}
-        data-testid={`column-count-${numRegions}`} >
-       {children.map((child: any, i: number) => (
-        <Flex
-          // @ts-ignore
-          container={{ direction: 'column', alignItems: 'normal', colGap: 1, rowGap: 1.5 }}
-          key={`r-${i + 1}`}
-        >
-          <DetailsRender child={child} />
-        </Flex>
-       ))}
-      </Grid>
-    </FieldGroup>
+        )}
+        <Grid as={StyledDetailsGridContainer} container={gridContainer} data-testid={`column-count-${numRegions}`}>
+          {children.map((child: any, i: number) => (
+            <Flex
+              // @ts-ignore
+              container={{ direction: 'column', alignItems: 'normal', colGap: 1, rowGap: 1.5 }}
+              key={`r-${i + 1}`}
+            >
+              <DetailsRender child={child} />
+            </Flex>
+          ))}
+        </Grid>
+      </FieldGroup>
 <%={{ }}=%>     {{! revert delimiters for mustache }}
     </Styled{{COMPONENT_CLASS_NAME}}Wrapper>
   );
-
 }
 
 export default withConfiguration({{COMPONENT_CLASS_NAME}});