aboutsummaryrefslogtreecommitdiff
path: root/Timeline/ClientApp/src/app/utilities
diff options
context:
space:
mode:
Diffstat (limited to 'Timeline/ClientApp/src/app/utilities')
-rw-r--r--Timeline/ClientApp/src/app/utilities/rxjs.ts28
-rw-r--r--Timeline/ClientApp/src/app/utilities/type.ts2
-rw-r--r--Timeline/ClientApp/src/app/utilities/url.ts104
3 files changed, 67 insertions, 67 deletions
diff --git a/Timeline/ClientApp/src/app/utilities/rxjs.ts b/Timeline/ClientApp/src/app/utilities/rxjs.ts
index 1be49164..0730b899 100644
--- a/Timeline/ClientApp/src/app/utilities/rxjs.ts
+++ b/Timeline/ClientApp/src/app/utilities/rxjs.ts
@@ -1,14 +1,14 @@
-import { OperatorFunction } from 'rxjs';
-import { catchError } from 'rxjs/operators';
-
-export function convertError<T, NewError>(
- oldErrorType: { new (...args: never[]): unknown },
- newErrorType: { new (): NewError }
-): OperatorFunction<T, T> {
- return catchError((error) => {
- if (error instanceof oldErrorType) {
- throw new newErrorType();
- }
- throw error;
- });
-}
+import { OperatorFunction } from "rxjs";
+import { catchError } from "rxjs/operators";
+
+export function convertError<T, NewError>(
+ oldErrorType: { new (...args: never[]): unknown },
+ newErrorType: { new (): NewError }
+): OperatorFunction<T, T> {
+ return catchError((error) => {
+ if (error instanceof oldErrorType) {
+ throw new newErrorType();
+ }
+ throw error;
+ });
+}
diff --git a/Timeline/ClientApp/src/app/utilities/type.ts b/Timeline/ClientApp/src/app/utilities/type.ts
index 307e5825..8df9bf0f 100644
--- a/Timeline/ClientApp/src/app/utilities/type.ts
+++ b/Timeline/ClientApp/src/app/utilities/type.ts
@@ -1 +1 @@
-export type ExcludeKey<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+export type ExcludeKey<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
diff --git a/Timeline/ClientApp/src/app/utilities/url.ts b/Timeline/ClientApp/src/app/utilities/url.ts
index 90923fd2..17ead5b2 100644
--- a/Timeline/ClientApp/src/app/utilities/url.ts
+++ b/Timeline/ClientApp/src/app/utilities/url.ts
@@ -1,52 +1,52 @@
-//copied from https://stackoverflow.com/questions/5999118/how-can-i-add-or-update-a-query-string-parameter
-export function updateQueryString(
- key: string,
- value: undefined | string | null,
- url: string
-): string {
- const re = new RegExp('([?&])' + key + '=.*?(&|#|$)(.*)', 'gi');
- let hash;
-
- if (re.test(url)) {
- if (typeof value !== 'undefined' && value !== null) {
- return url.replace(re, '$1' + key + '=' + value + '$2$3');
- } else {
- hash = url.split('#');
- url = hash[0].replace(re, '$1$3').replace(/(&|\?)$/, '');
- if (typeof hash[1] !== 'undefined' && hash[1] !== null) {
- url += '#' + hash[1];
- }
- return url;
- }
- } else {
- if (typeof value !== 'undefined' && value !== null) {
- const separator = url.includes('?') ? '&' : '?';
- hash = url.split('#');
- url = hash[0] + separator + key + '=' + value;
- if (typeof hash[1] !== 'undefined' && hash[1] !== null) {
- url += '#' + hash[1];
- }
- return url;
- } else {
- return url;
- }
- }
-}
-
-export function applyQueryParameters<T>(url: string, query: T): string {
- if (query == null) return url;
-
- for (const [key, value] of Object.entries(query)) {
- if (typeof value === 'string') url = updateQueryString(key, value, url);
- else if (typeof value === 'number')
- url = updateQueryString(key, String(value), url);
- else if (typeof value === 'boolean')
- url = updateQueryString(key, value ? 'true' : 'false', url);
- else if (value instanceof Date)
- url = updateQueryString(key, value.toISOString(), url);
- else {
- console.error('Unknown query parameter type. Param: ', value);
- }
- }
- return url;
-}
+//copied from https://stackoverflow.com/questions/5999118/how-can-i-add-or-update-a-query-string-parameter
+export function updateQueryString(
+ key: string,
+ value: undefined | string | null,
+ url: string
+): string {
+ const re = new RegExp("([?&])" + key + "=.*?(&|#|$)(.*)", "gi");
+ let hash;
+
+ if (re.test(url)) {
+ if (typeof value !== "undefined" && value !== null) {
+ return url.replace(re, "$1" + key + "=" + value + "$2$3");
+ } else {
+ hash = url.split("#");
+ url = hash[0].replace(re, "$1$3").replace(/(&|\?)$/, "");
+ if (typeof hash[1] !== "undefined" && hash[1] !== null) {
+ url += "#" + hash[1];
+ }
+ return url;
+ }
+ } else {
+ if (typeof value !== "undefined" && value !== null) {
+ const separator = url.includes("?") ? "&" : "?";
+ hash = url.split("#");
+ url = hash[0] + separator + key + "=" + value;
+ if (typeof hash[1] !== "undefined" && hash[1] !== null) {
+ url += "#" + hash[1];
+ }
+ return url;
+ } else {
+ return url;
+ }
+ }
+}
+
+export function applyQueryParameters<T>(url: string, query: T): string {
+ if (query == null) return url;
+
+ for (const [key, value] of Object.entries(query)) {
+ if (typeof value === "string") url = updateQueryString(key, value, url);
+ else if (typeof value === "number")
+ url = updateQueryString(key, String(value), url);
+ else if (typeof value === "boolean")
+ url = updateQueryString(key, value ? "true" : "false", url);
+ else if (value instanceof Date)
+ url = updateQueryString(key, value.toISOString(), url);
+ else {
+ console.error("Unknown query parameter type. Param: ", value);
+ }
+ }
+ return url;
+}