@griddo/ax 11.10.11-rc.0 → 11.10.11

package/src/api/users.tsx

@@ -2,162 +2,162 @@ import { template } from "./config";
 import { IServiceConfig, sendInitialRequest, sendRequest } from "./utils";
 
 const SERVICES: { [key: string]: IServiceConfig } = {
-  GET_USERS: {
-    ...template,
-    endpoint: "/users",
-    method: "GET",
-  },
-  GET_SITE_USERS: {
-    ...template,
-    endpoint: ["/site/", "/users"],
-    method: "GET",
-  },
-  GET_USER: {
-    ...template,
-    endpoint: "/user/",
-    method: "GET",
-  },
-  UPDATE_USER: {
-    ...template,
-    endpoint: "/user/",
-    method: "PUT",
-  },
-  UPDATE_PASSWORD: {
-    ...template,
-    endpoint: ["/user/", "/password/change"],
-    method: "PUT",
-  },
-  CREATE_USER: {
-    ...template,
-    endpoint: "/user",
-    method: "POST",
-  },
-  DELETE_USER: {
-    ...template,
-    endpoint: "/user/",
-    method: "DELETE",
-  },
-  DELETE_USER_BULK: {
-    ...template,
-    endpoint: "/user/bulk",
-    method: "DELETE",
-  },
-  RESEND: {
-    ...template,
-    endpoint: ["/user/", "/resend"],
-    method: "PUT",
-  },
-  REMOVE_USER_SITE: {
-    ...template,
-    endpoint: ["/user/", "/site/"],
-    method: "DELETE",
-  },
+	GET_USERS: {
+		...template,
+		endpoint: "/users",
+		method: "GET",
+	},
+	GET_SITE_USERS: {
+		...template,
+		endpoint: ["/site/", "/users"],
+		method: "GET",
+	},
+	GET_USER: {
+		...template,
+		endpoint: "/user/",
+		method: "GET",
+	},
+	UPDATE_USER: {
+		...template,
+		endpoint: "/user/",
+		method: "PUT",
+	},
+	UPDATE_PASSWORD: {
+		...template,
+		endpoint: ["/user/", "/password/change"],
+		method: "PUT",
+	},
+	CREATE_USER: {
+		...template,
+		endpoint: "/user",
+		method: "POST",
+	},
+	DELETE_USER: {
+		...template,
+		endpoint: "/user/",
+		method: "DELETE",
+	},
+	DELETE_USER_BULK: {
+		...template,
+		endpoint: "/user/bulk",
+		method: "DELETE",
+	},
+	RESEND: {
+		...template,
+		endpoint: ["/user/", "/resend"],
+		method: "PUT",
+	},
+	REMOVE_USER_SITE: {
+		...template,
+		endpoint: ["/user/", "/site/"],
+		method: "DELETE",
+	},
 };
 
 const getUsers = async (params: any) => {
-  const { host, endpoint } = SERVICES.GET_USERS;
+	const { host, endpoint } = SERVICES.GET_USERS;
 
-  const { query, filterQuery } = params;
+	const { query, filterQuery } = params;
 
-  SERVICES.GET_USERS.dynamicUrl = `${host}${endpoint}${filterQuery}`;
+	SERVICES.GET_USERS.dynamicUrl = `${host}${endpoint}${filterQuery}`;
 
-  if (query && query.trim() !== "") {
-    SERVICES.GET_USERS.dynamicUrl = `${SERVICES.GET_USERS.dynamicUrl}${query}`;
-  }
+	if (query && query.trim() !== "") {
+		SERVICES.GET_USERS.dynamicUrl = `${SERVICES.GET_USERS.dynamicUrl}${query}`;
+	}
 
-  return sendRequest(SERVICES.GET_USERS);
+	return sendRequest(SERVICES.GET_USERS);
 };
 
 const getSiteUsers = async (params: any, siteID: number) => {
-  const {
-    host,
-    endpoint: [prefix, suffix],
-  } = SERVICES.GET_SITE_USERS;
+	const {
+		host,
+		endpoint: [prefix, suffix],
+	} = SERVICES.GET_SITE_USERS;
 
-  const { query, filterQuery } = params;
+	const { query, filterQuery } = params;
 
-  SERVICES.GET_SITE_USERS.dynamicUrl = `${host}${prefix}${siteID}${suffix}${filterQuery}`;
+	SERVICES.GET_SITE_USERS.dynamicUrl = `${host}${prefix}${siteID}${suffix}${filterQuery}`;
 
-  if (query && query.trim() !== "") {
-    SERVICES.GET_SITE_USERS.dynamicUrl = `${SERVICES.GET_SITE_USERS.dynamicUrl}${query}`;
-  }
+	if (query && query.trim() !== "") {
+		SERVICES.GET_SITE_USERS.dynamicUrl = `${SERVICES.GET_SITE_USERS.dynamicUrl}${query}`;
+	}
 
-  return sendRequest(SERVICES.GET_SITE_USERS);
+	return sendRequest(SERVICES.GET_SITE_USERS);
 };
 
 const getUser = async (id: string | number, token?: string) => {
-  const { host, endpoint } = SERVICES.GET_USER;
+	const { host, endpoint } = SERVICES.GET_USER;
 
-  SERVICES.GET_USER.dynamicUrl = `${host}${endpoint}${id}`;
+	SERVICES.GET_USER.dynamicUrl = `${host}${endpoint}${id}`;
 
-  return token ? sendInitialRequest(SERVICES.GET_USER, token) : sendRequest(SERVICES.GET_USER);
+	return token ? sendInitialRequest(SERVICES.GET_USER, token) : sendRequest(SERVICES.GET_USER);
 };
 
 const updateUser = async (id: number, data: any) => {
-  const { host, endpoint } = SERVICES.UPDATE_USER;
+	const { host, endpoint } = SERVICES.UPDATE_USER;
 
-  SERVICES.UPDATE_USER.dynamicUrl = `${host}${endpoint}${id}`;
+	SERVICES.UPDATE_USER.dynamicUrl = `${host}${endpoint}${id}`;
 
-  return sendRequest(SERVICES.UPDATE_USER, data);
+	return sendRequest(SERVICES.UPDATE_USER, data);
 };
 
 const updatePassword = async (id: number, data: any) => {
-  const {
-    host,
-    endpoint: [prefix, suffix],
-  } = SERVICES.UPDATE_PASSWORD;
+	const {
+		host,
+		endpoint: [prefix, suffix],
+	} = SERVICES.UPDATE_PASSWORD;
 
-  SERVICES.UPDATE_PASSWORD.dynamicUrl = `${host}${prefix}${id}${suffix}`;
+	SERVICES.UPDATE_PASSWORD.dynamicUrl = `${host}${prefix}${id}${suffix}`;
 
-  return sendRequest(SERVICES.UPDATE_PASSWORD, data);
+	return sendRequest(SERVICES.UPDATE_PASSWORD, data);
 };
 
 const createUser = async (data: any) => {
-  return sendRequest(SERVICES.CREATE_USER, { ...data });
+	return sendRequest(SERVICES.CREATE_USER, { ...data });
 };
 
 const deleteUser = async (userID: number) => {
-  const { host, endpoint } = SERVICES.DELETE_USER;
+	const { host, endpoint } = SERVICES.DELETE_USER;
 
-  SERVICES.DELETE_USER.dynamicUrl = `${host}${endpoint}${userID}`;
-  return sendRequest(SERVICES.DELETE_USER);
+	SERVICES.DELETE_USER.dynamicUrl = `${host}${endpoint}${userID}`;
+	return sendRequest(SERVICES.DELETE_USER);
 };
 
 const deleteUserBulk = async (userID: number[]) => {
-  return sendRequest(SERVICES.DELETE_USER_BULK, { ids: userID });
+	return sendRequest(SERVICES.DELETE_USER_BULK, { ids: userID });
 };
 
 const resendInvitation = async (id: number) => {
-  const {
-    host,
-    endpoint: [prefix, suffix],
-  } = SERVICES.RESEND;
+	const {
+		host,
+		endpoint: [prefix, suffix],
+	} = SERVICES.RESEND;
 
-  SERVICES.RESEND.dynamicUrl = `${host}${prefix}${id}${suffix}`;
+	SERVICES.RESEND.dynamicUrl = `${host}${prefix}${id}${suffix}`;
 
-  return sendRequest(SERVICES.RESEND);
+	return sendRequest(SERVICES.RESEND);
 };
 
 const removeUserFromSite = async (userID: number, siteID: number) => {
-  const {
-    host,
-    endpoint: [prefix, suffix],
-  } = SERVICES.REMOVE_USER_SITE;
+	const {
+		host,
+		endpoint: [prefix, suffix],
+	} = SERVICES.REMOVE_USER_SITE;
 
-  SERVICES.REMOVE_USER_SITE.dynamicUrl = `${host}${prefix}${userID}${suffix}${siteID}`;
+	SERVICES.REMOVE_USER_SITE.dynamicUrl = `${host}${prefix}${userID}${suffix}${siteID}`;
 
-  return sendRequest(SERVICES.REMOVE_USER_SITE);
+	return sendRequest(SERVICES.REMOVE_USER_SITE);
 };
 
 export default {
-  getUsers,
-  getSiteUsers,
-  getUser,
-  updateUser,
-  updatePassword,
-  createUser,
-  deleteUser,
-  deleteUserBulk,
-  resendInvitation,
-  removeUserFromSite,
+	getUsers,
+	getSiteUsers,
+	getUser,
+	updateUser,
+	updatePassword,
+	createUser,
+	deleteUser,
+	deleteUserBulk,
+	resendInvitation,
+	removeUserFromSite,
 };

package/src/api/utils.tsx

@@ -2,67 +2,65 @@ import axios, { AxiosRequestConfig, AxiosResponse, Method, ResponseType } from "
 import { SET_ERROR } from "./../containers/App/constants";
 
 export interface IServiceConfig {
-  host: string | undefined;
-  endpoint: string | string[];
-  method: Method;
-  headers: { "Content-type": string; accept: string; site?: number | null; lang?: number };
-  hasToken: boolean;
-  dynamicUrl?: string;
-  responseType?: ResponseType;
-  onUploadProgress?: any;
+	host: string | undefined;
+	endpoint: string | string[];
+	method: Method;
+	headers: { "Content-type": string; accept: string; site?: number | null; lang?: number };
+	hasToken: boolean;
+	dynamicUrl?: string;
+	responseType?: ResponseType;
+	onUploadProgress?: any;
 }
 
 const getToken = (): Record<string, unknown> | null => {
-  // non-null assertion - we will always have token when here
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  const app = localStorage.getItem("persist:app");
-  if (!app) return null;
+	const app = localStorage.getItem("persist:app");
+	if (!app) return null;
 
-  let { token } = JSON.parse(app);
-  token = JSON.parse(token);
-  const authorization = { Authorization: `bearer ${token}` };
+	let { token } = JSON.parse(app);
+	token = JSON.parse(token);
+	const authorization = { Authorization: `bearer ${token}` };
 
-  return authorization;
+	return authorization;
 };
 
 const getLang = (): Record<string, unknown> => {
-  const lang = JSON.parse(localStorage.getItem("langID") || "{}");
+	const lang = JSON.parse(localStorage.getItem("langID") || "{}");
 
-  return { lang };
+	return { lang };
 };
 
 const getSite = (): Record<string, unknown> => {
-  const site = JSON.parse(localStorage.getItem("siteID") || "{}");
+	const site = JSON.parse(localStorage.getItem("siteID") || "{}");
 
-  return { site };
+	return { site };
 };
 
 const getHeaders = (headers: Record<string, unknown>, hasToken: boolean) => {
-  return hasToken
-    ? {
-        ...headers,
-        ...getToken(),
-        ...getLang(),
-        ...getSite(),
-      }
-    : {
-        ...headers,
-        ...getLang(),
-        ...getSite(),
-      };
+	return hasToken
+		? {
+				...headers,
+				...getToken(),
+				...getLang(),
+				...getSite(),
+			}
+		: {
+				...headers,
+				...getLang(),
+				...getSite(),
+			};
 };
 
 const wrapConfig = (serviceConfig: IServiceConfig): AxiosRequestConfig => {
-  const { host, endpoint, method, headers: configHeaders, hasToken, dynamicUrl, responseType } = serviceConfig;
+	const { host, endpoint, method, headers: configHeaders, hasToken, dynamicUrl, responseType } = serviceConfig;
 
-  const headers = getHeaders(configHeaders, hasToken);
+	const headers = getHeaders(configHeaders, hasToken);
 
-  return {
-    url: dynamicUrl ? dynamicUrl : `${host}${endpoint}`,
-    method,
-    headers,
-    responseType,
-  };
+	return {
+		url: dynamicUrl ? dynamicUrl : `${host}${endpoint}`,
+		method,
+		headers,
+		responseType,
+	};
 };
 
 /*class RequestCache {
@@ -91,144 +89,144 @@ const wrapConfig = (serviceConfig: IServiceConfig): AxiosRequestConfig => {
 const requestCache = new RequestCache();*/
 
 export const sendInitialRequest = async (
-  serviceConfig: IServiceConfig,
-  token: string,
-  data?: Record<string, unknown>
+	serviceConfig: IServiceConfig,
+	token: string,
+	data?: Record<string, unknown>,
 ): Promise<AxiosResponse> => {
-  const { headers: configHeaders, method, host, endpoint, dynamicUrl } = serviceConfig;
-
-  const config = {
-    url: dynamicUrl ? dynamicUrl : `${host}${endpoint}`,
-    method,
-    headers: {
-      ...configHeaders,
-      Authorization: "bearer " + token,
-    },
-  };
-
-  try {
-    const isPost = method === "PUT" || method === "POST";
-    if (isPost) {
-      const postConfig = { ...config, data };
-      const postResponse = await axios(postConfig);
-      return postResponse;
-    }
-    const response = await axios(config);
-    return response;
-  } catch (e) {
-    if (e.message !== "Network Error") {
-      return (
-        e.response || { status: e.status, data: { code: e.code || "unknown", message: e.message || "Platform error" } }
-      );
-    }
-    return e.response;
-  }
+	const { headers: configHeaders, method, host, endpoint, dynamicUrl } = serviceConfig;
+
+	const config = {
+		url: dynamicUrl ? dynamicUrl : `${host}${endpoint}`,
+		method,
+		headers: {
+			...configHeaders,
+			Authorization: "bearer " + token,
+		},
+	};
+
+	try {
+		const isPost = method === "PUT" || method === "POST";
+		if (isPost) {
+			const postConfig = { ...config, data };
+			const postResponse = await axios(postConfig);
+			return postResponse;
+		}
+		const response = await axios(config);
+		return response;
+	} catch (e) {
+		if (e.message !== "Network Error") {
+			return (
+				e.response || { status: e.status, data: { code: e.code || "unknown", message: e.message || "Platform error" } }
+			);
+		}
+		return e.response;
+	}
 };
 
 export const sendRequest = async (
-  serviceConfig: IServiceConfig,
-  data?: Record<string, unknown> | null | FormData,
-  dataHeader?: Record<string, unknown>
+	serviceConfig: IServiceConfig,
+	data?: Record<string, unknown> | null | FormData,
+	dataHeader?: Record<string, unknown>,
 ): Promise<AxiosResponse> => {
-  let config = wrapConfig(serviceConfig);
-  const headers = { ...config.headers, ...dataHeader };
-
-  if (dataHeader) {
-    config = { ...config, headers };
-  }
-
-  try {
-    const { method } = config;
-    let requestConfig = config;
-
-    const isGet = method === "GET";
-    if (!isGet) {
-      requestConfig = { ...config, data };
-    }
-
-    // TODO: Try to cache only on GETs
-    // let response = requestCache.get(requestConfig);
-
-    // if (response) {
-    //   return response;
-    // }
-
-    // response = await axios(requestConfig);
-    // requestCache.save(requestConfig, response);
-
-    // return response;
-    return await axios(requestConfig);
-  } catch (e) {
-    if (e.message !== "Network Error") {
-      return (
-        e.response || { status: e.status, data: { code: e.code || "unknown", message: e.message || "Platform error" } }
-      );
-    }
-    return e.response;
-  }
+	let config = wrapConfig(serviceConfig);
+	const headers = { ...config.headers, ...dataHeader };
+
+	if (dataHeader) {
+		config = { ...config, headers };
+	}
+
+	try {
+		const { method } = config;
+		let requestConfig = config;
+
+		const isGet = method === "GET";
+		if (!isGet) {
+			requestConfig = { ...config, data };
+		}
+
+		// TODO: Try to cache only on GETs
+		// let response = requestCache.get(requestConfig);
+
+		// if (response) {
+		//   return response;
+		// }
+
+		// response = await axios(requestConfig);
+		// requestCache.save(requestConfig, response);
+
+		// return response;
+		return await axios(requestConfig);
+	} catch (e) {
+		if (e.message !== "Network Error") {
+			return (
+				e.response || { status: e.status, data: { code: e.code || "unknown", message: e.message || "Platform error" } }
+			);
+		}
+		return e.response;
+	}
 };
 
 export const sendUploadRequest = async (
-  serviceConfig: IServiceConfig,
-  data: FormData,
-  setProgress?: (progress: number) => void
+	serviceConfig: IServiceConfig,
+	data: FormData,
+	setProgress?: (progress: number) => void,
 ): Promise<AxiosResponse> => {
-  try {
-    const config = wrapConfig(serviceConfig);
-    let requestConfig = {
-      ...config,
-      data,
-    };
-
-    if (setProgress) {
-      requestConfig = {
-        ...requestConfig,
-        onUploadProgress: (progressEvent: ProgressEvent) => {
-          const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total);
-          setProgress(percentCompleted);
-        },
-      };
-    }
-
-    return await axios(requestConfig);
-  } catch (e) {
-    if (e.message !== "Network Error") {
-      return (
-        e.response || { status: e.status, data: { code: e.code || "unknown", message: e.message || "Platform error" } }
-      );
-    }
-    return e.response;
-  }
+	try {
+		const config = wrapConfig(serviceConfig);
+		let requestConfig = {
+			...config,
+			data,
+		};
+
+		if (setProgress) {
+			requestConfig = {
+				...requestConfig,
+				onUploadProgress: (progressEvent: ProgressEvent) => {
+					const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+					setProgress(percentCompleted);
+				},
+			};
+		}
+
+		return await axios(requestConfig);
+	} catch (e) {
+		if (e.message !== "Network Error") {
+			return (
+				e.response || { status: e.status, data: { code: e.code || "unknown", message: e.message || "Platform error" } }
+			);
+		}
+		return e.response;
+	}
 };
 
 function defaultErrorHandler(errorType: number) {
-  // FIXME create DEFAULT ERROR
-  return { type: SET_ERROR, payload: { errorType, errorText: "This is a generic error" } };
+	// FIXME create DEFAULT ERROR
+	return { type: SET_ERROR, payload: { errorType, errorText: "This is a generic error" } };
 }
 
 const isSuccessful = (status: number): boolean => status >= 200 && status < 400;
 
 export function handleResponse(
-  response: AxiosResponse,
-  successHandler: (data: Record<string, unknown>) => Record<string, unknown>,
-  customErrorHandler?: (status: number) => Record<string, unknown>
+	response: AxiosResponse,
+	successHandler: (data: Record<string, unknown>) => Record<string, unknown>,
+	customErrorHandler?: (status: number) => Record<string, unknown>,
 ): Record<string, unknown> {
-  const { status, data } = response;
-  const errorHandler = customErrorHandler || defaultErrorHandler;
-
-  if (isSuccessful(status)) {
-    return successHandler(data);
-  } else {
-    return errorHandler(status);
-  }
+	const { status, data } = response;
+	const errorHandler = customErrorHandler || defaultErrorHandler;
+
+	if (isSuccessful(status)) {
+		return successHandler(data);
+	} else {
+		return errorHandler(status);
+	}
 }
 
 export default {
-  getToken,
-  getHeaders,
-  wrapConfig,
-  sendInitialRequest,
-  sendRequest,
-  isSuccessful,
-  handleResponse,
+	getToken,
+	getHeaders,
+	wrapConfig,
+	sendInitialRequest,
+	sendRequest,
+	isSuccessful,
+	handleResponse,
 };