@imposium-hub/components 2.9.0-8 → 2.9.0

package/src/components/field-wrapper/FieldWrapper.tsx

@@ -14,6 +14,7 @@ interface IFieldWrapperProps {
     width?: string | number;
     labelPosition?: string;
     labelWidth?: string | number;
+    header?: boolean;
 }
 
 interface IFieldWrapperState {
@@ -87,7 +88,7 @@ class FieldWrapper extends React.PureComponent<IFieldWrapperProps, IFieldWrapper
     }
 
     public render() {
-        const { label, width, customClass } = this.props;
+        const { label, width, customClass, header } = this.props;
         const labelJSX = this.renderLabel();
 
         const style = {};
@@ -100,19 +101,22 @@ class FieldWrapper extends React.PureComponent<IFieldWrapperProps, IFieldWrapper
         }
 
         return (
-            <div
-                className={`form-field ${customClass} ${this.getLabelClass()}`}
-                style={style}>
-                {labelJSX}
+            <>
+                {header && this.renderButtons()}
                 <div
-                    className={`form-field-content ${this.getLabelClass()}`}
-                    {...fieldProps}>
-                    {this.props.children}
-                    {this.renderButtons()}
+                    className={`form-field ${customClass} ${this.getLabelClass()}`}
+                    style={style}>
+                    {labelJSX}
+                    <div
+                        className={`form-field-content ${this.getLabelClass()}`}
+                        {...fieldProps}>
+                        {this.props.children}
+                        {!header && this.renderButtons()}
+                    </div>
+                    {renderTooltip(this.tooltipId, this.props.tooltip)}
+                    {this.renderInfo()}
                 </div>
-                {renderTooltip(this.tooltipId, this.props.tooltip)}
-                {this.renderInfo()}
-            </div>
+            </>
         );
     }
 

package/src/components/header/Header.tsx

@@ -211,6 +211,7 @@ class ImposiumHeader extends React.PureComponent<IHeaderProps, IHeaderState> {
                                 api.cacheActiveStory(activeServiceId, orgId, storyId);
                             } else {
                                 pushRoute(`/${orgId}`);
+                                api.cacheActiveStory(activeServiceId, orgId);
                             }
                         })
                         .catch((e) => {

package/src/components/publish-wizard/publish/EmailWorkflow.tsx

@@ -729,7 +729,9 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
         };
 
         if (!publishDataset) {
-            emailOptions.push(downloadSampleCsv);
+            if (!batchError) {
+                emailOptions.push(downloadSampleCsv);
+            }
             emailOptions.push(selectCsv);
         } else {
             emailOptions.push(uploadDataset);
@@ -793,7 +795,7 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
 
         const downloadCSV = (
             <>
-                {this.props.error ? (this.props.next ? downloadCSVDiv : '') : downloadCSVDiv}
+                {downloadCSVDiv}
                 {this.renderColumnMap()}
             </>
         );
@@ -869,6 +871,13 @@ class EmailWorkflow extends React.PureComponent<IEmailWorkflowProps, IEmailWorkf
                             />
                         );
                     })}
+                    {batchError && (
+                        <BigButton
+                            label={downloadCsvLabel}
+                            disabled={downloading}
+                            onClick={() => this.downloadCsv()}
+                        />
+                    )}
                 </div>
             </div>
         );

package/src/components/slider-field/SliderField.tsx

@@ -39,7 +39,6 @@ class SliderField extends React.PureComponent<ISliderFieldProps, ISliderFieldSta
     }
 
     private updateValue(val) {
-        console.log('updateValue', val);
         this.props.onChange(val);
     }
 

package/src/components/text-field/TextField.tsx

@@ -46,6 +46,7 @@ interface ITextFieldProps {
     labelWidth?: string | number;
     className?: string;
     maxLength?: number;
+    header?: boolean;
 }
 
 interface ITextFieldState {
@@ -487,7 +488,8 @@ class TextField extends React.PureComponent<ITextFieldProps, ITextFieldState> {
     }
 
     public render() {
-        const { label, width, tooltip, info, labelPosition, labelWidth, className } = this.props;
+        const { label, width, tooltip, info, labelPosition, labelWidth, className, header } =
+            this.props;
         return (
             <FieldWrapper
                 customClass={`text-field ${className}`}
@@ -497,7 +499,8 @@ class TextField extends React.PureComponent<ITextFieldProps, ITextFieldState> {
                 info={info}
                 labelPosition={labelPosition}
                 labelWidth={labelWidth}
-                width={width}>
+                width={width}
+                header={header}>
                 {this.renderInput()}
             </FieldWrapper>
         );

package/src/services/API.ts

@@ -146,7 +146,7 @@ export interface IImposiumAPI {
     getAssetMap(storyId: string);
     clearStoryCache(storyId: string);
     debugId(id: string);
-    cacheActiveStory(serviceId: any, orgId: string, storyId: string);
+    cacheActiveStory(serviceId: any, orgId: string, storyId?: string);
     getCachedStoryForOrg(serviceId: string, orgId: string);
     getAccessData(includeTotalRenders?: boolean, orgId?: string);
     deleteExperience(experienceId: string, eraseMedia?: boolean);
@@ -1655,16 +1655,21 @@ export default class API {
         });
     };
 
-    public cacheActiveStory = (serviceId, orgId, storyId): Promise<any | Error> => {
+    public cacheActiveStory = (serviceId, orgId, storyId?): Promise<any | Error> => {
         const route = `/service/${serviceId}/${orgId}/active`;
 
+        const data: any = {
+            organization_id: orgId
+        };
+
+        if (storyId) {
+            data['story_id'] = storyId;
+        }
+
         return this.doRequest({
             method: 'POST',
             url: route,
-            data: {
-                story_id: storyId,
-                organization_id: orgId
-            }
+            data
         });
     };