remove created value props assignation and pass down directly hardcod…

…ed orders to options props
ToucanToco · Jul 3, 2019 · 6639608 · 6639608
1 parent a49cd97
commit 6639608
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/src/components/stepforms/WidgetSortColumn.vue b/src/components/stepforms/WidgetSortColumn.vue
@@ -12,7 +12,7 @@
       id="sortOrderInput"
       v-model="sort.order"
       name="Order"
-      :options="sortOrder"
+      :options="['asc', 'desc']"
       placeholder="Order by"
     ></WidgetAutocomplete>
   </fieldset>
@@ -39,6 +39,10 @@ const defaultValues: SortColumnType = {
 export default class WidgetSortColumn extends Vue {
   @Prop({
     type: Object,
+    default: () => ({
+      column: '',
+      order: 'asc',
+    }),
   })
   value!: SortColumnType;
 
@@ -47,13 +51,6 @@ export default class WidgetSortColumn extends Vue {
   @Mutation setSelectedColumns!: MutationCallbacks['setSelectedColumns'];
 
   sort: SortColumnType = { ...this.value };
-  sortOrder: SortColumnType['order'][] = ['asc', 'desc'];
-
-  created() {
-    if (_.isEmpty(this.value)) {
-      this.value = { ...defaultValues };
-    }
-  }
 
   @Watch('value', { immediate: true, deep: true })
   onSortChanged(newval: SortColumnType, oldval: SortColumnType) {
@@ -66,7 +63,7 @@ export default class WidgetSortColumn extends Vue {
 </script>
 <style lang="scss" scoped>
 @import '../../styles/_variables';
-.widget-aggregation__container {
+.widget-sort__container {
   @extend %form-widget__container;
   margin-bottom: 0;
   padding-top: 12px;
@@ -78,9 +75,6 @@ export default class WidgetSortColumn extends Vue {
   flex-direction: row;
   margin-bottom: 8px;
 }
-</style>
-
-<style lang="scss">
 .widget-sort__container .widget-autocomplete__label {
   margin-bottom: 0px;
   width: 40%;

diff --git a/tests/unit/widget-sort-column.spec.ts b/tests/unit/widget-sort-column.spec.ts
@@ -61,6 +61,6 @@ describe('Widget sort column', () => {
     wrapper.setProps({ value: { column: 'bar', order: 'desc' } });
     await localVue.nextTick();
     expect(wrapper.emitted().input).to.exist;
-    expect(wrapper.emitted().input[0]).to.eql([{ column: 'bar', order: 'desc' }]);
+    expect(wrapper.emitted().input[1]).to.eql([{ column: 'bar', order: 'desc' }]);
   });
 });