fix: Handle multiple queryParams created by applying multiple mixins (o…

…ffirgolan#79)
anehx · Mar 6, 2019 · f4abe44 · f4abe44
1 parent f511051
commit f4abe44
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 29 deletions.
diff --git a/.tool-versions b/.tool-versions
diff --git a/addon/-private/parachute-meta.js b/addon/-private/parachute-meta.js
@@ -1,5 +1,6 @@
 import { A as emberArray } from '@ember/array';
 import QueryParam from './query-param';
+import { PARACHUTE_QPS } from './symbols';
 
 const { keys } = Object;
 
@@ -36,6 +37,11 @@ export default class ParachuteMeta {
       {}
     );
 
+    // Meta info used by the decorators
+    Object.defineProperty(this.qpMapForController, PARACHUTE_QPS, {
+      value: true
+    });
+
     this.qpMapForRoute = this.queryParamsArray.reduce(
       (qps, { key, replace }) => {
         qps[key] = { replace };

diff --git a/addon/-private/symbols.js b/addon/-private/symbols.js
@@ -1,2 +1,3 @@
 export const HAS_PARACHUTE = '__has_parachute__';
 export const PARACHUTE_META = '__parachute_meta__';
+export const PARACHUTE_QPS = '__parachute_qps__';
diff --git a/addon/decorators/query-param.js b/addon/decorators/query-param.js
@@ -1,3 +1,5 @@
+import { A } from '@ember/array';
+import { PARACHUTE_QPS } from 'ember-parachute/-private/symbols';
 import {
   addQueryParamFor,
   getQueryParamsFor
@@ -12,6 +14,21 @@ function createDescriptor(desc, qpDefinition) {
       addQueryParamFor(klass, desc.key, qpDefinition);
       klass.reopen(getQueryParamsFor(klass).Mixin);
 
+      const proto = klass.proto();
+
+      // Remove duplicate queryParams created by the multiple mixins
+      if (Array.isArray(proto.queryParams)) {
+        const queryParams = A([...proto.queryParams]);
+        const parachuteQueryParams = queryParams.filterBy(PARACHUTE_QPS, true);
+
+        // Keep the newest one
+        parachuteQueryParams.pop();
+        // Remove the old ones
+        queryParams.removeObjects(parachuteQueryParams);
+
+        proto.queryParams = queryParams.toArray();
+      }
+
       return klass;
     }
   };

diff --git a/addon/query-params.js b/addon/query-params.js
@@ -7,7 +7,6 @@ import { HAS_PARACHUTE, PARACHUTE_META } from './-private/symbols';
 import ParachuteMeta from './-private/parachute-meta';
 import queryParamsStateFor from './-private/state';
 
-
 const { keys } = Object;
 
 /**
@@ -250,30 +249,6 @@ export default class QueryParams {
         }
       ).readOnly(),
 
-      /**
-       * Overridable hook that fires when query params change.
-       *
-       * @public
-       * @returns {void}
-       */
-      queryParamsDidChange() {},
-
-      /**
-       * Overridable hook that fires after the route calls `setupController`
-       *
-       * @public
-       * @returns {void}
-       */
-      setup() {},
-
-      /**
-       * Overridable hook that fires after the route calls `resetController`
-       *
-       * @public
-       * @returns {void}
-       */
-      reset() {},
-
       /**
        * Reset query params to their default value. Accepts an optional array
        * of query param keys to reset.
@@ -298,7 +273,6 @@ export default class QueryParams {
       }
     });
 
-
     return ControllerMixin;
   }
 }
diff --git a/tests/unit/decorators-test.js b/tests/unit/decorators-test.js
@@ -32,8 +32,6 @@ module('Unit | Decorators', function() {
     });
 
     test('it works', function(assert) {
-      assert.ok(typeof controller.setup === 'function');
-      assert.ok(typeof controller.reset === 'function');
       assert.ok(QueryParams.metaFor(controller));
     });
   });