Only show draft publish button for draft feature flag. Fix bug in staging draft publishing.

Author: rtibbles

contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.spec.js

@@ -20,6 +20,7 @@ const GETTERS = {
   global: {
     isCompactViewMode: jest.fn(),
     appendChannelName: () => () => jest.fn(),
+    hasFeatureEnabled: () => () => false,
   },
   currentChannel: {
     rootId: () => ROOT_ID,

contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/index.vue

@@ -227,7 +227,7 @@
             </VBtn>
 
             <VBtn
-              v-if="false"
+              v-if="showDraftMode"
               color="primary"
               data-test="display-publish-draft-dialog-btn"
               @click="displayPublishDraftDialog = true"
@@ -365,6 +365,7 @@
   import MainNavigationDrawer from 'shared/views/MainNavigationDrawer';
   import OfflineText from 'shared/views/OfflineText';
   import { Channel } from 'shared/data/resources';
+  import { FeatureFlagKeys } from 'shared/constants';
 
   export default {
     name: 'StagingTreePage',
@@ -409,7 +410,7 @@
       };
     },
     computed: {
-      ...mapGetters(['isCompactViewMode']),
+      ...mapGetters(['isCompactViewMode', 'hasFeatureEnabled']),
       ...mapGetters('currentChannel', [
         'currentChannel',
         'rootId',
@@ -492,6 +493,9 @@
       fileSizeDiff() {
         return this.fileSizeStaged - this.fileSizeLive;
       },
+      showDraftMode() {
+        return this.hasFeatureEnabled(FeatureFlagKeys.draft_channels);
+      },
     },
     watch: {
       nodeId(newNodeId) {
@@ -648,7 +652,6 @@
         this.isPublishingDraft = true;
 
         this.publishStagingChannel()
-          .then(publishDraftchange => Channel.waitForPublishingDraft(publishDraftchange))
           .then(() => {
             this.isPublishingDraft = false;
             this.showSnackbar({