[Content]: Schedule Unpublish Button

cypress/e2e/content/actions.spec.js

@@ -245,6 +245,171 @@ describe("Actions in content editor", () => {
     cy.getBySelector("ContentPublishedIndicator").should("exist");
   });
 
+  it("Schedules an item for unpublishing", () => {
+    const { items, publishItem, publishings } = awaitRequests();
+    cy.visit(
+      `/content/${Cypress.env("modelZUID")}/${CONTENT_ITEMS?.[4]?.meta?.ZUID}`
+    );
+    cy.wait([items, publishings], { requestTimeout });
+
+    // Cancel any stale scheduled unpublish from a prior run so the scheduling
+    // step below reliably opens the ScheduleUnpublishButton (not Unschedule) view.
+    cy.getBySelector("PublishMenuButton").should("exist").should("be.enabled");
+    cy.getBySelector("PublishMenuButton").trigger("click");
+    cy.getBySelector("publishingMenu").within(() => {
+      cy.getBySelector("UnpublishScheduleButton").trigger("click");
+    });
+    cy.getBySelector("ScheduleUnpublishModal")
+      .should("exist")
+      .then(($modal) => {
+        if ($modal.find("[data-cy='UnscheduleUnpublishButton']").length) {
+          cy.wrap($modal)
+            .find("[data-cy='UnscheduleUnpublishButton']")
+            .trigger("click");
+          cy.wait(publishItem);
+          cy.wait(publishings);
+        } else if (
+          $modal.find("[data-cy='CancelScheduleUnpublishButton']").length
+        ) {
+          cy.wrap($modal)
+            .find("[data-cy='CancelScheduleUnpublishButton']")
+            .trigger("click");
+        }
+      });
+
+    cy.getBySelector("PublishMenuButton").should("exist").should("be.enabled");
+    cy.getBySelector("PublishMenuButton").trigger("click");
+
+    cy.getBySelector("publishingMenu")
+      .should("exist")
+      .within(() => {
+        cy.getBySelector("UnpublishScheduleButton").should("exist");
+        cy.getBySelector("UnpublishScheduleButton").trigger("click");
+      });
+
+    cy.getBySelector("ScheduleUnpublishModal")
+      .should("exist")
+      .within(() => {
+        // Assert labeling is correct for the unpublish flow
+        cy.contains("Schedule Unpublish:").should("exist");
+        cy.contains("Unpublish on").should("exist");
+        cy.getBySelector("ScheduleUnpublishButton")
+          .should("exist")
+          .should("contain.text", "Schedule Unpublish");
+        cy.getBySelector("ScheduleUnpublishButton").trigger("click");
+      });
+
+    // Assert the API payload branches correctly for scheduled unpublish
+    cy.wait(publishItem).then((interception) => {
+      const body = interception.request.body;
+      expect(body.publishAt).to.equal("now");
+      expect(body.unpublishAt).to.match(
+        /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/
+      );
+      expect(body.version).to.be.a("number");
+    });
+    cy.wait(publishings);
+
+    cy.getBySelector("ScheduledUnpublishIndicator").should("exist");
+
+    // Assert the menu toggle label flips to "Unschedule Unpublish",
+    // then cancel the schedule so the item is clean for subsequent tests.
+    awaitRequests();
+    cy.getBySelector("PublishMenuButton").trigger("click");
+    cy.getBySelector("publishingMenu").within(() => {
+      cy.getBySelector("UnpublishScheduleButton")
+        .should("contain.text", "Unschedule Unpublish")
+        .trigger("click");
+    });
+    cy.getBySelector("ScheduleUnpublishModal")
+      .should("exist")
+      .within(() => {
+        cy.getBySelector("UnscheduleUnpublishButton").trigger("click");
+      });
+    cy.wait("@publishItem");
+    cy.wait("@publishings");
+  });
+
+  it("Cancels a scheduled unpublish", () => {
+    const { items, publishItem, publishings } = awaitRequests();
+    cy.visit(
+      `/content/${Cypress.env("modelZUID")}/${CONTENT_ITEMS?.[4]?.meta?.ZUID}`
+    );
+    cy.wait([items, publishings], { requestTimeout });
+
+    // If a prior test left a scheduled unpublish on this item, cancel it first
+    // so the scheduling step below reliably opens the SchedulePublishButton view.
+    cy.getBySelector("PublishMenuButton").should("exist").should("be.enabled");
+    cy.getBySelector("PublishMenuButton").trigger("click");
+    cy.getBySelector("publishingMenu")
+      .should("exist")
+      .within(() => {
+        cy.getBySelector("UnpublishScheduleButton").trigger("click");
+      });
+    cy.getBySelector("ScheduleUnpublishModal")
+      .should("exist")
+      .then(($modal) => {
+        if ($modal.find("[data-cy='UnscheduleUnpublishButton']").length) {
+          // Already scheduled — cancel it to restore clean state
+          cy.wrap($modal)
+            .find("[data-cy='UnscheduleUnpublishButton']")
+            .trigger("click");
+          cy.wait(publishItem);
+          cy.wait(publishings);
+        } else {
+          cy.getBySelector("CancelScheduleUnpublishButton").trigger("click");
+        }
+      });
+
+    // Schedule an unpublish so this test is fully self-contained
+    cy.getBySelector("PublishMenuButton").should("exist").should("be.enabled");
+    cy.getBySelector("PublishMenuButton").trigger("click");
+
+    cy.getBySelector("publishingMenu")
+      .should("exist")
+      .within(() => {
+        cy.getBySelector("UnpublishScheduleButton").should("exist");
+        cy.getBySelector("UnpublishScheduleButton").trigger("click");
+      });
+
+    cy.getBySelector("ScheduleUnpublishModal")
+      .should("exist")
+      .within(() => {
+        cy.getBySelector("ScheduleUnpublishButton").should("exist");
+        cy.getBySelector("ScheduleUnpublishButton").trigger("click");
+      });
+
+    cy.wait(publishItem);
+    cy.wait(publishings);
+
+    cy.getBySelector("ScheduledUnpublishIndicator").should("exist");
+
+    // Now cancel the scheduled unpublish
+    cy.getBySelector("PublishMenuButton").trigger("click");
+
+    cy.getBySelector("publishingMenu")
+      .should("exist")
+      .within(() => {
+        cy.getBySelector("UnpublishScheduleButton").should("exist");
+        cy.getBySelector("UnpublishScheduleButton").trigger("click");
+      });
+
+    cy.getBySelector("ScheduleUnpublishModal")
+      .should("exist")
+      .within(() => {
+        // Assert the scheduled date is rendered in the dialog (not blank)
+        cy.contains("scheduled to unpublish on").should("exist");
+        cy.contains(/\w{3} \d{1,2}, \d{4} at \d{1,2}:\d{2}/).should("exist");
+        cy.getBySelector("UnscheduleUnpublishButton").should("exist");
+        cy.getBySelector("UnscheduleUnpublishButton").trigger("click");
+      });
+
+    cy.wait(publishItem);
+    cy.wait(publishings);
+
+    cy.getBySelector("ScheduledUnpublishIndicator").should("not.exist");
+  });
+
   it("Unpublishes an item", () => {
     const { items, deletePublishedItem, publishings } = awaitRequests();
     cy.visit(

public/locales/en-US/content.json

@@ -108,6 +108,7 @@
   "booleanHide": "Hide",
   "booleanShow": "Show",
   "browse": "Browse",
+  "cancelledScheduledUnpublish": "Cancelled scheduled unpublish for {{title}}",
   "closeInspectorPanelAriaLabel": "Close inspector panel",
   "codeSampleBaseTemplate": "Base Template",
   "codeSampleBaseTemplateTip": "Uses the base template for rendering the block. This is the default template applied when no specific template is selected.",
@@ -163,8 +164,10 @@
   "editorTypeWysiwyg": "WYSIWYG",
   "elementNotEditableHere": "This element can't be edited here.",
   "emptyCreateModel": "Please create a new content model",
+  "errorCancellingScheduledUnpublish": "Error cancelling scheduled unpublish for {{title}}",
   "errorPublishing": "Error publishing {{title}}",
   "errorScheduling": "Error scheduling {{title}}",
+  "errorSchedulingUnpublish": "Error scheduling unpublish for {{title}}",
   "errorUnpublishing": "Error unpublishing {{title}}",
   "errorUnschedulingVersion": "Error unscheduling version {{version}}",
   "exceedingMaxLength_one": "Exceeding by {{count}} character.",
@@ -401,6 +404,10 @@
   "itemEditTabRedirects": "Redirects",
   "itemEditTabSeo": "SEO",
   "itemEditTakeOffline": "Take Offline",
+  "itemEditTooltipPublished": "v{{version}} published",
+  "itemEditTooltipSaved": "v{{version}} saved",
+  "itemEditTooltipScheduledToPublish": "v{{version}} scheduled to publish",
+  "itemEditTooltipScheduledToUnpublish": "v{{version}} scheduled to unpublish",
   "itemEditUnlock": "Unlock",
   "itemEditUnpublishContentItemTitle": "Unpublish Content Item",
   "itemEditUnpublishDescription": "This will make it immediately unavailable on all of your platforms. You can always republish this item by clicking on the publish button.",
@@ -410,6 +417,7 @@
   "itemEditUnpublishWidgetDescription": "By unpublishing this content it will no longer be served if the URL is requested. The URL will return a 404 not found response.",
   "itemEditUnsavedChangesDescription": "You have unsaved changes that will be lost if you leave this page.",
   "itemEditUnschedulePublish": "Unschedule Publish",
+  "itemEditUnscheduleUnpublish": "Unschedule Unpublish",
   "itemEditVariant": "Variant",
   "itemEditVariantTitle": "Variant Title",
   "itemEditVersion": "Version",
@@ -419,6 +427,7 @@
   "itemEditVersionSavedOn": "v{{version}} saved on",
   "itemEditVersionScheduledLabel": "v{{version}} Scheduled",
   "itemEditVersionScheduledToPublishOn": "v{{version}} scheduled to publish on",
+  "itemEditVersionScheduledUnpublishLabel": "v{{version}} Scheduled Unpublish",
   "itemEditViewActivityLog": "View Activity Log",
   "itemEditViewLanguages": "View Languages",
   "itemEditViewVersions": "View Versions",
@@ -610,6 +619,7 @@
   "requiresMoreCharacters_one": "Requires {{count}} more character.",
   "requiresMoreCharacters_other": "Requires {{count}} more characters.",
   "scheduledPublish": "Scheduled {{title}} to publish on {{time}} in the {{timezone}} timezone",
+  "scheduledUnpublish": "Scheduled {{title}} to unpublish on {{time}} in the {{timezone}} timezone",
   "selectBlockVariant": "Please select a block variant.",
   "selectedItemNotFound": "Selected item not found: {{value}}",
   "selectPlaceholder": "Select",
@@ -696,9 +706,9 @@
   "studioSaveAllButton": "Save All",
   "studioSaveAndPublish": "Save and Publish",
   "studioSaveAndPublishAllButton": "Save & Publish All",
+  "studioSaveChanges": "Save Changes",
   "studioSaveChangeSectionContent": "Content",
   "studioSaveChangeSectionLayout": "Layout",
-  "studioSaveChanges": "Save Changes",
   "studioSaveChangesSubtitle": "Would you like to save or save and publish your changes?",
   "studioSaveChangesTypeColumn": "Type",
   "studioSaveChangesVersionColumn": "Vers.",

public/locales/en-US/shell.json

@@ -483,6 +483,15 @@
   "schedulePublishTitleUnschedule": "Unschedule Publish",
   "schedulePublishUnscheduleButton": "Unschedule Publish",
   "schedulePublishUnscheduleInfo": "This will enable the ability to schedule or publish other versions of this content item",
+  "scheduleUnpublishButton": "Schedule Unpublish",
+  "scheduleUnpublishCancelsScheduledPublishWarning": "v{{version}} is scheduled to publish. Scheduling an unpublish will cancel that scheduled publish.",
+  "scheduleUnpublishOnLabel": "Unpublish on",
+  "scheduleUnpublishPastWarning": "Since the selected time is a current or past date, this will be immediately unpublished.",
+  "scheduleUnpublishScheduledInfo": "v{{version}} is scheduled to unpublish on {{date}} in {{timezone}}.",
+  "scheduleUnpublishTitleSchedule": "Schedule Unpublish",
+  "scheduleUnpublishTitleUnschedule": "Unschedule Unpublish",
+  "scheduleUnpublishUnscheduleButton": "Cancel Scheduled Unpublish",
+  "scheduleUnpublishUnscheduleInfo": "This will cancel the scheduled unpublish and keep this content item published.",
   "searchIn": "Search in...",
   "searchInstancePlaceholder": "Search Instance {{shortcut}}",
   "searchInstances": "Search Instances",

public/locales/es-ES/content.json

@@ -109,6 +109,7 @@
   "booleanHide": "Ocultar",
   "booleanShow": "Mostrar",
   "browse": "Explorar",
+  "cancelledScheduledUnpublish": "Se ha cancelado la anulación de publicación programada de {{title}}",
   "closeInspectorPanelAriaLabel": "Cerrar panel del inspector",
   "codeSampleBaseTemplate": "Plantilla base",
   "codeSampleBaseTemplateTip": "Usa la plantilla base para representar el bloque. Es la plantilla predeterminada que se aplica cuando no se selecciona ninguna plantilla específica.",
@@ -167,8 +168,10 @@
   "editorTypeWysiwyg": "WYSIWYG",
   "elementNotEditableHere": "Este elemento no se puede editar aquí.",
   "emptyCreateModel": "Crea un nuevo modelo de contenido",
+  "errorCancellingScheduledUnpublish": "Error al cancelar la anulación de publicación programada de {{title}}",
   "errorPublishing": "Error al publicar {{title}}",
   "errorScheduling": "Error al programar {{title}}",
+  "errorSchedulingUnpublish": "Error al programar la anulación de publicación de {{title}}",
   "errorUnpublishing": "Error al anular la publicación de {{title}}",
   "errorUnschedulingVersion": "Error al cancelar la programación de la versión {{version}}",
   "exceedingMaxLength_one": "Excede por {{count}} carácter.",
@@ -406,6 +409,10 @@
   "itemEditTabRedirects": "Redirecciones",
   "itemEditTabSeo": "SEO",
   "itemEditTakeOffline": "Desconectar",
+  "itemEditTooltipPublished": "v{{version}} publicada",
+  "itemEditTooltipSaved": "v{{version}} guardada",
+  "itemEditTooltipScheduledToPublish": "v{{version}} programada para publicarse",
+  "itemEditTooltipScheduledToUnpublish": "v{{version}} programada para anular su publicación",
   "itemEditUnlock": "Desbloquear",
   "itemEditUnpublishContentItemTitle": "Anular publicacion del elemento de contenido",
   "itemEditUnpublishDescription": "Esto hara que no este disponible inmediatamente en todas tus plataformas. Siempre puedes volver a publicar este elemento haciendo clic en el boton de publicar.",
@@ -415,6 +422,7 @@
   "itemEditUnpublishWidgetDescription": "Al anular la publicacion de este contenido, ya no se servira si se solicita la URL. La URL devolvera una respuesta 404 no encontrado.",
   "itemEditUnsavedChangesDescription": "Tienes cambios sin guardar que se perderan si sales de esta pagina.",
   "itemEditUnschedulePublish": "Cancelar publicacion programada",
+  "itemEditUnscheduleUnpublish": "Cancelar anulación de publicación programada",
   "itemEditVariant": "Variante",
   "itemEditVariantTitle": "Titulo de variante",
   "itemEditVersion": "Versión",
@@ -424,6 +432,7 @@
   "itemEditVersionSavedOn": "v{{version}} guardada el",
   "itemEditVersionScheduledLabel": "v{{version}} programada",
   "itemEditVersionScheduledToPublishOn": "v{{version}} programada para publicarse el",
+  "itemEditVersionScheduledUnpublishLabel": "v{{version}} Anulación de publicación programada",
   "itemEditViewActivityLog": "Ver registro de actividad",
   "itemEditViewLanguages": "Ver idiomas",
   "itemEditViewVersions": "Ver versiones",
@@ -627,6 +636,7 @@
   "requiresMoreCharacters_many": "Requiere {{count}} caracteres más.",
   "requiresMoreCharacters_other": "Requiere {{count}} caracteres más.",
   "scheduledPublish": "Se ha programado la publicación de {{title}} para el {{time}} en la zona horaria {{timezone}}",
+  "scheduledUnpublish": "Se ha programado la anulación de la publicación de {{title}} para el {{time}} en la zona horaria {{timezone}}",
   "selectBlockVariant": "Seleccione una variante de bloque.",
   "selectedItemNotFound": "Elemento seleccionado no encontrado: {{value}}",
   "selectPlaceholder": "Seleccionar",
@@ -716,9 +726,9 @@
   "studioSaveAllButton": "Guardar todo",
   "studioSaveAndPublish": "Guardar y publicar",
   "studioSaveAndPublishAllButton": "Guardar y publicar todo",
+  "studioSaveChanges": "Guardar cambios",
   "studioSaveChangeSectionContent": "Contenido",
   "studioSaveChangeSectionLayout": "Diseño",
-  "studioSaveChanges": "Guardar cambios",
   "studioSaveChangesSubtitle": "¿Deseas guardar o guardar y publicar tus cambios?",
   "studioSaveChangesTypeColumn": "Tipo",
   "studioSaveChangesVersionColumn": "Vers.",

public/locales/es-ES/shell.json

@@ -488,6 +488,15 @@
   "schedulePublishTitleUnschedule": "Desprogramar publicación",
   "schedulePublishUnscheduleButton": "Desprogramar publicación",
   "schedulePublishUnscheduleInfo": "Esto habilitará la posibilidad de programar o publicar otras versiones de este elemento de contenido",
+  "scheduleUnpublishButton": "Programar anulación de publicación",
+  "scheduleUnpublishCancelsScheduledPublishWarning": "La v{{version}} está programada para publicarse. Programar una anulación de publicación cancelará esa publicación programada.",
+  "scheduleUnpublishOnLabel": "Anular publicación el",
+  "scheduleUnpublishPastWarning": "Como la hora seleccionada es una fecha actual o pasada, esto anulará la publicación inmediatamente.",
+  "scheduleUnpublishScheduledInfo": "La v{{version}} está programada para anular su publicación el {{date}} en {{timezone}}.",
+  "scheduleUnpublishTitleSchedule": "Programar anulación de publicación",
+  "scheduleUnpublishTitleUnschedule": "Cancelar anulación de publicación programada",
+  "scheduleUnpublishUnscheduleButton": "Cancelar anulación de publicación programada",
+  "scheduleUnpublishUnscheduleInfo": "Esto cancelará la anulación de publicación programada y mantendrá publicado este elemento de contenido.",
   "searchIn": "Buscar en...",
   "searchInstancePlaceholder": "Buscar en la instancia {{shortcut}}",
   "searchInstances": "Buscar instancias",