@vocollege/app 0.0.156 → 0.0.158

package/dist/modules/VoHelpers.d.ts

@@ -34,7 +34,7 @@ export declare const wrapPromise: (promise: any) => {
 };
 export declare const downloadFile: (url: string) => void;
 export declare const orderByPosition: (a: any, b: any) => 1 | -1 | 0;
-export declare const orderByField: (a: any, b: any, field: string) => 1 | -1 | 0;
+export declare const orderByField: (a: any, b: any, field: string, descending?: boolean) => 1 | -1 | 0;
 export declare const shortenText: (str: string, limit?: number, stripHtml?: boolean, addEllipsis?: boolean) => string;
 export declare const getImageContact: (item: any, width?: number, height?: number) => string;
 export declare const getImage: (item: any, width: number, height: number, field?: string) => string;
@@ -42,7 +42,7 @@ export declare const getImageDescription: (item: any, field?: string) => any;
 export declare const getContactName: (item?: GeneralObject) => string;
 export declare const getUserString: (item?: GeneralObject) => string;
 export declare const parseState: (state: any, initialState: any) => GeneralObject;
-export declare const changeObj: (obj: any, is: any, value: any) => {};
+export declare const changeObj: (obj: any, key: string, value: any) => {};
 export declare const reducer: (state: any, action: any) => any;
 export declare const getGroupLogotype: (group: GeneralObject, logo?: string, output?: GeneralObject[]) => any;
 export declare const getObjValue: (obj: any, ...props: string[]) => any;

package/dist/modules/VoHelpers.js

@@ -238,12 +238,13 @@ var orderByPosition = function (a, b) {
     return 0;
 };
 exports.orderByPosition = orderByPosition;
-var orderByField = function (a, b, field) {
+var orderByField = function (a, b, field, descending) {
+    if (descending === void 0) { descending = false; }
     if (a[field] < b[field]) {
-        return -1;
+        return descending ? 1 : -1;
     }
     if (a[field] > b[field]) {
-        return 1;
+        return descending ? -1 : 1;
     }
     return 0;
 };
@@ -325,27 +326,16 @@ var parseState = function (state, initialState) {
     return newState;
 };
 exports.parseState = parseState;
-// This method is copied from
-// https://stackoverflow.com/questions/6393943/convert-javascript-string-in-dot-notation-into-an-object-reference
-//
-// @TODO Maybe this entire logic can be replaced by Array.reduce(),
-// something like this:
-// let data = is.split(".").reduce((o: any, i) => o && o[i], pbj);
-// data = value;
-//
-var changeObj = function (obj, is, value) {
-    if (typeof is == "string")
-        return (0, exports.changeObj)(obj, is.split("."), value);
-    else if (is.length == 1 && value !== undefined)
-        return (obj[is[0]] = value);
-    else if (is.length == 0)
-        return obj;
-    else
-        return (0, exports.changeObj)(obj[is[0]], is.slice(1), value);
+var changeObj = function (obj, key, value) {
+    var keys = key.split(".");
+    return keys.reduce(function (acc, v, i) {
+        if (i == keys.length - 1)
+            acc[v] = value;
+        return acc[v];
+    }, obj);
 };
 exports.changeObj = changeObj;
 var reducer = function (state, action) {
-    var _a;
     var key = action.key, values = action.values;
     if (!key) {
         return __assign(__assign({}, state), values);
@@ -361,11 +351,8 @@ var reducer = function (state, action) {
         }
         return __assign(__assign({}, state), { loading: newValues });
     }
-    if (key.indexOf(".") > -1) {
-        (0, exports.changeObj)(state, key, values);
-        return __assign({}, state);
-    }
-    return __assign(__assign({}, state), (_a = {}, _a[key] = values, _a));
+    (0, exports.changeObj)(state, key, values);
+    return __assign({}, state);
 };
 exports.reducer = reducer;
 var getGroupLogotype = function (group, logo, output) {
@@ -382,16 +369,6 @@ var getGroupLogotype = function (group, logo, output) {
     return null;
 };
 exports.getGroupLogotype = getGroupLogotype;
-// export const makeId = (length = 10) => {
-//   let result = "";
-//   let characters =
-//     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-//   let charactersLength = characters.length;
-//   for (var i = 0; i < length; i++) {
-//     result += characters.charAt(Math.floor(Math.random() * charactersLength));
-//   }
-//   return result;
-// };
 var getObjValue = function (obj) {
     var props = [];
     for (var _i = 1; _i < arguments.length; _i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vocollege/app",
-  "version": "0.0.156",
+  "version": "0.0.158",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/modules/VoHelpers.ts

@@ -194,12 +194,17 @@ export const orderByPosition = (a: any, b: any) => {
   return 0;
 };
 
-export const orderByField = (a: any, b: any, field: string) => {
+export const orderByField = (
+  a: any,
+  b: any,
+  field: string,
+  descending = false
+) => {
   if (a[field] < b[field]) {
-    return -1;
+    return descending ? 1 : -1;
   }
   if (a[field] > b[field]) {
-    return 1;
+    return descending ? -1 : 1;
   }
   return 0;
 };
@@ -283,19 +288,12 @@ export const parseState = (state: any, initialState: any) => {
   return newState;
 };
 
-// This method is copied from
-// https://stackoverflow.com/questions/6393943/convert-javascript-string-in-dot-notation-into-an-object-reference
-//
-// @TODO Maybe this entire logic can be replaced by Array.reduce(),
-// something like this:
-// let data = is.split(".").reduce((o: any, i) => o && o[i], pbj);
-// data = value;
-//
-export const changeObj = (obj: any, is: any, value: any): {} => {
-  if (typeof is == "string") return changeObj(obj, is.split("."), value);
-  else if (is.length == 1 && value !== undefined) return (obj[is[0]] = value);
-  else if (is.length == 0) return obj;
-  else return changeObj(obj[is[0]], is.slice(1), value);
+export const changeObj = (obj: any, key: string, value: any): {} => {
+  let keys = key.split(".");
+  return keys.reduce((acc, v, i) => {
+    if (i == keys.length - 1) acc[v] = value;
+    return acc[v];
+  }, obj);
 };
 
 export const reducer = (state: any, action: any) => {
@@ -313,11 +311,8 @@ export const reducer = (state: any, action: any) => {
     }
     return { ...state, loading: newValues };
   }
-  if (key.indexOf(".") > -1) {
-    changeObj(state, key, values);
-    return { ...state };
-  }
-  return { ...state, [key]: values };
+  changeObj(state, key, values);
+  return { ...state };
 };
 
 export const getGroupLogotype = (
@@ -335,17 +330,6 @@ export const getGroupLogotype = (
   return null;
 };
 
-// export const makeId = (length = 10) => {
-//   let result = "";
-//   let characters =
-//     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-//   let charactersLength = characters.length;
-//   for (var i = 0; i < length; i++) {
-//     result += characters.charAt(Math.floor(Math.random() * charactersLength));
-//   }
-//   return result;
-// };
-
 export const getObjValue = (obj: any, ...props: string[]): any => {
   return (
     obj &&