box-ui-elements 15.1.0-beta.10 → 15.1.0-beta.13

package/src/elements/content-sidebar/versions/__tests__/__snapshots__/VersionsSidebarContainer.test.js.snap

@@ -1,74 +1,40 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`elements/content-sidebar/versions/VersionsSidebarContainer handleFetchError should create StaticVersionSidebar if versionUpsellExperience is STATIC_VERSION_HISTORY 1`] = `
+exports[`elements/content-sidebar/versions/VersionsSidebarContainer handleFetchError should create StaticVersionSidebar if onUpgradeClick is present 1`] = `
 <StaticVersionsSidebar
   error={
     Object {
-      "defaultMessage": "Sorry, version history is not available with your current account plan. To access versioning, select from one of our paid plans.",
-      "id": "be.sidebarVersions.notAvailable",
-    }
-  }
-  errorTitle={
-    Object {
-      "defaultMessage": "You don't have access to versioning",
-      "id": "be.sidebarVersions.accessError",
+      "defaultMessage": "File versions could not be retrieved.",
+      "id": "be.sidebarVersions.fetchError",
     }
   }
   isLoading={false}
   isWatermarked={false}
   onUpgradeClick={[Function]}
   parentName=""
-  showUpsellWithPicture={false}
   versionCount={0}
   versionLimit={Infinity}
   versions={Array []}
 />
 `;
 
-exports[`elements/content-sidebar/versions/VersionsSidebarContainer handleFetchError should create StaticVersionSidebar if versionUpsellExperience is STATIC_VERSION_HISTORY_WITH_PICTURE 1`] = `
-<StaticVersionsSidebar
-  error={
-    Object {
-      "defaultMessage": "Sorry, version history is not available with your current account plan. To access versioning, select from one of our paid plans.",
-      "id": "be.sidebarVersions.notAvailable",
-    }
-  }
-  errorTitle={
-    Object {
-      "defaultMessage": "You don't have access to versioning",
-      "id": "be.sidebarVersions.accessError",
-    }
-  }
-  isLoading={false}
-  isWatermarked={false}
-  onUpgradeClick={[Function]}
-  parentName=""
-  showUpsellWithPicture={true}
-  versionCount={0}
-  versionLimit={Infinity}
-  versions={Array []}
-/>
-`;
-
-exports[`elements/content-sidebar/versions/VersionsSidebarContainer handleFetchError should set state to default values with error upsell message if onUpgradeClick is set 1`] = `
-<StaticVersionsSidebar
+exports[`elements/content-sidebar/versions/VersionsSidebarContainer handleFetchError should set state to default values with error message 1`] = `
+<VersionsSidebar
   error={
     Object {
-      "defaultMessage": "Sorry, version history is not available with your current account plan. To access versioning, select from one of our paid plans.",
-      "id": "be.sidebarVersions.notAvailable",
-    }
-  }
-  errorTitle={
-    Object {
-      "defaultMessage": "You don't have access to versioning",
-      "id": "be.sidebarVersions.accessError",
+      "defaultMessage": "File versions could not be retrieved.",
+      "id": "be.sidebarVersions.fetchError",
     }
   }
+  fileId="12345"
   isLoading={false}
   isWatermarked={false}
-  onUpgradeClick={[Function]}
+  onDelete={[Function]}
+  onDownload={[Function]}
+  onPreview={[Function]}
+  onPromote={[Function]}
+  onRestore={[Function]}
   parentName=""
-  showUpsellWithPicture={false}
   versionCount={0}
   versionLimit={Infinity}
   versions={Array []}

package/src/elements/content-sidebar/versions/messages.js

@@ -147,11 +147,6 @@ const messages = defineMessages({
         defaultMessage: 'Server Error',
         description: 'Heading for inline error messages displayed due to a remote server issue.',
     },
-    versionAccessError: {
-        id: 'be.sidebarVersions.accessError',
-        defaultMessage: "You don't have access to versioning",
-        description: 'Heading for inline error messages with upsell.',
-    },
     versionUpgradeLink: {
         id: 'be.sidebarVersions.upgradeLink',
         defaultMessage: 'Upgrade Now',

package/src/features/unified-share-modal/UnifiedShareForm.js

@@ -575,32 +575,28 @@ class UnifiedShareForm extends React.Component<USFProps, State> {
     }
 
     renderUpgradeLinkDescription() {
-        const { openUpgradePlanModal = () => {}, showNewUpgradeText = false, trackingProps = {} } = this.props;
+        const { openUpgradePlanModal = () => {}, trackingProps = {} } = this.props;
         const { inviteCollabsEmailTracking = {} } = trackingProps;
         const { upgradeLinkProps = {} } = inviteCollabsEmailTracking;
 
         return (
             <div className="upgrade-description">
                 <UpgradeBadge />
-                {showNewUpgradeText ? (
-                    this.renderCollaboratorMessage('external_collab_newcopy_upgrade_cta')
-                ) : (
-                    <FormattedMessage
-                        values={{
-                            upgradeGetMoreAccessControlsLink: (
-                                <PlainButton
-                                    className="upgrade-link"
-                                    onClick={openUpgradePlanModal}
-                                    type="button"
-                                    {...upgradeLinkProps}
-                                >
-                                    <FormattedMessage {...messages.upgradeGetMoreAccessControlsLink} />
-                                </PlainButton>
-                            ),
-                        }}
-                        {...messages.upgradeGetMoreAccessControlsDescription}
-                    />
-                )}
+                <FormattedMessage
+                    values={{
+                        upgradeGetMoreAccessControlsLink: (
+                            <PlainButton
+                                className="upgrade-link"
+                                onClick={openUpgradePlanModal}
+                                type="button"
+                                {...upgradeLinkProps}
+                            >
+                                <FormattedMessage {...messages.upgradeGetMoreAccessControlsLink} />
+                            </PlainButton>
+                        ),
+                    }}
+                    {...messages.upgradeGetMoreAccessControlsDescription}
+                />
             </div>
         );
     }

package/src/features/unified-share-modal/__tests__/UnifiedShareForm.test.js

@@ -215,18 +215,6 @@ describe('features/unified-share-modal/UnifiedShareForm', () => {
             expect(wrapper.exists('UpgradeBadge')).toBe(true);
         });
 
-        test('should render correct copy of upgrade CTA when showUpgradeOptions and showNewUpgradeText is enabled', () => {
-            const wrapper = getWrapper({
-                canInvite: true,
-                isFetching: false,
-                showNewUpgradeText: true,
-                showUpgradeOptions: true,
-            });
-            expect(wrapper.exists('UpgradeBadge')).toBe(true);
-            const msg = wrapper.find('FormattedCompMessage');
-            expect(msg.prop('id')).toEqual('boxui.unifiedShare.upgradeCollaboratorAccessDescription');
-        });
-
         test('should render correct upgrade inline notice when showUpgradeInlineNotice and showUpgradeOptions is enabled', () => {
             const wrapper = getWrapper({
                 canInvite: true,

package/src/features/unified-share-modal/flowTypes.js

@@ -393,8 +393,6 @@ export type USFProps = BaseUnifiedShareProps & {
     sharedLinkLoaded: boolean,
     /** Whether the FTUX tooltip should be rendered */
     shouldRenderFTUXTooltip: boolean,
-    /** Whether the new upgrade text should be rendered */
-    showNewUpgradeText?: boolean,
     /** Whether the upgrade inline notice should be rendered */
     showUpgradeInlineNotice?: boolean,
 };