From 41e64e7d83354177330108ba5e5445777ca52046 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Tue, 24 Jun 2025 16:14:25 +0200 Subject: [PATCH] GoMFT: tmpl bugfix to work with current version until a new release pushed --- ct/gomft.sh | 37 ++++++++++++++++++ .../json/{gomft.json.bak => gomft.json} | 0 install/gomft-install.sh | 38 +++++++++++++++++-- 3 files changed, 72 insertions(+), 3 deletions(-) rename frontend/public/json/{gomft.json.bak => gomft.json} (100%) diff --git a/ct/gomft.sh b/ct/gomft.sh index b16388217..f1788cc0b 100644 --- a/ct/gomft.sh +++ b/ct/gomft.sh @@ -53,6 +53,43 @@ function update_script() { cd /opt/gomft $STD npm install $STD npm run build + TEMPL_VERSION="$(awk '/github.com\/a-h\/templ/{print $2}' go.mod)" + $STD go install github.com/a-h/templ/cmd/templ@${TEMPL_VERSION} + # dirty hack to fix templ + cat <<'EOF' >/opt/gomft/components/file_metadata/search/file_metadata_search_content.templ +package search + +import ( + "context" + "github.com/starfleetcptn/gomft/components/file_metadata" + "github.com/starfleetcptn/gomft/components/file_metadata/list" +) + +templ FileMetadataSearchContent(ctx context.Context, data file_metadata.FileMetadataSearchData) { + +
+ if len(data.Files) > 0 { + @list.FileMetadataListPartial(ctx, file_metadata.FileMetadataListData{ + Files: data.Files, + Page: data.Page, + Limit: data.Limit, + TotalCount: data.TotalCount, + TotalPages: data.TotalPages, + Filter: data.Filter, + SortBy: data.SortBy, + SortDir: data.SortDir, + }, "/files/search/partial", "#search-results-container") + } else { +
+ + + +

No files found matching your search criteria.

+
+ } +
+} +EOF $STD "$HOME"/go/bin/templ generate export CGO_ENABLED=1 export GOOS=linux diff --git a/frontend/public/json/gomft.json.bak b/frontend/public/json/gomft.json similarity index 100% rename from frontend/public/json/gomft.json.bak rename to frontend/public/json/gomft.json diff --git a/install/gomft-install.sh b/install/gomft-install.sh index ae9c9a8a5..1e6d2389a 100644 --- a/install/gomft-install.sh +++ b/install/gomft-install.sh @@ -36,9 +36,41 @@ cd /opt/gomft TEMPL_VERSION="$(awk '/github.com\/a-h\/templ/{print $2}' go.mod)" $STD go install github.com/a-h/templ/cmd/templ@${TEMPL_VERSION} cp /opt/gomft/components/file_metadata/search/file_metadata_search_content.templ{,.bak} -sed -i -e '/
/a \ @{' \ - -e '/^ }$/a \ }' \ - /opt/gomft/components/file_metadata/search/file_metadata_search_content.templ +# dirty hack to fix templ +cat <<'EOF' >/opt/gomft/components/file_metadata/search/file_metadata_search_content.templ +package search + +import ( + "context" + "github.com/starfleetcptn/gomft/components/file_metadata" + "github.com/starfleetcptn/gomft/components/file_metadata/list" +) + +templ FileMetadataSearchContent(ctx context.Context, data file_metadata.FileMetadataSearchData) { + +
+ if len(data.Files) > 0 { + @list.FileMetadataListPartial(ctx, file_metadata.FileMetadataListData{ + Files: data.Files, + Page: data.Page, + Limit: data.Limit, + TotalCount: data.TotalCount, + TotalPages: data.TotalPages, + Filter: data.Filter, + SortBy: data.SortBy, + SortDir: data.SortDir, + }, "/files/search/partial", "#search-results-container") + } else { +
+ + + +

No files found matching your search criteria.

+
+ } +
+} +EOF $STD "$HOME"/go/bin/templ generate $STD go build -o gomft main.go chmod +x /opt/gomft/gomft