Change "Delete" to "Archive" in PDP (#1513)

* Change dropdown value * Change labels and value * Add archive translations * Use archive translations * Use archive action * Change badge title * Change confirmation dialog * Add archived messages * Remove deleteThisProduct key * Change to Archive for variants as well
reactioncommerce · Oct 24, 2016 · 585f1a3 · 585f1a3
1 parent f9f5222
commit 585f1a3
Show file tree

Hide file tree

Showing 20 changed files with 39 additions and 41 deletions.
diff --git a/imports/plugins/core/revisions/client/components/publishControls.js b/imports/plugins/core/revisions/client/components/publishControls.js
@@ -157,10 +157,10 @@ class PublishControls extends Component {
       if (this.props.revisions[0].documentData.isDeleted) {
         return (
           <Button
-            label="Deleted"
+            label="Archived"
             onClick={this.handleRestore}
             status="danger"
-            i18nKeyLabel="app.deleted"
+            i18nKeyLabel="app.archived"
           />
         );
       }
@@ -194,10 +194,10 @@ class PublishControls extends Component {
           />
           <Divider />
           <MenuItem
-            i18nKeyLabel="app.delete"
+            i18nKeyLabel="app.archive"
             icon="fa fa-trash-o"
-            label="Delete"
-            value="delete"
+            label="Archive"
+            value="archive"
           />
         </Menu>
       </Popover>

diff --git a/imports/plugins/core/revisions/client/containers/publishContainer.js b/imports/plugins/core/revisions/client/containers/publishContainer.js
@@ -37,7 +37,7 @@ class PublishContainer extends Component {
 
   handlePublishActions = (event, action, documentIds) => {
     switch (action) {
-      case "delete":
+      case "archive":
         if (this.props.onAction) {
           this.props.onAction(event, action, this.props.documentIds);
         }

diff --git a/imports/plugins/included/product-detail-simple/client/components/childVariant.js b/imports/plugins/included/product-detail-simple/client/components/childVariant.js
@@ -26,7 +26,7 @@ class ChildVariant extends Component {
     if (this.props.variant.isDeleted) {
       return (
         <span className="badge badge-danger">
-          <Translation defaultValue="Deleted" i18nKey="app.deleted" />
+          <Translation defaultValue="Archived" i18nKey="app.archived" />
         </span>
       );
     }

diff --git a/imports/plugins/included/product-detail-simple/client/components/productDetail.js b/imports/plugins/included/product-detail-simple/client/components/productDetail.js
@@ -37,7 +37,7 @@ class ProductDetail extends Component {
   }
 
   handlePublishActions = (event, action) => {
-    if (action === "delete" && this.props.onDeleteProduct) {
+    if (action === "archive" && this.props.onDeleteProduct) {
       this.props.onDeleteProduct(this.product._id);
     }
   }

diff --git a/imports/plugins/included/product-detail-simple/client/components/variant.js b/imports/plugins/included/product-detail-simple/client/components/variant.js
@@ -44,7 +44,7 @@ class Variant extends Component {
     if (this.props.variant.isDeleted) {
       return (
         <span className="badge badge-danger">
-          <Translation defaultValue="Deleted" i18nKey="app.deleted" />
+          <Translation defaultValue="Archived" i18nKey="app.archived" />
         </span>
       );
     }

diff --git a/...ct-variant/client/templates/products/productDetail/variants/variantForm/childVariant.html b/...ct-variant/client/templates/products/productDetail/variants/variantForm/childVariant.html
@@ -29,8 +29,8 @@
         {{optionTitle}} - {{formatPrice price}}
         {{#if isDeleted}}
           <div class="panel-subheading">
-            <span class="badge badge-danger" data-i18n="app.deleted">
-              <span>Deleted</span>
+            <span class="badge badge-danger" data-i18n="app.archived">
+              <span>Archived</span>
             </span>
           </div>
         {{/if}}

diff --git a/...duct-variant/client/templates/products/productDetail/variants/variantForm/childVariant.js b/...duct-variant/client/templates/products/productDetail/variants/variantForm/childVariant.js
@@ -128,9 +128,9 @@ Template.childVariantForm.events({
     const title = instance.data.optionTitle || i18next.t("productDetailEdit.thisOption");
 
     Alerts.alert({
-      title: i18next.t("productDetailEdit.removeVariantConfirm", { title }),
+      title: i18next.t("productDetailEdit.archiveVariantConfirm", { title }),
       showCancelButton: true,
-      confirmButtonText: "Remove"
+      confirmButtonText: "Archive"
     }, (isConfirm) => {
       if (isConfirm) {
         const id = instance.data._id;

diff --git a/...uct-variant/client/templates/products/productDetail/variants/variantForm/variantForm.html b/...uct-variant/client/templates/products/productDetail/variants/variantForm/variantForm.html
@@ -18,8 +18,8 @@
           <span data-i18n="productDetailEdit.variantDetails">Variant Details</span>
           {{#if isDeleted}}
             <div class="panel-subheading">
-              <span class="badge badge-danger" data-i18n="app.deleted">
-                <span>Deleted</span>
+              <span class="badge badge-danger" data-i18n="app.archived">
+                <span>Archived</span>
               </span>
             </div>
           {{/if}}
@@ -43,7 +43,7 @@
             {{> button
               icon="trash-o"
               className="btn btn-default btn-remove-variant"
-              tooltip="Remove"
+              tooltip="Archive"
               i18nTooltip="productDetailEdit.removeVariant"
               onClick=(removeVariant this)
             }}

diff --git a/...oduct-variant/client/templates/products/productDetail/variants/variantForm/variantForm.js b/...oduct-variant/client/templates/products/productDetail/variants/variantForm/variantForm.js
@@ -74,9 +74,9 @@ Template.variantForm.helpers({
         const title = variant.title || i18next.t("productDetailEdit.thisVariant");
 
         Alerts.alert({
-          title: i18next.t("productDetailEdit.removeVariantConfirm", { title }),
+          title: i18next.t("productDetailEdit.archiveVariantConfirm", { title }),
           showCancelButton: true,
-          confirmButtonText: "Remove"
+          confirmButtonText: "Archive"
         }, (isConfirm) => {
           if (isConfirm) {
             const id = variant._id;

diff --git a/imports/plugins/included/product-variant/client/templates/products/productGrid/controls.html b/imports/plugins/included/product-variant/client/templates/products/productGrid/controls.html
@@ -13,8 +13,8 @@
 
       {{#if product.isDeleted}}
         <div>
-        <span class="badge badge-danger" data-i18n="app.deleted">
-          <span>Deleted</span>
+        <span class="badge badge-danger" data-i18n="app.archived">
+          <span>Archived</span>
         </span>
       </div>
       {{/if}}

diff --git a/lib/api/products.js b/lib/api/products.js
@@ -319,7 +319,7 @@ ReactionProduct.publishProduct = function (productOrArray) {
  */
 ReactionProduct.toggleVisibility = function (productOrArray) {
   const products = !_.isArray(productOrArray) ? [productOrArray] : productOrArray;
-  for (let product of products) {
+  for (const product of products) {
     Meteor.call("products/toggleVisibility", product._id, (error, result) => {
       if (error) {
         Alerts.add(error, "danger", {
@@ -404,16 +404,16 @@ ReactionProduct.maybeDeleteProduct = function (productOrArray) {
   // we are using i18next `plural` functionality here.
   // @see: http://i18next.com/translate/pluralSimple
   if (products.length === 1) {
-    confirmTitle = i18next.t("productDetailEdit.deleteThisProduct");
+    confirmTitle = i18next.t("productDetailEdit.archiveThisProduct");
   } else {
-    confirmTitle = i18next.t("productDetailEdit.deleteSelectedProducts");
+    confirmTitle = i18next.t("productDetailEdit.archiveSelectedProducts");
   }
 
   Alerts.alert({
     title: confirmTitle,
     type: "warning",
     showCancelButton: true,
-    confirmButtonText: "Remove"
+    confirmButtonText: "Archive"
   }, (isConfirm) => {
     if (isConfirm) {
       Meteor.call("products/deleteProduct", productIds, function (error, result) {
@@ -429,10 +429,10 @@ ReactionProduct.maybeDeleteProduct = function (productOrArray) {
           FlowRouter.go("/");
           if (products.length === 1) {
             title = products[0].title || "productDetail.";
-            Alerts.toast(i18next.t("productDetail.deletedAlert", { product: title }), "info");
+            Alerts.toast(i18next.t("productDetail.archivedAlert", { product: title }), "info");
           } else {
             title = i18next.t("productDetail.theSelectedProducts");
-            Alerts.toast(i18next.t("productDetail.deletedAlert_plural", { product: title, count: 0 }), "info");
+            Alerts.toast(i18next.t("productDetail.archivedAlert_plural", { product: title, count: 0 }), "info");
           }
         }
       });

diff --git a/private/data/i18n/ar.json b/private/data/i18n/ar.json
@@ -345,7 +345,6 @@
         "toggleSize": "تبديل الحجم",
         "deleteProduct": "إلغاء منتج",
         "restoreProduct": "إستعادة المنتج من سلة المهملات",
-        "deleteThisProduct": "حذف هذا المنتج؟",
         "deleteSelectedProducts": "هل تريد حذف المنتجات المختارة؟",
         "publish": "نشر",
         "moreOptions": "خيارات إضافية",

diff --git a/private/data/i18n/de.json b/private/data/i18n/de.json
@@ -344,7 +344,6 @@
         "toggleSize": "Größe anpassen",
         "deleteProduct": "Produkt löschen",
         "restoreProduct": "Produkt aus dem Papierkorb wiederherstellen",
-        "deleteThisProduct": "Dieses Produkt löschen?",
         "deleteSelectedProducts": "Gewählte Produkte löschen?",
         "publish": "Veröffentlichen",
         "moreOptions": "Weitere Optionen",
@@ -830,4 +829,4 @@
       }
     }
   }
-}]
+}]
diff --git a/private/data/i18n/en.json b/private/data/i18n/en.json
@@ -137,6 +137,8 @@
         "submit": "Submit",
         "delete": "Delete",
         "deleted": "Deleted",
+        "archive": "Archive",
+        "archived": "Archived",
         "create": "Create",
         "close": "Close",
         "settings": "Settings",
@@ -305,6 +307,8 @@
         "clonedAlert_plural": "Cloned {{product}}",
         "deletedAlert": "Deleted {{product}}",
         "deletedAlert_plural": "Deleted {{product}}",
+        "archivedAlert": "Archived {{product}}",
+        "archivedAlert_plural": "Archived {{product}}",
         "theProduct": "the product",
         "theSelectedProducts": "the selected products",
         "startTracking": "Start Tracking",
@@ -346,15 +350,17 @@
         "removeVariant": "Remove",
         "removeVariantConfirm": "Are you sure you want to delete {{title}}",
         "restoreVariantConfirm": "Are you sure you want to restore {{title}} from the trash?",
+        "archiveVariantConfirm": "Are you sure you want to archive {{title}}",
         "thisVariant": "this variant",
         "thisOption": "this option",
         "duplicateProduct": "Duplicate Product",
         "pinProduct": "Pin Product",
         "toggleSize": "Toggle Size",
         "deleteProduct": "Delete Product",
         "restoreProduct": "Restore Product from Trash",
-        "deleteThisProduct": "Delete this product?",
         "deleteSelectedProducts": "Delete selected products?",
+        "archiveThisProduct": "Archive this product?",
+        "archiveSelectedProducts": "Archive selected products?",
         "publish": "Publish",
         "moreOptions": "More Options",
         "details": "Details",

diff --git a/private/data/i18n/es.json b/private/data/i18n/es.json
@@ -344,7 +344,6 @@
         "toggleSize": "Tamaño de la palanca",
         "deleteProduct": "Eliminar producto",
         "restoreProduct": "Recuperar el producto desde la papelera",
-        "deleteThisProduct": "¿Eliminar este producto?",
         "deleteSelectedProducts": "¿Eliminar productos seleccionados?",
         "publish": "Publicar",
         "moreOptions": "Más opciones",
@@ -830,4 +829,4 @@
       }
     }
   }
-}]
+}]
diff --git a/private/data/i18n/fr.json b/private/data/i18n/fr.json
@@ -344,7 +344,6 @@
         "toggleSize": "Modification de la taille",
         "deleteProduct": "Supprimer le produit",
         "restoreProduct": "Restaurer les produits de la corbeille",
-        "deleteThisProduct": "Supprimer ce produit ?",
         "deleteSelectedProducts": "Supprimer les produits sélectionnés ?",
         "publish": "Publier",
         "moreOptions": "Options supplémentaires",
@@ -830,4 +829,4 @@
       }
     }
   }
-}]
+}]
diff --git a/private/data/i18n/he.json b/private/data/i18n/he.json
@@ -345,7 +345,6 @@
         "toggleSize": "החלף מידה/גודל",
         "deleteProduct": "מחק מוצר",
         "restoreProduct": "שחזר מוצר מפח האשפה",
-        "deleteThisProduct": "למחוק מוצר זה?",
         "deleteSelectedProducts": "למחוק מוצרים שנבחרו?",
         "publish": "פרסום",
         "moreOptions": "עוד אפשרויות",

diff --git a/private/data/i18n/ro.json b/private/data/i18n/ro.json
@@ -344,7 +344,6 @@
         "toggleSize": "Dimensiune comutare",
         "deleteProduct": "Șterge produs",
         "restoreProduct": "Recuperare produs din coșul de gunoi",
-        "deleteThisProduct": "Ștergeți acest produs?",
         "deleteSelectedProducts": "Ștergeți produsele selectate?",
         "publish": "Publică",
         "moreOptions": "Mai multe opțiuni",
@@ -830,4 +829,4 @@
       }
     }
   }
-}]
+}]
diff --git a/private/data/i18n/ru.json b/private/data/i18n/ru.json
@@ -344,7 +344,6 @@
         "toggleSize": "Поменять размер",
         "deleteProduct": "Удалить товар",
         "restoreProduct": "Восстановить товар из корзины",
-        "deleteThisProduct": "Удалить этот товар?",
         "deleteSelectedProducts": "Удалить выбранные товары?",
         "publish": "Опубликовать",
         "moreOptions": "Больше опций",
@@ -830,4 +829,4 @@
       }
     }
   }
-}]
+}]
diff --git a/private/data/i18n/zh.json b/private/data/i18n/zh.json
@@ -344,7 +344,6 @@
         "toggleSize": "切换大小",
         "deleteProduct": "删除产品",
         "restoreProduct": "从垃圾箱恢复产品",
-        "deleteThisProduct": "删除此产品？",
         "deleteSelectedProducts": "删除选择的产品？",
         "publish": "发布",
         "moreOptions": "更多选项",
@@ -830,4 +829,4 @@
       }
     }
   }
-}]
+}]