Skip to content

Commit 62d96fe

Browse files
jamesdordoyjamesdordoy
committed
Bug fix to order by.
1 parent 5eb3cc2 commit 62d96fe

File tree

3 files changed

+95
-27
lines changed

3 files changed

+95
-27
lines changed

‎app/Http/Controllers/UserController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ class UserController extends Controller
1111
public function index(Request $request)
1212
{
1313
$length = $request->input('length');
14-
$column = $request->input('column', 'id');
15-
$dir = $request->input('dir', 'asc');
14+
$column = $request->input('column');
15+
$dir = $request->input('dir');
1616
$searchValue = $request->input('search');
1717

1818
$query = User::eloquentQuery($column, $dir, $searchValue);

‎public/js/app.js

+93-24
Original file line numberDiff line numberDiff line change
@@ -1728,6 +1728,14 @@ function (modules) {
17281728

17291729
},
17301730

1731+
/***/
1732+
"2621":
1733+
/***/
1734+
function _(module, exports) {
1735+
exports.f = Object.getOwnPropertySymbols;
1736+
/***/
1737+
},
1738+
17311739
/***/
17321740
"28a5":
17331741
/***/
@@ -4843,6 +4851,63 @@ function (modules) {
48434851

48444852
},
48454853

4854+
/***/
4855+
"7333":
4856+
/***/
4857+
function _(module, exports, __webpack_require__) {
4858+
"use strict"; // 19.1.2.1 Object.assign(target, source, ...)
4859+
4860+
var DESCRIPTORS = __webpack_require__("9e1e");
4861+
4862+
var getKeys = __webpack_require__("0d58");
4863+
4864+
var gOPS = __webpack_require__("2621");
4865+
4866+
var pIE = __webpack_require__("52a7");
4867+
4868+
var toObject = __webpack_require__("4bf8");
4869+
4870+
var IObject = __webpack_require__("626a");
4871+
4872+
var $assign = Object.assign; // should work with symbols and should have deterministic property order (V8 bug)
4873+
4874+
module.exports = !$assign || __webpack_require__("79e5")(function () {
4875+
var A = {};
4876+
var B = {}; // eslint-disable-next-line no-undef
4877+
4878+
var S = Symbol();
4879+
var K = 'abcdefghijklmnopqrst';
4880+
A[S] = 7;
4881+
K.split('').forEach(function (k) {
4882+
B[k] = k;
4883+
});
4884+
return $assign({}, A)[S] != 7 || Object.keys($assign({}, B)).join('') != K;
4885+
}) ? function assign(target, source) {
4886+
// eslint-disable-line no-unused-vars
4887+
var T = toObject(target);
4888+
var aLen = arguments.length;
4889+
var index = 1;
4890+
var getSymbols = gOPS.f;
4891+
var isEnum = pIE.f;
4892+
4893+
while (aLen > index) {
4894+
var S = IObject(arguments[index++]);
4895+
var keys = getSymbols ? getKeys(S).concat(getSymbols(S)) : getKeys(S);
4896+
var length = keys.length;
4897+
var j = 0;
4898+
var key;
4899+
4900+
while (length > j) {
4901+
key = keys[j++];
4902+
if (!DESCRIPTORS || isEnum.call(S, key)) T[key] = S[key];
4903+
}
4904+
}
4905+
4906+
return T;
4907+
} : $assign;
4908+
/***/
4909+
},
4910+
48464911
/***/
48474912
"733c":
48484913
/***/
@@ -8180,6 +8245,19 @@ function (modules) {
81808245

81818246
},
81828247

8248+
/***/
8249+
"f751":
8250+
/***/
8251+
function f751(module, exports, __webpack_require__) {
8252+
// 19.1.3.1 Object.assign(target, source)
8253+
var $export = __webpack_require__("5ca1");
8254+
8255+
$export($export.S + $export.F, 'Object', {
8256+
assign: __webpack_require__("7333")
8257+
});
8258+
/***/
8259+
},
8260+
81838261
/***/
81848262
"f772":
81858263
/***/
@@ -8260,9 +8338,9 @@ function (modules) {
82608338
/* harmony default export */
82618339

82628340

8263-
var setPublicPath = null; // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"700ae7aa-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/DataTable.vue?vue&type=template&id=057ae21c&
8341+
var setPublicPath = null; // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"700ae7aa-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/DataTable.vue?vue&type=template&id=6192c0cb&
82648342

8265-
var DataTablevue_type_template_id_057ae21c_render = function DataTablevue_type_template_id_057ae21c_render() {
8343+
var DataTablevue_type_template_id_6192c0cb_render = function DataTablevue_type_template_id_6192c0cb_render() {
82668344
var _vm = this;
82678345

82688346
var _h = _vm.$createElement;
@@ -8345,22 +8423,25 @@ function (modules) {
83458423
}, [_vm._v("Next")])])], 2);
83468424
};
83478425

8348-
var staticRenderFns = []; // CONCATENATED MODULE: ./src/components/DataTable.vue?vue&type=template&id=057ae21c&
8349-
// EXTERNAL MODULE: ./node_modules/core-js/modules/es6.number.constructor.js
8426+
var staticRenderFns = []; // CONCATENATED MODULE: ./src/components/DataTable.vue?vue&type=template&id=6192c0cb&
8427+
// EXTERNAL MODULE: ./node_modules/core-js/modules/es6.object.assign.js
8428+
8429+
var es6_object_assign = __webpack_require__("f751"); // EXTERNAL MODULE: ./node_modules/core-js/modules/es6.number.constructor.js
8430+
83508431

83518432
var es6_number_constructor = __webpack_require__("c5f6"); // EXTERNAL MODULE: ./node_modules/core-js/modules/es6.number.is-integer.js
83528433

83538434

83548435
var es6_number_is_integer = __webpack_require__("7cdf"); // EXTERNAL MODULE: ./node_modules/core-js/modules/es6.array.find-index.js
83558436

83568437

8357-
var es6_array_find_index = __webpack_require__("20d6"); // EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom.iterable.js
8438+
var es6_array_find_index = __webpack_require__("20d6"); // EXTERNAL MODULE: ./node_modules/core-js/modules/es6.function.name.js
83588439

83598440

8360-
var web_dom_iterable = __webpack_require__("ac6a"); // EXTERNAL MODULE: ./node_modules/core-js/modules/es6.function.name.js
8441+
var es6_function_name = __webpack_require__("7f7f"); // EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom.iterable.js
83618442

83628443

8363-
var es6_function_name = __webpack_require__("7f7f"); // EXTERNAL MODULE: ./node_modules/axios/index.js
8444+
var web_dom_iterable = __webpack_require__("ac6a"); // EXTERNAL MODULE: ./node_modules/axios/index.js
83648445

83658446

83668447
var axios = __webpack_require__("bc3a");
@@ -9279,12 +9360,6 @@ function (modules) {
92799360
} else {
92809361
this.getData();
92819362
}
9282-
9283-
if (this.columns.length) {
9284-
this.internalOrderBy = this.orderBy.length ? this.orderBy : this.columns[0].name;
9285-
} else {
9286-
this.internalOrderBy = 'id';
9287-
}
92889363
},
92899364
mounted: function mounted() {
92909365
var _this = this;
@@ -9321,11 +9396,10 @@ function (modules) {
93219396
tableData: {
93229397
length: this.perPage[0],
93239398
search: '',
9324-
column: this.internalOrderBy,
9399+
column: this.orderBy,
93259400
dir: this.orderDir,
93269401
filters: this.filters
9327-
},
9328-
internalOrderBy: 'id'
9402+
}
93299403
};
93309404
},
93319405
props: {
@@ -9356,7 +9430,7 @@ function (modules) {
93569430
},
93579431
orderBy: {
93589432
type: String,
9359-
"default": ''
9433+
"default": 'id'
93609434
},
93619435
classes: {
93629436
type: Object,
@@ -9491,7 +9565,7 @@ function (modules) {
94919565

94929566
/* normalize component */
94939567

9494-
var DataTable_component = normalizeComponent(components_DataTablevue_type_script_lang_js_, DataTablevue_type_template_id_057ae21c_render, staticRenderFns, false, null, null, null);
9568+
var DataTable_component = normalizeComponent(components_DataTablevue_type_script_lang_js_, DataTablevue_type_template_id_6192c0cb_render, staticRenderFns, false, null, null, null);
94959569
/* harmony default export */
94969570

94979571
var DataTable = DataTable_component.exports; // CONCATENATED MODULE: ./src/plugin.js
@@ -11153,7 +11227,6 @@ __webpack_require__.r(__webpack_exports__);
1115311227
//
1115411228
//
1115511229
//
11156-
//
1115711230
/* harmony default export */ __webpack_exports__["default"] = ({
1115811231
name: 'app',
1115911232
data: function data() {
@@ -46494,11 +46567,7 @@ var render = function() {
4649446567
var _h = _vm.$createElement
4649546568
var _c = _vm._self._c || _h
4649646569
return _c("data-table", {
46497-
attrs: {
46498-
url: "/api/query-builder",
46499-
"order-dir": "desc",
46500-
columns: _vm.columns
46501-
}
46570+
attrs: { url: "/api/query-builder", columns: _vm.columns }
4650246571
})
4650346572
}
4650446573
var staticRenderFns = []

‎resources/js/components/UserDatatable.vue

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<template>
22
<data-table
33
url="/api/query-builder"
4-
order-dir="desc"
54
:columns="columns">
65
</data-table>
76
</template>

0 commit comments

Comments
 (0)