From efd9c73f2b4543c7d30b35be7977745c4e4d1136 Mon Sep 17 00:00:00 2001 From: L3GW0RK Date: Tue, 23 Jul 2024 18:41:45 -0400 Subject: [PATCH 1/4] Update SiteForm.tsx fixed the regex example to avoid unescaped '.'s and adjusted it to give more flexibility with regards to subdomains and making tailing slashes non-capturing (when adding studio urls, tailing slashes being removed results in a non-match) --- frontend/src/pages/sites/siteForm/SiteForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/sites/siteForm/SiteForm.tsx b/frontend/src/pages/sites/siteForm/SiteForm.tsx index 82aca1c6a..cd19f4d01 100644 --- a/frontend/src/pages/sites/siteForm/SiteForm.tsx +++ b/frontend/src/pages/sites/siteForm/SiteForm.tsx @@ -102,7 +102,7 @@ const SiteForm: FC = ({ site, callback }) => {
Example:
- This regexp (https?://(?:www.)?example\.org/[^?#]*) + This regexp (https?:\/\/(?:www\.)?(?:(.*)\.)?example\.com\/?[^?#]+)
will match this string{" "} http://example.org/foo/bar?id=69#top From 48f84c540c8ceba65856a8a655d58b77b3af3a71 Mon Sep 17 00:00:00 2001 From: L3GW0RK Date: Mon, 29 Jul 2024 20:54:58 -0400 Subject: [PATCH 2/4] Update SiteForm.tsx ran with prettier to double check formatting --- frontend/src/pages/sites/siteForm/SiteForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/sites/siteForm/SiteForm.tsx b/frontend/src/pages/sites/siteForm/SiteForm.tsx index cd19f4d01..66ae18b56 100644 --- a/frontend/src/pages/sites/siteForm/SiteForm.tsx +++ b/frontend/src/pages/sites/siteForm/SiteForm.tsx @@ -39,7 +39,7 @@ const SiteForm: FC = ({ site, callback }) => { register, handleSubmit, formState: { errors }, - } = useForm({ + } = useForm < SiteFormData > ({ resolver: yupResolver(schema), }); From 82b955ca45b34824c5a56501bb6b179330f4a2a5 Mon Sep 17 00:00:00 2001 From: InfiniteStash <117855276+InfiniteStash@users.noreply.github.com> Date: Thu, 21 Nov 2024 10:04:27 +0000 Subject: [PATCH 3/4] Format --- frontend/src/pages/sites/siteForm/SiteForm.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/sites/siteForm/SiteForm.tsx b/frontend/src/pages/sites/siteForm/SiteForm.tsx index 66ae18b56..2a1f9e029 100644 --- a/frontend/src/pages/sites/siteForm/SiteForm.tsx +++ b/frontend/src/pages/sites/siteForm/SiteForm.tsx @@ -39,7 +39,7 @@ const SiteForm: FC = ({ site, callback }) => { register, handleSubmit, formState: { errors }, - } = useForm < SiteFormData > ({ + } = useForm({ resolver: yupResolver(schema), }); @@ -102,7 +102,8 @@ const SiteForm: FC = ({ site, callback }) => {
Example:
- This regexp (https?:\/\/(?:www\.)?(?:(.*)\.)?example\.com\/?[^?#]+) + This regexp{" "} + (https?:\/\/(?:www\.)?(?:(.*)\.)?example\.org\/?[^?#]+)
will match this string{" "} http://example.org/foo/bar?id=69#top From b1d2cdbe472f7c70a479385a3b7cd1bdf7833c08 Mon Sep 17 00:00:00 2001 From: L3GW0RK Date: Thu, 30 Jan 2025 19:51:06 -0500 Subject: [PATCH 4/4] Update Dockerfile updated the base postgres image to 16 and changed the ps-spgist_hamming git repo to elkorol's updated clang and ubuntu:latest fork (the fake-name repo hasn't been updated in 6 years). tested, works. --- docker/production/postgres/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/production/postgres/Dockerfile b/docker/production/postgres/Dockerfile index 6b6681916..922cfadb4 100644 --- a/docker/production/postgres/Dockerfile +++ b/docker/production/postgres/Dockerfile @@ -1,8 +1,8 @@ -FROM postgres:14.2 +FROM postgres:16 -RUN buildDeps='git make gcc postgresql-server-dev-14' \ - && apt update && apt install -y $buildDeps --no-install-recommends --reinstall ca-certificates \ - && git clone https://github.com/fake-name/pg-spgist_hamming.git \ +RUN buildDeps='git make gcc postgresql-server-dev-16' \ + && apt update && apt install -y $buildDeps --no-install-recommends --reinstall ca-certificates clang llvm-dev \ + && git clone https://github.com/elkorol/pg-spgist_hamming.git \ && make -C pg-spgist_hamming/bktree \ && make -C pg-spgist_hamming/bktree install \ && rm -rf pg-spgist_hamming \