Merge pull request #8 from spikeninja/dev

feat: version 1.1.2
spikeninja · Dec 8, 2024 · 308a3aa · 308a3aa
2 parents c884c08 + 08fa5bc
commit 308a3aa
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ class TaskiqAdminMiddleware(TaskiqMiddleware):
         return super().post_execute(message, result)
 ```
 
-2) Pull the image from DockerHub: `docker pull artur10/taskiq-admin:1.1.1`
+2) Pull the image from DockerHub: `docker pull artur10/taskiq-admin:1.1.2`
 
 3) Replace `ACCESS_TOKEN` with any secret enough string and run:
 ```bash
@@ -85,7 +85,7 @@ docker run -d --rm \
   -v ./taskiq-admin-data/:/usr/database/ \
   -e TASKIQ_ADMIN_API_TOKEN=supersecret \
   --name taskiq-admin \
-  artur10/taskiq-admin:1.1.1
+  artur10/taskiq-admin:1.1.2
 ```
 
 4) Go to `http://localhost:3000/tasks`

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "nuxt-app",
   "private": true,
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev",

diff --git a/src/pages/tasks/index.vue b/src/pages/tasks/index.vue
@@ -11,8 +11,8 @@ if (!route.query.page) {
 const perPage = 10
 const searchRef = ref("")
 
+const search = computed(() => route.query.search || "")
 const page = computed(() => Number(route.query.page) || 1)
-const search = computed(() => Number(route.query.search) || "")
 
 const { data } = useAsyncData(
   "tasks",
@@ -38,6 +38,18 @@ function limitText(text: string, length: number) {
   return text
 }
 
+function searchSubmit() {
+  if (searchRef.value) {
+    router.push({
+      path: "/tasks",
+      query: {
+        page: 1,
+        search: searchRef.value,
+      },
+    })
+  }
+}
+
 function handleNext() {
   if (page.value < totalPages.value) {
     router.push({
@@ -71,22 +83,22 @@ function handlePrev() {
           <NuxtLink to="/api/tasks/backup" target="_blank"> Backup </NuxtLink>
         </button>
       </div>
-      <form method="get" action="">
-        <div class="row mb-3">
-          <div class="col">
-            <div class="d-flex justify-content-end">
-              <input
-                type="search"
-                name="search"
-                class="form-control w-auto"
-                placeholder="Search tasks..."
-                v-model="searchRef"
-              />
-              <button type="submit" class="btn btn-primary ml-2">Search</button>
-            </div>
+      <div class="row mb-3">
+        <div class="col">
+          <div class="d-flex justify-content-end">
+            <input
+              type="search"
+              name="search"
+              class="form-control w-auto"
+              placeholder="Search tasks..."
+              v-model="searchRef"
+            />
+            <button @click="searchSubmit" class="btn btn-primary ml-2">
+              Search
+            </button>
           </div>
         </div>
-      </form>
+      </div>
     </div>
 
     <div class="table-responsive">

diff --git a/src/server/repositories/tasks.ts b/src/server/repositories/tasks.ts
@@ -1,14 +1,14 @@
 import { db } from "../db"
 import { tasksTable } from "../db/schema"
-import { count, eq, desc, ilike } from "drizzle-orm"
 import { takeUniqueOrThrow } from "../utils"
+import { count, eq, desc, like } from "drizzle-orm"
 
 export type TaskState = "pending" | "success" | "failed"
 
 class TasksRepository {
   async getAll(name: string | null, limit: number, offset: number) {
     const whereCondition = name
-      ? ilike(tasksTable.name, `%${name}%`)
+      ? like(tasksTable.name, `%${name.toLowerCase()}%`)
       : undefined
 
     const countResult = await db