@vocollege/app 0.0.134 → 0.0.136

package/dist/global.d.ts

@@ -1,39 +1,39 @@
-export declare type AuthStorageConfigType = {
+export type AuthStorageConfigType = {
     STATE: string;
     VERIFIER: string;
     REFRESH_TOKEN: string;
     ACCESS_TOKEN: string;
     TOKEN_TYPE: string;
 };
-export declare type AuthConfigType = {
+export type AuthConfigType = {
     BASE_URL: string;
     CLIENT_ID?: string;
     LOGIN?: string;
     ENDPOINT?: string;
     STORAGE?: AuthStorageConfigType;
 };
-export declare type ApiConfigType = {
+export type ApiConfigType = {
     BASE_URL: string;
     ENDPOINT?: string;
     GRAPHQL?: string;
 };
-export declare type AppConfigType = {
+export type AppConfigType = {
     BASE_URL: string;
     AUTH?: string;
     HOME?: string;
     LOGIN?: string;
 };
-export declare type VoAppType = {
+export type VoAppType = {
     configure: Function;
     config?: Function;
     auth: any;
     api: any;
 };
-export declare type VoTokenType = {
+export type VoTokenType = {
     access_token: string;
     refresh_token: string;
 };
 export interface GeneralObject {
     [key: string]: any;
 }
-export declare type TypeNullObject = null | GeneralObject;
+export type TypeNullObject = null | GeneralObject;

package/dist/interceptor.js

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/modules/Services/Vapor/Vapor.js

@@ -28,7 +28,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -69,10 +69,10 @@ var Vapor = /** @class */ (function () {
     /**
      * Store a file in S3 and return its UUID, key, and other information.
      */
-    Vapor.prototype.store = function (file, options) {
-        if (options === void 0) { options = {}; }
-        return __awaiter(this, void 0, void 0, function () {
+    Vapor.prototype.store = function (file_1) {
+        return __awaiter(this, arguments, void 0, function (file, options) {
             var response, instance, headers, cancelToken;
+            if (options === void 0) { options = {}; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, axios_1.default.post(

package/dist/modules/VoApi/GraphClient.d.ts

@@ -6,6 +6,7 @@ declare class GraphClient {
         errorLink: ApolloLink;
         authLink: ApolloLink;
         omitTypenameLink: ApolloLink;
+        transformVariablesLink: ApolloLink;
     };
 }
 export default GraphClient;

package/dist/modules/VoApi/GraphClient.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -137,12 +137,28 @@ var GraphClient = /** @class */ (function () {
                     //       "field",
                     //     ],
                     //   },
+                    ValidigGeneralSurveyRow: {
+                        fields: {
+                            options: {
+                                read: function (existing) {
+                                    return existing ? JSON.parse(existing) : existing;
+                                },
+                                // merge(existing = "", incoming: "") {
+                                //   console.log("existing", existing);
+                                //   console.log("incoming", incoming);
+                                //   // return [...existing, ...incoming];
+                                //   return incoming;
+                                // },
+                            },
+                        },
+                    },
                 },
             }),
             link: (0, client_1.from)([
                 links.errorLink,
                 links.authLink,
                 links.omitTypenameLink,
+                links.transformVariablesLink,
                 httpLink,
             ]),
         });
@@ -206,10 +222,14 @@ var GraphClient = /** @class */ (function () {
             if (masquerade) {
                 masquerade = JSON.parse(masquerade);
             }
-            operation.setContext(function () { return (__assign(__assign({}, currentHeaders), { headers: __assign({ Authorization: token
+            var userLicensee = VoHelpers_1.localStorage.get(VoConfig_1.default.get.USER_LICENSEE);
+            if (userLicensee) {
+                userLicensee = JSON.parse(userLicensee);
+            }
+            operation.setContext(function () { return (__assign(__assign({}, currentHeaders), { headers: __assign(__assign({ Authorization: token
                         ? // ? `${token.token_type} ${token.access_token}`
                             "Bearer ".concat(token.access_token)
-                        : "", VoGroup: groupId }, (masquerade && { VoMasquerade: masquerade === null || masquerade === void 0 ? void 0 : masquerade.id })) })); });
+                        : "", VoGroup: groupId }, (masquerade && { VoMasquerade: masquerade === null || masquerade === void 0 ? void 0 : masquerade.id })), (userLicensee && { VoLicensee: userLicensee })) })); });
             return forward(operation);
         });
         var omitTypenameLink = new client_1.ApolloLink(function (operation, forward) {
@@ -218,10 +238,46 @@ var GraphClient = /** @class */ (function () {
             }
             return forward(operation);
         });
+        var transformVariablesLink = new client_1.ApolloLink(function (operation, forward) {
+            var operationName = operation.operationName, variables = operation.variables;
+            switch (operationName) {
+                // Manipulate fields on GeneralSurvey.
+                case "CreateGeneralSurvey":
+                case "UpdateGeneralSurvey":
+                    Object.keys(variables.input)
+                        .filter(function (key) { return Array.isArray(variables.input[key]); })
+                        .map(function (key) {
+                        // JSON stringify GeneralSurveyRow.options.
+                        variables.input[key]
+                            .filter(function (v) { return v === null || v === void 0 ? void 0 : v.options; })
+                            .map(function (v) {
+                            if (v.options) {
+                                v.options = JSON.stringify(v.options);
+                            }
+                        });
+                    });
+                    break;
+            }
+            // Traverse the variables and convert objects to JSON strings as needed
+            // const transformVariables = (vars) => {
+            //   if (!vars || typeof vars !== 'object') return vars;
+            //   return Object.keys(vars).reduce((acc, key) => {
+            //     const value = vars[key];
+            //     // Check if the value is an object that needs conversion
+            //     acc[key] = value && typeof value === 'object' && !(value instanceof Array)
+            //       ? JSON.stringify(value)
+            //       : value;
+            //     return acc;
+            //   }, {});
+            // };
+            // operation.variables = transformVariables(variables);
+            return forward(operation);
+        });
         return {
             errorLink: errorLink,
             authLink: authLink,
             omitTypenameLink: omitTypenameLink,
+            transformVariablesLink: transformVariablesLink,
         };
     };
     return GraphClient;

package/dist/modules/VoApi/VoApi.d.ts

@@ -6,7 +6,7 @@ declare class VoApi extends VoBase {
     init(params?: GeneralObject): void;
     get getGraphqlUrl(): string;
     get getGraphqlSubscriptionUrl(): string;
-    getUser(): Promise<import("axios").AxiosResponse<any>>;
+    getUser(): Promise<import("axios").AxiosResponse<any, any>>;
     logout(): Promise<boolean>;
 }
 declare const _default: VoApi;

package/dist/modules/VoApi/VoApi.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/modules/VoAuth.js

@@ -52,7 +52,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -238,6 +238,7 @@ var VoAuth = /** @class */ (function (_super) {
         });
         Helpers.localStorage.remove(VoConfig_1.default.get.CURRENT_GROUP || "");
         Helpers.localStorage.remove(VoConfig_1.default.get.MASQUERADE_USER || "");
+        Helpers.localStorage.remove(VoConfig_1.default.get.USER_LICENSEE || "");
         delete axios_1.default.defaults.headers.common["Authorization"];
     };
     VoAuth.prototype.refreshToken = function () {

package/dist/modules/VoConfig.d.ts

@@ -1,4 +1,4 @@
-declare type VoConfigType = {
+type VoConfigType = {
     [key: string]: any;
 };
 declare class VoConfig {

package/dist/modules/VoConfig.js

@@ -52,6 +52,7 @@ var VoConfig = /** @class */ (function () {
             AUTH_DOMAIN: ".vo-college.se",
             CURRENT_GROUP: "vo_group",
             MASQUERADE_USER: "vo_masquerade",
+            USER_LICENSEE: "vo_licensee",
         };
     }
     VoConfig.prototype.setConfig = function (config) {

package/dist/modules/VoDocs/VoDocs.d.ts

@@ -3,7 +3,7 @@ declare class VoDocs extends VoBase {
     graphqlClient: any;
     init(): void;
     get getGraphqlUrl(): string;
-    getTemporaryFileUrl(id: string, publicDownload?: boolean): Promise<import("axios").AxiosResponse<any>>;
+    getTemporaryFileUrl(id: string, publicDownload?: boolean): Promise<import("axios").AxiosResponse<any, any>>;
 }
 declare const _default: VoDocs;
 export default _default;

package/dist/modules/VoDocs/VoDocs.js

@@ -29,7 +29,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -77,10 +77,10 @@ var VoDocs = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    VoDocs.prototype.getTemporaryFileUrl = function (id, publicDownload) {
-        if (publicDownload === void 0) { publicDownload = false; }
-        return __awaiter(this, void 0, void 0, function () {
+    VoDocs.prototype.getTemporaryFileUrl = function (id_1) {
+        return __awaiter(this, arguments, void 0, function (id, publicDownload) {
             var currentGroup, endpoint, url;
+            if (publicDownload === void 0) { publicDownload = false; }
             return __generator(this, function (_a) {
                 try {
                     currentGroup = VoGroups_1.default.getCurrent(true);

package/dist/modules/VoHelpers.d.ts

@@ -7,7 +7,7 @@ export declare const localStorage: {
     get: (key: string) => string | false | null;
     remove: (key: string) => true | undefined;
 };
-declare type encodeQueryDataType = {
+type encodeQueryDataType = {
     [key: string]: any;
 };
 export declare const encodeQueryData: (data: encodeQueryDataType) => string;
@@ -20,7 +20,7 @@ export declare const regexPatterns: {
     personalNumber: RegExp;
     orgnr: RegExp;
 };
-declare type errorObjectType = {
+type errorObjectType = {
     message: string;
     fields?: {
         [key: string]: any;
@@ -33,8 +33,8 @@ export declare const wrapPromise: (promise: any) => {
     read: () => 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 orderByPosition: (a: any, b: any) => 0 | 1 | -1;
+export declare const orderByField: (a: any, b: any, field: string) => 0 | 1 | -1;
 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;

package/dist/modules/VoHelpers.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -121,7 +121,7 @@ exports.regexPatterns = {
     username: /(^[a-z]{3,})([\.]|[\_]|[\-]|[a-z]|[0-9]?)+$/,
     email: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
     stringNonDigit: /^[^0-9]+$/,
-    password: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[a-zA-Z]).{8,}$/,
+    password: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[a-zA-Z]).{8,}$/, // At least 8 characters, 1 uppercase, 1 lowercase and 1 digit.
     cleanName: /(^[a-z]{1,})(\w|-?)+$/,
     personalNumber: /^(\d{8})[-]\d{4}$/,
     orgnr: /^(\d{6})[-]\d{4}$/,

package/dist/modules/VoRouter.d.ts

@@ -1,4 +1,4 @@
-declare type RoutesType = {
+type RoutesType = {
     [key: string]: any;
 };
 declare class VoRouter {

package/dist/modules/VoUtils_REMOVE.d.ts

@@ -6,7 +6,7 @@ declare const localStorage: {
     get: (key: string) => string | false | null;
     remove: (key: string) => true | undefined;
 };
-declare type encodeQueryDataType = {
+type encodeQueryDataType = {
     [key: string]: any;
 };
 declare const encodeQueryData: (data: encodeQueryDataType) => string;
@@ -16,7 +16,7 @@ declare const regexPatterns: {
     stringNonDigit: RegExp;
     password: RegExp;
 };
-declare type errorObjectType = {
+type errorObjectType = {
     message: string;
     fields?: {
         [key: string]: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vocollege/app",
-  "version": "0.0.134",
+  "version": "0.0.136",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -39,7 +39,7 @@
     "graphql": "^14.0.0 || ^15.0.0",
     "he": "^1.2.0",
     "js-cookie": "^3.0.1",
-    "react": "^18.1.0",
+    "react": "^18.3.1",
     "react-toastify": "^8.0.0"
   }
 }

package/src/modules/VoApi/GraphClient.ts

@@ -26,7 +26,7 @@ class GraphClient {
   static createGraphClient(
     url: string,
     uploadLink = false,
-    params: GeneralObject = {}
+    params: GeneralObject = {},
   ) {
     let httpLink;
 
@@ -91,12 +91,30 @@ class GraphClient {
           //       "field",
           //     ],
           //   },
+
+          ValidigGeneralSurveyRow: {
+            fields: {
+              options: {
+                read(existing) {
+                  return existing ? JSON.parse(existing) : existing;
+                },
+                // merge(existing = "", incoming: "") {
+                //   console.log("existing", existing);
+                //   console.log("incoming", incoming);
+
+                //   // return [...existing, ...incoming];
+                //   return incoming;
+                // },
+              },
+            },
+          },
         },
       }),
       link: from([
         links.errorLink,
         links.authLink,
         links.omitTypenameLink,
+        links.transformVariablesLink,
         httpLink,
       ]),
     });
@@ -146,7 +164,7 @@ class GraphClient {
           //   redirect();
           // }
         }
-      }
+      },
     );
 
     // Create authLink that ensures that all calls include
@@ -168,6 +186,12 @@ class GraphClient {
         masquerade = JSON.parse(masquerade);
       }
 
+      let userLicensee: any = localStorage.get(VoConfig.get.USER_LICENSEE);
+
+      if (userLicensee) {
+        userLicensee = JSON.parse(userLicensee);
+      }
+
       operation.setContext(() => ({
         ...currentHeaders,
         headers: {
@@ -177,6 +201,7 @@ class GraphClient {
             : "",
           VoGroup: groupId,
           ...(masquerade && { VoMasquerade: masquerade?.id }),
+          ...(userLicensee && { VoLicensee: userLicensee }),
         },
       }));
       return forward(operation);
@@ -186,16 +211,60 @@ class GraphClient {
       if (operation.variables) {
         operation.variables = JSON.parse(
           JSON.stringify(operation.variables),
-          (key, value) => (key === "__typename" ? undefined : value)
+          (key, value) => (key === "__typename" ? undefined : value),
         );
       }
       return forward(operation);
     });
 
+    const transformVariablesLink = new ApolloLink((operation, forward) => {
+      const { operationName, variables } = operation;
+
+      switch (operationName) {
+        // Manipulate fields on GeneralSurvey.
+        case "CreateGeneralSurvey":
+        case "UpdateGeneralSurvey":
+          Object.keys(variables.input)
+            .filter((key: string) => Array.isArray(variables.input[key]))
+            .map((key: string) => {
+              // JSON stringify GeneralSurveyRow.options.
+              variables.input[key]
+                .filter((v: GeneralObject) => v?.options)
+                .map((v: GeneralObject) => {
+                  if (v.options) {
+                    v.options = JSON.stringify(v.options);
+                  }
+                });
+            });
+          break;
+      }
+
+      // Traverse the variables and convert objects to JSON strings as needed
+      // const transformVariables = (vars) => {
+      //   if (!vars || typeof vars !== 'object') return vars;
+
+      //   return Object.keys(vars).reduce((acc, key) => {
+      //     const value = vars[key];
+
+      //     // Check if the value is an object that needs conversion
+      //     acc[key] = value && typeof value === 'object' && !(value instanceof Array)
+      //       ? JSON.stringify(value)
+      //       : value;
+
+      //     return acc;
+      //   }, {});
+      // };
+
+      // operation.variables = transformVariables(variables);
+
+      return forward(operation);
+    });
+
     return {
       errorLink,
       authLink,
       omitTypenameLink,
+      transformVariablesLink,
     };
   }
 

package/src/modules/VoAuth.ts

@@ -144,6 +144,7 @@ class VoAuth extends VoBase {
 
     Helpers.localStorage.remove(VoConfig.get.CURRENT_GROUP || "");
     Helpers.localStorage.remove(VoConfig.get.MASQUERADE_USER || "");
+    Helpers.localStorage.remove(VoConfig.get.USER_LICENSEE || "");
 
     delete axios.defaults.headers.common["Authorization"];
   }

package/src/modules/VoConfig.ts

@@ -53,6 +53,7 @@ class VoConfig {
 
     CURRENT_GROUP: "vo_group",
     MASQUERADE_USER: "vo_masquerade",
+    USER_LICENSEE: "vo_licensee",
   };
 
   setConfig(config: VoConfigType) {