@imposium-hub/components 2.11.5-0 → 2.11.5-1

package/src/components/app-wrapper/AppWrapper.tsx

@@ -238,7 +238,7 @@ export const AppWrapper: React.FC<IAppWrapperProps> = (props) => {
             if (crmApi && crmBaseUrl) {
                 crmApi.init(crmBaseUrl, getAccessTokenSilently);
             }
-            api.getAccessData(false)
+            api.getAccessData(false, storyId)
                 .then((freshAccess: any) => {
                     props.setAccessData(freshAccess);
                     propagateCreds(freshAccess);
@@ -246,7 +246,7 @@ export const AppWrapper: React.FC<IAppWrapperProps> = (props) => {
                 .catch((e: Error) => {
                     setErrorState(APP_WRAPPER_ERROR_STATES.UNAUTHORIZED_ORG);
 
-                    // Attempt to get the access data again without the org ID, so we can at least shoe the user the org dropdown
+                    // Attempt to get the access data again without the org ID, so we can at least show the user the org dropdown
                     api.init(baseUrl, getAccessTokenSilently, null);
                     if (crmApi && crmBaseUrl) {
                         crmApi.init(crmBaseUrl, getAccessTokenSilently);

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

@@ -24,6 +24,7 @@ import PublishStatusIndicator from './publish/PublishStatusIndicator';
 import { bindActionCreators } from 'redux';
 import { publishVersion } from '../../redux/actions/publish';
 import { connect } from 'react-redux';
+import { CRM_INTEGRATED_PROJECT_TYPES } from '../../constants/publish';
 
 interface IPublishWizardProps {
     fromCrM?: boolean;
@@ -334,10 +335,17 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
         const { story, project, fromCrM } = this.props;
         const variables = story ? story.acts[project.actId].inventory : {};
         const varLength = variables ? Object.keys(variables).length : 0;
+        const projectType = story.creativeId
+            ? CRM_INTEGRATED_PROJECT_TYPES.SINGLE_CREATIVE
+            : CRM_INTEGRATED_PROJECT_TYPES.MULTI_CREATIVE;
 
         if (fromCrM && varLength === 0) {
             return true;
-        } else if (fromCrM && this.state.selectedCreatives.length === 0) {
+        } else if (
+            fromCrM &&
+            this.state.selectedCreatives.length === 0 &&
+            projectType === CRM_INTEGRATED_PROJECT_TYPES.MULTI_CREATIVE
+        ) {
             return true;
         }
         return false;
@@ -357,7 +365,7 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
 
     private renderLowerButtons() {
         const { screenIndex, done, error, next } = this.state;
-        const { fromCrM } = this.props;
+        const { fromCrM, story } = this.props;
         const { publishing } = this.props.publishData;
         const disabledForCrM = this.shouldDisablePublishButtonForCrM();
         const lowerButtons = [];
@@ -366,8 +374,13 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
         if (screenIndex === 0) {
             // publish
 
+            const projectType = story.creativeId
+                ? CRM_INTEGRATED_PROJECT_TYPES.SINGLE_CREATIVE
+                : CRM_INTEGRATED_PROJECT_TYPES.MULTI_CREATIVE;
             const btnCopy = fromCrM
-                ? `Publish to ${this.state.selectedCreatives.length} Creatives`
+                ? projectType === CRM_INTEGRATED_PROJECT_TYPES.MULTI_CREATIVE
+                    ? `Publish to ${this.state.selectedCreatives.length} Creatives`
+                    : 'Publish to Creative Manager'
                 : copy.publish.btnPublish;
             lowerButtons.push(
                 <Button
@@ -461,7 +474,9 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
         const { publishError } = this.state;
         const errorCopyForCrM = this.getErrorCopyForCrMPublish();
         const errorCopy = publishError ? publishError : errorCopyForCrM ? errorCopyForCrM : null;
-
+        const projectType = story.creativeId
+            ? CRM_INTEGRATED_PROJECT_TYPES.SINGLE_CREATIVE
+            : CRM_INTEGRATED_PROJECT_TYPES.MULTI_CREATIVE;
         const error = errorCopy ? (
             <p className='publish-error'>
                 <span className='icon'>{ICON_EXCLAIMATION_TRIANGLE}</span>&nbsp;&nbsp;{errorCopy}
@@ -471,6 +486,7 @@ class PublishWizard extends React.PureComponent<IPublishWizardProps, IPublishWiz
         if (fromCrM) {
             return (
                 <CrMPublishUI
+                    projectType={projectType}
                     selectedCreatives={this.state.selectedCreatives}
                     onUpdateSelectedCreatives={(c) => this.setState({ selectedCreatives: c })}
                     onError={(e) => this.setState({ publishError: e })}

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

@@ -3,7 +3,10 @@ import * as copy from '../../../constants/copy';
 import { DataTable, HRule, Button, IImposiumAPI, TextField } from '../../..';
 import { useEffect, useState, useCallback } from 'react';
 import { ICON_SEARCH } from '../../../constants/icons';
-import { CREATIVE_STATUSES_TO_PUBLISH } from '../../../constants/publish';
+import {
+    CREATIVE_STATUSES_TO_PUBLISH,
+    CRM_INTEGRATED_PROJECT_TYPES
+} from '../../../constants/publish';
 import { CrMPublishStatusCell } from './CrMPublishStatusCell';
 import { CrMPublishPreviewCell } from './CrMPublishPreviewCell';
 import { CrMPublishNameCell } from './CrMPublishNameCell';
@@ -11,6 +14,7 @@ import { CrMPublishCreativeSelectHeader } from './CrMPublishCreativeSelectHeader
 import { CrMPublishCreativeSelectCell } from './CrMPublishCreativeSelectCell';
 
 interface ICrmPublishUIProps {
+    projectType: string;
     publishing: boolean;
     error: React.ReactNode;
     api: IImposiumAPI;
@@ -24,6 +28,7 @@ interface ICrmPublishUIProps {
 
 export const CrMPublishUI: React.FC<ICrmPublishUIProps> = (props) => {
     const {
+        projectType,
         publishing,
         error,
         crmBaseUrl,
@@ -164,30 +169,41 @@ export const CrMPublishUI: React.FC<ICrmPublishUIProps> = (props) => {
             });
     }, []);
 
-    return (
-        <div>
-            <h2>{copy.publish.publishStepTitleFromCrM}</h2>
-            <HRule />
-            <p>{publishing ? copy.publish.publishInProgress : ''}</p>
-            <DataTable
-                showInterstitial={publishing}
-                columns={COLUMN_CONFIG}
-                data={
-                    nameFilter
-                        ? creativeConfig.filter((creative) => {
-                              return creative.creativeName
-                                  .toLowerCase()
-                                  .includes(nameFilter.toLowerCase());
-                          })
-                        : creativeConfig
-                }
-                hidePaginator={true}
-                itemsPerPage={1000}
-                tightRows={true}
-            />
-            {error && <p className='publish-error'>{error}</p>}
-        </div>
-    );
+    if (projectType === CRM_INTEGRATED_PROJECT_TYPES.MULTI_CREATIVE) {
+        return (
+            <div>
+                <h2>{copy.publish.publishStepTitleFromCrM}</h2>
+                <HRule />
+                <p>{publishing ? copy.publish.publishInProgress : ''}</p>
+                <DataTable
+                    showInterstitial={publishing}
+                    columns={COLUMN_CONFIG}
+                    data={
+                        nameFilter
+                            ? creativeConfig.filter((creative) => {
+                                  return creative.creativeName
+                                      .toLowerCase()
+                                      .includes(nameFilter.toLowerCase());
+                              })
+                            : creativeConfig
+                    }
+                    hidePaginator={true}
+                    itemsPerPage={1000}
+                    tightRows={true}
+                />
+                {error && <p className='publish-error'>{error}</p>}
+            </div>
+        );
+    } else {
+        return (
+            <div>
+                <h2>{copy.publish.publishStepTitle}</h2>
+                <HRule />
+                <p>{publishing ? copy.publish.publishInProgress : copy.publish.publishStepDesc}</p>
+                {error && <p className='publish-error'>{error}</p>}
+            </div>
+        );
+    }
 };
 
 export const canBePublishedTo = (approvalStatus: string) => {

package/src/constants/publish.ts

@@ -34,6 +34,7 @@ export const CREATIVE_STATUSES = {
     PRODUCTION_INCOMPLETE: 'PRODUCTION_INCOMPLETE',
     APPROVED: 'APPROVED',
     REJECTED: 'REJECTED',
+    FAILED: 'FAILED',
     TRANSCODING: 'TRANSCODING',
     TRANSCODING_ERROR: 'TRANSCODING_ERROR',
     SUBMITTED: 'SUBMITTED'
@@ -45,6 +46,7 @@ export const CREATIVE_STATUS_LABELS = {
     PRODUCTION_INCOMPLETE: 'Production',
     APPROVED: 'Approved',
     REJECTED: 'Rejected',
+    FAILED: 'Failed',
     TRANSCODING: 'Transcoding',
     TRANSCODING_ERROR: 'Transcoding Error',
     SUBMITTED: 'Submitted'
@@ -53,5 +55,11 @@ export const CREATIVE_STATUS_LABELS = {
 export const CREATIVE_STATUSES_TO_PUBLISH = [
     CREATIVE_STATUSES.UNSUBMITTED,
     CREATIVE_STATUSES.PRODUCTION_INCOMPLETE,
-    CREATIVE_STATUSES.REJECTED
+    CREATIVE_STATUSES.REJECTED,
+    CREATIVE_STATUSES.FAILED
 ];
+
+export const CRM_INTEGRATED_PROJECT_TYPES = {
+    SINGLE_CREATIVE: 'SINGLE_CREATIVE',
+    MULTI_CREATIVE: 'MULTI_CREATIVE'
+};

package/src/services/API.ts

@@ -152,7 +152,7 @@ export interface IImposiumAPI {
     debugId(id: string);
     cacheActiveStory(serviceId: any, orgId: string, storyId?: string);
     getCachedStoryForOrg(serviceId: string, orgId: string);
-    getAccessData(includeTotalRenders?: boolean, orgId?: string);
+    getAccessData(includeTotalRenders?: boolean, storyId?: string);
     deleteExperience(experienceId: string, eraseMedia?: boolean);
     exportExperiences(experienceId: string, params: any);
     addOrReplaceNote(experienceId: string, notes: string);
@@ -234,7 +234,8 @@ export default class API {
 
     private doRequest = async (
         config: AxiosRequestConfig,
-        organizationId?: string
+        organizationId?: string,
+        storyId?: string
     ): Promise<any> => {
         if (this.authType === API_AUTH_TYPES.TOKEN) {
             const token = await this.getToken();
@@ -246,6 +247,10 @@ export default class API {
                 headers['X-Imposium-Account-Id'] = organizationId;
             }
 
+            if (storyId) {
+                headers['X-Imposium-Project-Id'] = storyId;
+            }
+
             config.headers = headers;
         }
 
@@ -1718,17 +1723,24 @@ export default class API {
         });
     };
 
-    public getAccessData = (getTotalRenders: boolean = false): Promise<any | Error> => {
+    public getAccessData = (
+        getTotalRenders: boolean = false,
+        storyId?: string
+    ): Promise<any | Error> => {
         let route = `/access`;
 
         if (getTotalRenders) {
             route += '?include_total_renders=true';
         }
 
-        return this.doRequest({
-            method: 'GET',
-            url: route
-        });
+        return this.doRequest(
+            {
+                method: 'GET',
+                url: route
+            },
+            null,
+            storyId
+        );
     };
 
     public removeQueueAssoc = (queueId: string, storyId: string): Promise<any> => {