fix help text logic

Author: ekraffmiller

public/locales/en/dataset.json

@@ -114,7 +114,7 @@
   "publish": {
     "draftQuestion": "Are you sure you want to publish this dataset? Once you do so, it must remain public.",
     "previouslyReleasedQuestion": "Are you sure you want to republish this dataset?",
-    "releaseCollectionQuestion": "This dataset cannot be published until <a>{{parentCollectionName}}</a> is published. Would you like to publish both right now?",
+    "releaseCollectionQuestion": "This dataset cannot be published until <a>{{parentCollectionName}}</a> is published. Would you like to publish both right now?  Once you do so, it must remain public.",
     "requiresMajorRelease": "Due to the nature of the changes to the current draft this will be a major release ({{versionNumber}})",
     "termsText": "To change the terms for this version, click the Cancel button and go to the Terms tab for this dataset.",
     "selectVersion": "Select if this is a minor or major version update.",

src/sections/dataset/publish-dataset/PublishDatasetHelpText.tsx

@@ -35,11 +35,11 @@ export function PublishDatasetHelpText({
             components={{ a: <Link to={RouteWithParams.COLLECTIONS(parentCollectionId)} /> }}
           />
         )}
-        {releasedVersionExists && !requiresMajorVersionUpdate && (
-          <>{t('publish.previouslyReleasedQuestion')}</>
-        )}
+        {releasedVersionExists && <>{t('publish.previouslyReleasedQuestion')}</>}
+      </p>
+      <p>
         {releasedVersionExists && requiresMajorVersionUpdate && (
-          <Trans t={t} i18nKey={'publish.requiresMajorRelease'} values={{ nextMajorVersion }} />
+          <>{t('publish.requiresMajorRelease', { versionNumber: nextMajorVersion })}</>
         )}
       </p>
       <p>{t('publish.termsText')}</p>

src/stories/dataset/publish-dataset/PublishDatasetModal.stories.tsx

@@ -74,3 +74,19 @@ export const Superuser: Story = {
       handleClose={() => {}}></PublishDatasetModal>
   )
 }
+export const RequiresMajorVersionUpdate: Story = {
+  decorators: [WithLoggedInUser],
+  render: () => (
+    <PublishDatasetModal
+      show={true}
+      repository={new DatasetMockRepository()}
+      collectionRepository={new CollectionMockRepository()}
+      parentCollection={UpwardHierarchyNodeMother.createCollection()}
+      persistentId={'test'}
+      releasedVersionExists={true}
+      nextMinorVersion={'1.1'}
+      nextMajorVersion={'2.0'}
+      requiresMajorVersionUpdate={true}
+      handleClose={() => {}}></PublishDatasetModal>
+  )
+}