Tighten it up

Author: brandonkelly

src/base/Element.php

@@ -4006,7 +4006,7 @@ public function getAltActions(): array
             }
         }
 
-        if ($this->getIsDraft()) {
+        if ($this->getIsDraft() && !$this->getIsUnpublishedDraft() && !$this->isProvisionalDraft) {
             $altActions[] = [
                 'label' => Craft::t('app', 'Save as a new {type}', [
                     'type' => Craft::t('app', 'draft'),

src/controllers/ElementsController.php

@@ -1659,9 +1659,11 @@ public function actionDuplicate(): ?Response
         $elementsService = Craft::$app->getElements();
         $user = static::currentUser();
 
+        $isExplicitDraft = $element->getIsDraft() && !$element->getIsUnpublishedDraft() && !$element->isProvisionalDraft;
+
         // save as a new is now available to people who can create drafts
         $asUnpublishedDraft = $this->_asUnpublishedDraft && $element::hasDrafts();
-        if ($asUnpublishedDraft || $element->getIsDraft()) {
+        if ($asUnpublishedDraft || $isExplicitDraft) {
             $authorized = $elementsService->canDuplicateAsDraft($element, $user);
         } else {
             $authorized = $elementsService->canDuplicate($element, $user);
@@ -1673,7 +1675,7 @@ public function actionDuplicate(): ?Response
 
         $newAttributes = [
             'isProvisionalDraft' => false,
-            'draftId' => $element->draftId,
+            'draftId' => $isExplicitDraft ? $element->draftId : null,
         ];
 
         if ($asUnpublishedDraft &&