Changeset 42047

Timestamp:

10/31/2017 02:53:44 AM (9 months ago)

Author:

adamsilverstein

Message:

REST API: JS client - Enumerate endpoints supporting trash.

Improve the logic determining which endpoints support the trash by enumerating them. Endpoints that don't support the trash require force=true when deleting. The previous approach relied on the force argument description, which is a translated string and was fragile. In the future, we can expose whether an endpoint supports the trash as part of its schema and automate this logic.

Props Soean.
Fixes #40672.

File:

• trunk/src/wp-includes/js/wp-api.js (modified) (2 diffs)

trunk/src/wp-includes/js/wp-api.js

@@ -804 +804 @@
     'use strict';
 
-    var wpApiSettings = window.wpApiSettings || {};
+    var wpApiSettings = window.wpApiSettings || {},
+    trashableTypes    = [ 'Comment', 'Media', 'Comment', 'Post', 'Page', 'Status', 'Taxonomy', 'Type' ];
 
     /**
@@ -812 +813 @@
         /** @lends WPApiBaseModel.prototype  */
         {
-            initialize: function( attributes, options ) {
+
+            // Initialize the model.
+            initialize: function() {
 
                 /**
-                 * Determine if a model requires ?force=true to actually delete them.
-                 */
-                if (
-                    ! _.isEmpty(
-                        _.filter(
-                            this.endpoints,
-                            function( endpoint ) {
-                                return (
-
-                                    // Does the method support DELETE?
-                                    'DELETE' === endpoint.methods[0] &&
-
-                                    // Exclude models that support trash (Post, Page).
-                                    (
-                                        ! _.isUndefined( endpoint.args.force ) &&
-                                        ! _.isUndefined( endpoint.args.force.description ) &&
-                                        'Whether to bypass trash and force deletion.' !== endpoint.args.force.description
-                                    )
-                                );
-                            }
-                        )
-                    )
-                ) {
+                * Types that don't support trashing require passing ?force=true to delete.
+                *
+                */
+                if ( -1 === _.indexOf( trashableTypes, this.name ) ) {
                     this.requireForceForDelete = true;
                 }