diff --git a/frontend/app/components/shared/SessionsTabOverview/components/Notes/NoteList.tsx b/frontend/app/components/shared/SessionsTabOverview/components/Notes/NoteList.tsx index 199a70f12..ebc808226 100644 --- a/frontend/app/components/shared/SessionsTabOverview/components/Notes/NoteList.tsx +++ b/frontend/app/components/shared/SessionsTabOverview/components/Notes/NoteList.tsx @@ -44,11 +44,11 @@ function NotesList({ members }: { members: Array> }) {
Showing{' '} {Math.min(list.length, notesStore.pageSize)} out - of {list.length} notes + of {notesStore.total} notes
notesStore.changePage(page)} limit={notesStore.pageSize} debounceRequest={100} diff --git a/frontend/app/mstore/notesStore.ts b/frontend/app/mstore/notesStore.ts index 2427e110b..686fe6558 100644 --- a/frontend/app/mstore/notesStore.ts +++ b/frontend/app/mstore/notesStore.ts @@ -1,6 +1,10 @@ -import { makeAutoObservable } from "mobx" -import { notesService } from "App/services" -import { Note, WriteNote, iTag, NotesFilter } from 'App/services/NotesService' +import { makeAutoObservable } from "mobx"; + + + +import { notesService } from "App/services"; +import { Note, NotesFilter, WriteNote, iTag } from 'App/services/NotesService'; + export default class NotesStore { notes: Note[] = [] @@ -12,6 +16,7 @@ export default class NotesStore { sort = 'createdAt' order: 'DESC' | 'ASC' = 'DESC' ownOnly = false + total = 0 constructor() { makeAutoObservable(this) @@ -20,9 +25,15 @@ export default class NotesStore { setLoading(loading: boolean) { this.loading = loading } + setNotes(notes: Note[]) { this.notes = notes } + + setTotal(total: number) { + this.total = total + } + async fetchNotes() { const filter: NotesFilter = { page: this.page, @@ -36,8 +47,9 @@ export default class NotesStore { this.setLoading(true) try { - const notes = await notesService.fetchNotes(filter) + const { notes, count } = await notesService.fetchNotes(filter); this.setNotes(notes); + this.setTotal(count) return notes; } catch (e) { console.error(e) diff --git a/frontend/app/services/NotesService.ts b/frontend/app/services/NotesService.ts index d01d3215a..18d307892 100644 --- a/frontend/app/services/NotesService.ts +++ b/frontend/app/services/NotesService.ts @@ -56,7 +56,7 @@ export default class NotesService { this.client = client || new APIClient(); } - fetchNotes(filter: NotesFilter): Promise { + fetchNotes(filter: NotesFilter): Promise<{ notes: Note[], count: number }> { return this.client.post('/notes', filter).then(r => { return r.json().then(r => r.data) }) diff --git a/tracker/.husky/pre-commit b/tracker/.husky/pre-commit deleted file mode 100755 index ae22cb74b..000000000 --- a/tracker/.husky/pre-commit +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - -if git diff --cached --name-only | grep -v '\.gen\.ts$' | grep --quiet '^tracker/tracker/' -then - echo "tracker" - pwd - cd tracker/tracker - - bun run lint-front - - cd ../../ -fi - -if git diff --cached --name-only | grep -v '\.gen\.ts$' | grep --quiet '^tracker/tracker-assist/' -then - echo "tracker-assist" - cd tracker/tracker-assist - - bun run lint-front - - cd ../../ -fi - -exit 0 diff --git a/tracker/.husky/prepare-commit-msg b/tracker/.husky/prepare-commit-msg deleted file mode 100755 index c27ffd250..000000000 --- a/tracker/.husky/prepare-commit-msg +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -if [ "$LEFTHOOK_VERBOSE" = "1" -o "$LEFTHOOK_VERBOSE" = "true" ]; then - set -x -fi - -if [ "$LEFTHOOK" = "0" ]; then - exit 0 -fi - -call_lefthook() -{ - if test -n "$LEFTHOOK_BIN" - then - "$LEFTHOOK_BIN" "$@" - elif lefthook -h >/dev/null 2>&1 - then - lefthook "$@" - else - dir="$(git rev-parse --show-toplevel)" - if test -f "$dir/node_modules/lefthook/bin/index.js" - then - "$dir/node_modules/lefthook/bin/index.js" "$@" - else - osArch=$(uname | tr '[:upper:]' '[:lower:]') - cpuArch=$(uname -m | sed 's/aarch64/arm64/') - if test -f "$dir/node_modules/@evilmartians/lefthook/bin/lefthook_${osArch}_${cpuArch}/lefthook" - then - "$dir/node_modules/@evilmartians/lefthook/bin/lefthook_${osArch}_${cpuArch}/lefthook" "$@" - elif test -f "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook_${osArch}_${cpuArch}/lefthook" - then - "$dir/node_modules/@evilmartians/lefthook-installer/bin/lefthook_${osArch}_${cpuArch}/lefthook" "$@" - - elif bundle exec lefthook -h >/dev/null 2>&1 - then - bundle exec lefthook "$@" - elif yarn lefthook -h >/dev/null 2>&1 - then - yarn lefthook "$@" - elif pnpm lefthook -h >/dev/null 2>&1 - then - pnpm lefthook "$@" - elif swift package plugin lefthook >/dev/null 2>&1 - then - swift package --disable-sandbox plugin lefthook "$@" - elif command -v mint >/dev/null 2>&1 - then - mint run csjones/lefthook-plugin "$@" - elif command -v npx >/dev/null 2>&1 - then - npx lefthook "$@" - else - echo "Can't find lefthook in PATH" - fi - fi - fi -} - -call_lefthook run "prepare-commit-msg" "$@"