Formatted all .ts files

This commit is contained in:
Donkie
2023-10-18 19:21:57 +02:00
parent 42cd250a92
commit f064ea589c
7 changed files with 321 additions and 332 deletions

View File

@@ -7,178 +7,170 @@ type MethodTypes = "get" | "delete" | "head" | "options";
type MethodTypesWithBody = "post" | "put" | "patch";
const dataProvider = (
apiUrl: string,
httpClient: AxiosInstance = axiosInstance,
): Omit<
Required<DataProvider>,
"createMany" | "updateMany" | "deleteMany"
> => ({
getList: async ({ resource, meta, pagination, sorters, filters }) => {
const url = `${apiUrl}/${resource}`;
apiUrl: string,
httpClient: AxiosInstance = axiosInstance
): Omit<Required<DataProvider>, "createMany" | "updateMany" | "deleteMany"> => ({
getList: async ({ resource, meta, pagination, sorters, filters }) => {
const url = `${apiUrl}/${resource}`;
const { headers: headersFromMeta, method } = meta ?? {};
const queryParams: Record<string, string | number> = meta?.queryParams ?? {};
const requestMethod = (method as MethodTypes) ?? "get";
const { headers: headersFromMeta, method } = meta ?? {};
const queryParams: Record<string, string | number> = meta?.queryParams ?? {};
const requestMethod = (method as MethodTypes) ?? "get";
if (pagination && pagination.mode == "server") {
const pageSize = pagination.pageSize ?? 10;
const offset = ((pagination.current ?? 1) - 1) * pageSize;
queryParams["limit"] = pageSize;
queryParams["offset"] = offset;
if (pagination && pagination.mode == "server") {
const pageSize = pagination.pageSize ?? 10;
const offset = ((pagination.current ?? 1) - 1) * pageSize;
queryParams["limit"] = pageSize;
queryParams["offset"] = offset;
}
if (sorters && sorters.length > 0) {
queryParams["sort"] = sorters
.map((sort) => {
const field = sort.field;
return `${field}:${sort.order}`;
})
.join(",");
}
if (filters && filters.length > 0) {
filters.forEach((filter) => {
if (!("field" in filter)) {
throw Error("Filter must be a LogicalFilter.");
}
const field = filter.field;
if (filter.value.length > 0) {
const filterValueArray = Array.isArray(filter.value) ? filter.value : [filter.value];
if (sorters && sorters.length > 0) {
queryParams["sort"] = sorters.map((sort) => {
const field = sort.field
return `${field}:${sort.order}`;
}).join(",")
const filterValue = filterValueArray
.map((value) => {
if (value === "<empty>") {
return "";
}
return value;
})
.join(",");
queryParams[field] = filterValue;
}
});
}
if (filters && filters.length > 0) {
filters.forEach(filter => {
if (!("field" in filter)) {
throw Error("Filter must be a LogicalFilter.")
}
const field = filter.field
if (filter.value.length > 0) {
const filterValueArray = Array.isArray(filter.value) ? filter.value : [filter.value]
const { data, headers } = await httpClient[requestMethod](`${url}`, {
headers: headersFromMeta,
params: queryParams,
});
const filterValue = filterValueArray.map((value) => {
if (value === "<empty>") {
return ""
}
return value
}).join(",")
// console.log(url, requestMethod, queryParams, data, headers)
queryParams[field] = filterValue
}
});
}
return {
data,
total: parseInt(headers["x-total-count"]) ?? 100,
};
},
const { data, headers } = await httpClient[requestMethod](
`${url}`,
{
headers: headersFromMeta,
params: queryParams,
},
);
getMany: async () => {
throw new Error("getMany not implemented");
},
// console.log(url, requestMethod, queryParams, data, headers)
create: async ({ resource, variables, meta }) => {
const url = `${apiUrl}/${resource}`;
return {
data,
total: parseInt(headers["x-total-count"]) ?? 100,
};
},
const { headers, method } = meta ?? {};
const requestMethod = (method as MethodTypesWithBody) ?? "post";
getMany: async () => {
throw new Error("getMany not implemented");
},
const { data } = await httpClient[requestMethod](url, variables, {
headers,
});
create: async ({ resource, variables, meta }) => {
const url = `${apiUrl}/${resource}`;
return {
data,
};
},
const { headers, method } = meta ?? {};
const requestMethod = (method as MethodTypesWithBody) ?? "post";
update: async ({ resource, id, variables, meta }) => {
const url = `${apiUrl}/${resource}/${id}`;
const { data } = await httpClient[requestMethod](url, variables, {
headers,
const { headers, method } = meta ?? {};
const requestMethod = (method as MethodTypesWithBody) ?? "patch";
const { data } = await httpClient[requestMethod](url, variables, {
headers,
});
return {
data,
};
},
getOne: async ({ resource, id, meta }) => {
const url = `${apiUrl}/${resource}/${id}`;
const { headers, method } = meta ?? {};
const requestMethod = (method as MethodTypes) ?? "get";
const { data } = await httpClient[requestMethod](url, { headers });
return {
data,
};
},
deleteOne: async ({ resource, id, variables, meta }) => {
const url = `${apiUrl}/${resource}/${id}`;
const { headers, method } = meta ?? {};
const requestMethod = (method as MethodTypesWithBody) ?? "delete";
const { data } = await httpClient[requestMethod](url, {
data: variables,
headers,
});
return {
data,
};
},
getApiUrl: () => {
return apiUrl;
},
custom: async ({ url, method, payload, query, headers }) => {
let requestUrl = `${url}?`;
if (query) {
requestUrl = `${requestUrl}&${stringify(query)}`;
}
if (headers) {
httpClient.defaults.headers = {
...httpClient.defaults.headers,
...headers,
};
}
let axiosResponse;
switch (method) {
case "put":
case "post":
case "patch":
axiosResponse = await httpClient[method](url, payload);
break;
case "delete":
axiosResponse = await httpClient.delete(url, {
data: payload,
});
break;
default:
axiosResponse = await httpClient.get(requestUrl);
break;
}
return {
data,
};
},
const { data } = axiosResponse;
update: async ({ resource, id, variables, meta }) => {
const url = `${apiUrl}/${resource}/${id}`;
const { headers, method } = meta ?? {};
const requestMethod = (method as MethodTypesWithBody) ?? "patch";
const { data } = await httpClient[requestMethod](url, variables, {
headers,
});
return {
data,
};
},
getOne: async ({ resource, id, meta }) => {
const url = `${apiUrl}/${resource}/${id}`;
const { headers, method } = meta ?? {};
const requestMethod = (method as MethodTypes) ?? "get";
const { data } = await httpClient[requestMethod](url, { headers });
return {
data,
};
},
deleteOne: async ({ resource, id, variables, meta }) => {
const url = `${apiUrl}/${resource}/${id}`;
const { headers, method } = meta ?? {};
const requestMethod = (method as MethodTypesWithBody) ?? "delete";
const { data } = await httpClient[requestMethod](url, {
data: variables,
headers,
});
return {
data,
};
},
getApiUrl: () => {
return apiUrl;
},
custom: async ({
url,
method,
payload,
query,
headers,
}) => {
let requestUrl = `${url}?`;
if (query) {
requestUrl = `${requestUrl}&${stringify(query)}`;
}
if (headers) {
httpClient.defaults.headers = {
...httpClient.defaults.headers,
...headers,
};
}
let axiosResponse;
switch (method) {
case "put":
case "post":
case "patch":
axiosResponse = await httpClient[method](url, payload);
break;
case "delete":
axiosResponse = await httpClient.delete(url, {
data: payload,
});
break;
default:
axiosResponse = await httpClient.get(requestUrl);
break;
}
const { data } = axiosResponse;
return Promise.resolve({ data });
},
return Promise.resolve({ data });
},
});
export default dataProvider;

View File

@@ -4,13 +4,13 @@ import { BaseKey, LiveEvent, LiveProvider } from "@refinedev/core";
* A spoolman websocket event.
*/
interface Event {
type: "updated" | "deleted" | "added";
resource: "filament" | "spool" | "vendor";
date: string;
payload: {
id: number;
[key: string]: unknown;
};
type: "updated" | "deleted" | "added";
resource: "filament" | "spool" | "vendor";
date: string;
payload: {
id: number;
[key: string]: unknown;
};
}
/**
@@ -21,25 +21,24 @@ interface Event {
* @returns The WebSocket URL
*/
function toWebsocketURL(apiUrl: string) {
if (apiUrl[0] === "/") {
// Relative URL, e.g. "/api/v1/..."
if (apiUrl[0] === "/") {
// Relative URL, e.g. "/api/v1/..."
// Get the current browser URL
const currentURL = window.location.href;
// Get the current browser URL
const currentURL = window.location.href;
// Split the URL to separate the protocol, host, and path
const urlParts = currentURL.split('/');
const host = urlParts[2];
// Split the URL to separate the protocol, host, and path
const urlParts = currentURL.split("/");
const host = urlParts[2];
// Create the WebSocket URL by adding "ws://" as the protocol and the relative URL as the path
return `ws://${host}${apiUrl}`;
}
else {
// Absolute URL, e.g. "https://example.com/api/v1/..."
// Create the WebSocket URL by adding "ws://" as the protocol and the relative URL as the path
return `ws://${host}${apiUrl}`;
} else {
// Absolute URL, e.g. "https://example.com/api/v1/..."
// Replace the protocol with "ws://"
return apiUrl.replace(/^http/, 'ws');
}
// Replace the protocol with "ws://"
return apiUrl.replace(/^http/, "ws");
}
}
/**
@@ -51,77 +50,72 @@ function toWebsocketURL(apiUrl: string) {
* @param id Specific ID to subscribe to, if any. If not specified, subscribes to all IDs.
* @returns A function to unsubscribe from the resource
*/
function subscribeSingle(apiUrl: string, channel: string, resource: string, callback: (event: LiveEvent) => void, id?: BaseKey) {
// Verify that WebSockets are supported
if (!('WebSocket' in window)) {
console.warn("WebSockets are not supported in this browser. Live updates will not be available.");
return () => { };
}
function subscribeSingle(
apiUrl: string,
channel: string,
resource: string,
callback: (event: LiveEvent) => void,
id?: BaseKey
) {
// Verify that WebSockets are supported
if (!("WebSocket" in window)) {
console.warn("WebSockets are not supported in this browser. Live updates will not be available.");
return () => {};
}
const websocketURL = id ? toWebsocketURL(`${apiUrl}/${resource}/${id}`) : toWebsocketURL(`${apiUrl}/${resource}`);
const websocketURL = id ? toWebsocketURL(`${apiUrl}/${resource}/${id}`) : toWebsocketURL(`${apiUrl}/${resource}`);
const ws = new WebSocket(websocketURL);
ws.onmessage = (message) => {
const data: Event = JSON.parse(message.data);
const type = data.type === "added" ? "created" : data.type;
const date = new Date(data.date);
const ws = new WebSocket(websocketURL);
ws.onmessage = (message) => {
const data: Event = JSON.parse(message.data);
const type = data.type === "added" ? "created" : data.type;
const date = new Date(data.date);
const liveEvent: LiveEvent = {
channel: channel,
type: type,
payload: {
data: data.payload,
ids: [data.payload.id],
},
date: date,
}
callback(liveEvent);
const liveEvent: LiveEvent = {
channel: channel,
type: type,
payload: {
data: data.payload,
ids: [data.payload.id],
},
date: date,
};
return () => {
ws.close();
};
callback(liveEvent);
};
return () => {
ws.close();
};
}
const liveProvider = (
apiUrl: string,
): LiveProvider => ({
subscribe: ({ channel, params, callback }) => {
const {
resource,
subscriptionType,
id,
ids,
} = params ?? {};
const liveProvider = (apiUrl: string): LiveProvider => ({
subscribe: ({ channel, params, callback }) => {
const { resource, subscriptionType, id, ids } = params ?? {};
if (!subscriptionType) {
throw new Error(
"[useSubscription]: `subscriptionType` is required in `params`",
);
}
if (!subscriptionType) {
throw new Error("[useSubscription]: `subscriptionType` is required in `params`");
}
if (!resource) {
throw new Error(
"[useSubscription]: `resource` is required in `params`",
);
}
if (!resource) {
throw new Error("[useSubscription]: `resource` is required in `params`");
}
let idList: BaseKey[];
if (ids) idList = ids;
else if (id) idList = [id];
else {
// No ID specified, subscribe to all IDs
return [subscribeSingle(apiUrl, channel, resource, callback)]
}
let idList: BaseKey[];
if (ids) idList = ids;
else if (id) idList = [id];
else {
// No ID specified, subscribe to all IDs
return [subscribeSingle(apiUrl, channel, resource, callback)];
}
return idList.map((id) => {
return subscribeSingle(apiUrl, channel, resource, callback, id);
});
},
unsubscribe: (closers: (() => void)[]) => {
closers.forEach((fn) => fn());
},
})
return idList.map((id) => {
return subscribeSingle(apiUrl, channel, resource, callback, id);
});
},
unsubscribe: (closers: (() => void)[]) => {
closers.forEach((fn) => fn());
},
});
export default liveProvider;

View File

@@ -1,17 +1,16 @@
import { ISpool } from "./model";
export async function setSpoolArchived(spool: ISpool, archived: boolean) {
const apiEndpoint = import.meta.env.VITE_APIURL;
const init: RequestInit = {
method: "PATCH",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
archived: archived,
}),
};
const request = new Request(apiEndpoint + "/spool/" + spool.id);
await fetch(request, init);
const apiEndpoint = import.meta.env.VITE_APIURL;
const init: RequestInit = {
method: "PATCH",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
archived: archived,
}),
};
const request = new Request(apiEndpoint + "/spool/" + spool.id);
await fetch(request, init);
}

View File

@@ -1,13 +1,13 @@
import { CrudFilter, CrudOperators } from "@refinedev/core";
interface TypedCrudFilter<Obj> {
field: keyof Obj;
operator: Exclude<CrudOperators, "or" | "and">;
value: string[];
field: keyof Obj;
operator: Exclude<CrudOperators, "or" | "and">;
value: string[];
}
export function typeFilters<Obj>(filters: CrudFilter[]): TypedCrudFilter<Obj>[] {
return filters as TypedCrudFilter<Obj>[]; // <-- Unsafe cast
return filters as TypedCrudFilter<Obj>[]; // <-- Unsafe cast
}
/**
@@ -16,12 +16,15 @@ export function typeFilters<Obj>(filters: CrudFilter[]): TypedCrudFilter<Obj>[]
* @param field The field to get the filter values for.
* @returns An array of filter values for the given field.
*/
export function getFiltersForField<Obj, Field extends keyof Obj>(filters: TypedCrudFilter<Obj>[], field: Field): string[] {
const filterValues: string[] = [];
filters.forEach((filter) => {
if (filter.field === field) {
filterValues.push(...filter.value as string[]);
}
});
return filterValues;
export function getFiltersForField<Obj, Field extends keyof Obj>(
filters: TypedCrudFilter<Obj>[],
field: Field
): string[] {
const filterValues: string[] = [];
filters.forEach((filter) => {
if (filter.field === field) {
filterValues.push(...(filter.value as string[]));
}
});
return filterValues;
}

View File

@@ -3,74 +3,74 @@ import { CrudFilter, CrudSort } from "@refinedev/core";
import { isLocalStorageAvailable } from "./support";
interface Pagination {
current: number;
pageSize: number;
current: number;
pageSize: number;
}
export interface TableState {
sorters: CrudSort[];
filters: CrudFilter[];
pagination: Pagination;
showColumns?: string[];
sorters: CrudSort[];
filters: CrudFilter[];
pagination: Pagination;
showColumns?: string[];
}
export function useInitialTableState(tableId: string): TableState {
const [initialState] = React.useState(() => {
const savedSorters = isLocalStorageAvailable ? localStorage.getItem(`${tableId}-sorters`) : null;
const savedFilters = isLocalStorageAvailable ? localStorage.getItem(`${tableId}-filters`) : null;
const savedPagination = isLocalStorageAvailable ? localStorage.getItem(`${tableId}-pagination`) : null;
const savedShowColumns = isLocalStorageAvailable ? localStorage.getItem(`${tableId}-showColumns`) : null;
const [initialState] = React.useState(() => {
const savedSorters = isLocalStorageAvailable ? localStorage.getItem(`${tableId}-sorters`) : null;
const savedFilters = isLocalStorageAvailable ? localStorage.getItem(`${tableId}-filters`) : null;
const savedPagination = isLocalStorageAvailable ? localStorage.getItem(`${tableId}-pagination`) : null;
const savedShowColumns = isLocalStorageAvailable ? localStorage.getItem(`${tableId}-showColumns`) : null;
const sorters = savedSorters ? JSON.parse(savedSorters) : [{ field: "id", order: "asc" }];
const filters = savedFilters ? JSON.parse(savedFilters) : [];
const pagination = savedPagination ? JSON.parse(savedPagination) : { page: 1, pageSize: 20 };
const showColumns = savedShowColumns ? JSON.parse(savedShowColumns) : undefined;
return { sorters, filters, pagination, showColumns };
});
return initialState;
const sorters = savedSorters ? JSON.parse(savedSorters) : [{ field: "id", order: "asc" }];
const filters = savedFilters ? JSON.parse(savedFilters) : [];
const pagination = savedPagination ? JSON.parse(savedPagination) : { page: 1, pageSize: 20 };
const showColumns = savedShowColumns ? JSON.parse(savedShowColumns) : undefined;
return { sorters, filters, pagination, showColumns };
});
return initialState;
}
export function useStoreInitialState(tableId: string, state: TableState) {
React.useEffect(() => {
if (isLocalStorageAvailable) {
localStorage.setItem(`${tableId}-sorters`, JSON.stringify(state.sorters));
}
}, [tableId, state.sorters]);
React.useEffect(() => {
if (isLocalStorageAvailable) {
localStorage.setItem(`${tableId}-sorters`, JSON.stringify(state.sorters));
}
}, [tableId, state.sorters]);
React.useEffect(() => {
if (isLocalStorageAvailable) {
localStorage.setItem(`${tableId}-filters`, JSON.stringify(state.filters));
}
}, [tableId, state.filters]);
React.useEffect(() => {
if (isLocalStorageAvailable) {
localStorage.setItem(`${tableId}-filters`, JSON.stringify(state.filters));
}
}, [tableId, state.filters]);
React.useEffect(() => {
if (isLocalStorageAvailable) {
localStorage.setItem(`${tableId}-pagination`, JSON.stringify(state.pagination));
}
}, [tableId, state.pagination]);
React.useEffect(() => {
if (isLocalStorageAvailable) {
localStorage.setItem(`${tableId}-pagination`, JSON.stringify(state.pagination));
}
}, [tableId, state.pagination]);
React.useEffect(() => {
if (isLocalStorageAvailable) {
if (state.showColumns === undefined) {
localStorage.removeItem(`${tableId}-showColumns`);
} else {
localStorage.setItem(`${tableId}-showColumns`, JSON.stringify(state.showColumns));
}
}
}, [tableId, state.showColumns]);
React.useEffect(() => {
if (isLocalStorageAvailable) {
if (state.showColumns === undefined) {
localStorage.removeItem(`${tableId}-showColumns`);
} else {
localStorage.setItem(`${tableId}-showColumns`, JSON.stringify(state.showColumns));
}
}
}, [tableId, state.showColumns]);
}
export function useSavedState<T>(id: string, defaultValue: T) {
const [state, setState] = React.useState<T>(() => {
const savedState = isLocalStorageAvailable ? localStorage.getItem(`savedStates-${id}`) : null;
return savedState ? JSON.parse(savedState) : defaultValue;
});
const [state, setState] = React.useState<T>(() => {
const savedState = isLocalStorageAvailable ? localStorage.getItem(`savedStates-${id}`) : null;
return savedState ? JSON.parse(savedState) : defaultValue;
});
React.useEffect(() => {
if (isLocalStorageAvailable) {
localStorage.setItem(`savedStates-${id}`, JSON.stringify(state));
}
}, [id, state]);
React.useEffect(() => {
if (isLocalStorageAvailable) {
localStorage.setItem(`savedStates-${id}`, JSON.stringify(state));
}
}, [id, state]);
return [state, setState] as const;
return [state, setState] as const;
}

View File

@@ -1,10 +1,9 @@
import { CrudSort } from "@refinedev/core";
import { SortOrder } from "antd/es/table/interface";
interface TypedCrudSort<Obj> {
field: keyof Obj;
order: "asc" | "desc";
field: keyof Obj;
order: "asc" | "desc";
}
/**
@@ -13,14 +12,17 @@ interface TypedCrudSort<Obj> {
* @param field The field to get the sort order for.
* @returns The sort order for the given field, or undefined if the field is not being sorted.
*/
export function getSortOrderForField<Obj, Field extends keyof Obj>(sorters: TypedCrudSort<Obj>[], field: Field): SortOrder | undefined {
const sorter = sorters.find((s) => s.field === field);
if (sorter) {
return sorter.order === "asc" ? "ascend" : "descend";
}
return undefined;
export function getSortOrderForField<Obj, Field extends keyof Obj>(
sorters: TypedCrudSort<Obj>[],
field: Field
): SortOrder | undefined {
const sorter = sorters.find((s) => s.field === field);
if (sorter) {
return sorter.order === "asc" ? "ascend" : "descend";
}
return undefined;
}
export function typeSorters<Obj>(sorters: CrudSort[]): TypedCrudSort<Obj>[] {
return sorters as TypedCrudSort<Obj>[]; // <-- Unsafe cast
return sorters as TypedCrudSort<Obj>[]; // <-- Unsafe cast
}

View File

@@ -1,12 +1,11 @@
function _isLocalStorageAvailable(): boolean {
try {
localStorage.setItem('test', 'test');
localStorage.removeItem('test');
return true;
} catch (e) {
return false;
}
try {
localStorage.setItem("test", "test");
localStorage.removeItem("test");
return true;
} catch (e) {
return false;
}
}
export const isLocalStorageAvailable = _isLocalStorageAvailable();