Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

chore: merge main into feat/workspace-rbac

Andrej9d83433c36cb
diff --cc apps/web/src/components/team/invite-team-member-modal.tsx
index 0c6d840da,70f3cad46..77109cf5e
--- a/apps/web/src/components/team/invite-team-member-modal.tsx
+++ b/apps/web/src/components/team/invite-team-member-modal.tsx
@@@ -5,11 -4,18 +4,19 @@@ import { useForm } from "react-hook-for
import { useTranslation } from "react-i18next";
import { z } from "zod/v4";
import useInviteWorkspaceUser from "@/hooks/mutations/workspace-user/use-invite-workspace-user";
+import useActiveWorkspace from "@/hooks/queries/workspace/use-active-workspace";
+import { useWorkspacePermission } from "@/hooks/use-workspace-permission";
import { toast } from "@/lib/toast";
-import { Route } from "@/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/members";
import { Button } from "../ui/button";
- import { Dialog, DialogClose, DialogPopup, DialogTitle } from "../ui/dialog";
+ import {
+ Dialog,
+ DialogClose,
+ DialogFooter,
+ DialogHeader,
+ DialogPanel,
+ DialogPopup,
+ DialogTitle,
+ } from "../ui/dialog";
import {
Form,
FormControl,
@@@ -93,64 -83,44 +100,48 @@@ function InviteTeamMemberModal({ open,
return (
<Dialog open={open} onOpenChange={resetAndCloseModal}>
<DialogPopup className="w-full max-w-md">
- <div className="bg-card rounded-lg shadow-xl">
- <div className="flex items-center justify-between p-4 border-b border-border">
- <DialogTitle className="text-lg font-semibold text-foreground">
- {t("team:inviteModal.title")}
- </DialogTitle>
- <DialogClose
- className="text-muted-foreground hover:text-foreground"
- render={<button type="button" />}
- >
- <X size={20} />
- </DialogClose>
- </div>
+ <DialogHeader>
+ <DialogTitle>{t("team:inviteModal.title")}</DialogTitle>
+ </DialogHeader>
- <Form {...form}>
- <form onSubmit={form.handleSubmit(onSubmit)} className="p-4">
- <div className="space-y-4">
- <div>
- <FormField
- control={form.control}
- name="email"
- render={({ field }) => (
- <FormItem>
- <FormLabel className="block text-sm font-medium text-foreground mb-1">
- {t("team:inviteModal.emailLabel")}
- </FormLabel>
- <FormControl>
- <Input
- {...field}
- placeholder={t("team:inviteModal.emailPlaceholder")}
- className="bg-card/50"
- autoFocus
- />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- </div>
- </div>
+ <Form {...form}>
+ <form onSubmit={form.handleSubmit(onSubmit)} className="contents">
+ <DialogPanel>
+ <FormField
+ control={form.control}
+ name="email"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>{t("team:inviteModal.emailLabel")}</FormLabel>
+ <FormControl>
+ <Input
+ {...field}
+ placeholder={t("team:inviteModal.emailPlaceholder")}
+ autoFocus
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </DialogPanel>
- <div className="flex justify-end gap-2 mt-6">
- <DialogClose
- render={
- <Button
- className="bg-muted text-foreground hover:bg-accent"
- type="button"
- />
- }
- >
- {t("common:actions.cancel")}
- </DialogClose>
- <Button type="submit" disabled={!workspaceId || !canInvite}>
- {t("team:inviteModal.sendInvitation")}
- </Button>
- </div>
- </form>
- </Form>
- </div>
+ <DialogFooter>
+ <DialogClose
+ render={<Button variant="outline" size="sm" type="button" />}
+ >
+ {t("common:actions.cancel")}
+ </DialogClose>
- <Button type="submit" size="sm">
++ <Button
++ type="submit"
++ size="sm"
++ disabled={!workspaceId || !canInvite}
++ >
+ {t("team:inviteModal.sendInvitation")}
+ </Button>
+ </DialogFooter>
+ </form>
+ </Form>
</DialogPopup>
</Dialog>
);
diff --cc pnpm-lock.yaml
index a87534cad,081656c09..3c300c01d
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@@ -646,19 -640,6 +646,19 @@@ importers
specifier: ^4.1.2
+ packages/permissions:
+ dependencies:
+ better-auth:
+ specifier: ^1.6.9
- version: 1.6.9(61e5db747ad028870126fcf7674ff6c9)
++ version: 1.6.9(0aca8a2e9765f9fb543dc97188ed3cff)
+ devDependencies:
+ '@kaneo/typescript-config':
+ specifier: workspace:*
+ version: link:../typescript-config
+ typescript:
+ specifier: ^5.9.2
+ version: 5.9.3
+
packages/typescript-config: {}
packages:
@@@ -13499,51 -13492,15 +13511,51 @@@ snapshots
- [email protected](61e5db747ad028870126fcf7674ff6c9):
++ [email protected](0aca8a2e9765f9fb543dc97188ed3cff):
+ dependencies:
- '@better-auth/memory-adapter': 1.6.9(@better-auth/[email protected](@better-auth/[email protected])(@better-fetch/[email protected])(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]))(@better-auth/[email protected])
- '@better-auth/telemetry': 1.6.9(@better-auth/[email protected](@better-auth/[email protected])(@better-fetch/[email protected])(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]))(@better-auth/[email protected])(@better-fetch/[email protected])
++ '@better-auth/memory-adapter': 1.6.9(@better-auth/[email protected](@better-auth/[email protected])(@better-fetch/[email protected])(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]))(@better-auth/[email protected])
++ '@better-auth/telemetry': 1.6.9(@better-auth/[email protected](@better-auth/[email protected])(@better-fetch/[email protected])(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]))(@better-auth/[email protected])(@better-fetch/[email protected])
+ '@better-auth/utils': 0.4.0
+ '@better-fetch/fetch': 1.1.21
+ '@noble/ciphers': 2.1.1
+ '@noble/hashes': 2.0.1
+ better-call: 1.3.5([email protected])
- defu: 6.1.4
++ defu: 6.1.7
+ jose: 6.1.3
- kysely: 0.28.14
++ kysely: 0.28.17
+ nanostores: 1.1.1
+ zod: 4.3.6
+ optionalDependencies:
+ drizzle-kit: 0.31.9
+ mongodb: 7.1.0
+ mysql2: 3.15.3
+ pg: 8.20.0
+ react: 19.2.6
+ react-dom: 19.2.5([email protected])
+ solid-js: 1.9.10
+ transitivePeerDependencies:
+ - '@cloudflare/workers-types'
+ - '@opentelemetry/api'
+
dependencies:
- '@better-auth/memory-adapter': 1.6.9(@better-auth/[email protected](@better-auth/[email protected])(@better-fetch/[email protected])(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]))(@better-auth/[email protected])
- '@better-auth/telemetry': 1.6.9(@better-auth/[email protected](@better-auth/[email protected])(@better-fetch/[email protected])(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]))(@better-auth/[email protected])(@better-fetch/[email protected])
+ '@better-auth/memory-adapter': 1.6.9(@better-auth/[email protected](@better-auth/[email protected])(@better-fetch/[email protected])(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]))(@better-auth/[email protected])
+ '@better-auth/telemetry': 1.6.9(@better-auth/[email protected](@better-auth/[email protected])(@better-fetch/[email protected])(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]))(@better-auth/[email protected])(@better-fetch/[email protected])
'@better-auth/utils': 0.4.0
'@better-fetch/fetch': 1.1.21
'@noble/ciphers': 2.1.1