Skip to content

Commit 8130b83

Browse files
authored
GoMFT: tmpl bugfix to work with current version until a new release pushed (#5435)
1 parent b384a38 commit 8130b83

File tree

3 files changed

+75
-3
lines changed

3 files changed

+75
-3
lines changed

ct/gomft.sh

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ function update_script() {
4545
msg_ok "Stopped $APP"
4646

4747
msg_info "Updating $APP to ${RELEASE}"
48+
if ! command -v git >/dev/null 2>&1; then
49+
$STD apt-get install -y git
50+
fi
4851
rm -f /opt/gomft/gomft
4952
temp_file=$(mktemp)
5053
curl -fsSL "https://github.com/StarFleetCPTN/GoMFT/archive/refs/tags/v${RELEASE}.tar.gz" -o "$temp_file"
@@ -53,6 +56,43 @@ function update_script() {
5356
cd /opt/gomft
5457
$STD npm install
5558
$STD npm run build
59+
TEMPL_VERSION="$(awk '/github.com\/a-h\/templ/{print $2}' go.mod)"
60+
$STD go install github.com/a-h/templ/cmd/templ@${TEMPL_VERSION}
61+
# dirty hack to fix templ
62+
cat <<'EOF' >/opt/gomft/components/file_metadata/search/file_metadata_search_content.templ
63+
package search
64+
65+
import (
66+
"context"
67+
"github.com/starfleetcptn/gomft/components/file_metadata"
68+
"github.com/starfleetcptn/gomft/components/file_metadata/list"
69+
)
70+
71+
templ FileMetadataSearchContent(ctx context.Context, data file_metadata.FileMetadataSearchData) {
72+
<!-- Search Results -->
73+
<div id="search-results">
74+
if len(data.Files) > 0 {
75+
@list.FileMetadataListPartial(ctx, file_metadata.FileMetadataListData{
76+
Files: data.Files,
77+
Page: data.Page,
78+
Limit: data.Limit,
79+
TotalCount: data.TotalCount,
80+
TotalPages: data.TotalPages,
81+
Filter: data.Filter,
82+
SortBy: data.SortBy,
83+
SortDir: data.SortDir,
84+
}, "/files/search/partial", "#search-results-container")
85+
} else {
86+
<div class="p-6 text-center text-gray-500 dark:text-gray-400">
87+
<svg class="mx-auto mb-4 w-12 h-12 text-gray-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
88+
<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m2.25 0H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" />
89+
</svg>
90+
<p>No files found matching your search criteria.</p>
91+
</div>
92+
}
93+
</div>
94+
}
95+
EOF
5696
$STD "$HOME"/go/bin/templ generate
5797
export CGO_ENABLED=1
5898
export GOOS=linux

install/gomft-install.sh

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,41 @@ cd /opt/gomft
3636
TEMPL_VERSION="$(awk '/github.com\/a-h\/templ/{print $2}' go.mod)"
3737
$STD go install github.com/a-h/templ/cmd/templ@${TEMPL_VERSION}
3838
cp /opt/gomft/components/file_metadata/search/file_metadata_search_content.templ{,.bak}
39-
sed -i -e '/<div id="search-results">/a \ @{' \
40-
-e '/^ }$/a \ }' \
41-
/opt/gomft/components/file_metadata/search/file_metadata_search_content.templ
39+
# dirty hack to fix templ
40+
cat <<'EOF' >/opt/gomft/components/file_metadata/search/file_metadata_search_content.templ
41+
package search
42+
43+
import (
44+
"context"
45+
"github.com/starfleetcptn/gomft/components/file_metadata"
46+
"github.com/starfleetcptn/gomft/components/file_metadata/list"
47+
)
48+
49+
templ FileMetadataSearchContent(ctx context.Context, data file_metadata.FileMetadataSearchData) {
50+
<!-- Search Results -->
51+
<div id="search-results">
52+
if len(data.Files) > 0 {
53+
@list.FileMetadataListPartial(ctx, file_metadata.FileMetadataListData{
54+
Files: data.Files,
55+
Page: data.Page,
56+
Limit: data.Limit,
57+
TotalCount: data.TotalCount,
58+
TotalPages: data.TotalPages,
59+
Filter: data.Filter,
60+
SortBy: data.SortBy,
61+
SortDir: data.SortDir,
62+
}, "/files/search/partial", "#search-results-container")
63+
} else {
64+
<div class="p-6 text-center text-gray-500 dark:text-gray-400">
65+
<svg class="mx-auto mb-4 w-12 h-12 text-gray-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
66+
<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m2.25 0H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" />
67+
</svg>
68+
<p>No files found matching your search criteria.</p>
69+
</div>
70+
}
71+
</div>
72+
}
73+
EOF
4274
$STD "$HOME"/go/bin/templ generate
4375
$STD go build -o gomft main.go
4476
chmod +x /opt/gomft/gomft

0 commit comments

Comments
 (0)