diff --git a/src/app/(dashboard)/namespace/[namespaceId]/layout.tsx b/src/app/(dashboard)/namespace/[namespaceId]/layout.tsx
index bc9d3e85..aeee3200 100644
--- a/src/app/(dashboard)/namespace/[namespaceId]/layout.tsx
+++ b/src/app/(dashboard)/namespace/[namespaceId]/layout.tsx
@@ -1,3 +1,5 @@
+"use client"
+
import React from "react";
import Link from "next/link";
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/members/add/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/members/add/page.tsx
new file mode 100644
index 00000000..fafad442
--- /dev/null
+++ b/src/app/(dashboard)/namespace/[namespaceId]/members/add/page.tsx
@@ -0,0 +1,7 @@
+"use client"
+
+import {MemberAddPage} from "@edition/dashboard/member/MemberAddPage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/members/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/members/page.tsx
new file mode 100644
index 00000000..7e92b720
--- /dev/null
+++ b/src/app/(dashboard)/namespace/[namespaceId]/members/page.tsx
@@ -0,0 +1,7 @@
+"use client"
+
+import {MembersPage} from "@edition/dashboard/member/MembersPage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/page.tsx
index 886ae7db..a9a68513 100644
--- a/src/app/(dashboard)/namespace/[namespaceId]/page.tsx
+++ b/src/app/(dashboard)/namespace/[namespaceId]/page.tsx
@@ -1,3 +1,7 @@
-export default function NamespacePage() {
- return <>Namespace page (view all projects)
-}
+"use client"
+
+import {NamespaceOverviewPage} from "@edition/dashboard/namespace/NamespaceOverviewPage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/projects/create/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/projects/create/page.tsx
new file mode 100644
index 00000000..8211b5a4
--- /dev/null
+++ b/src/app/(dashboard)/namespace/[namespaceId]/projects/create/page.tsx
@@ -0,0 +1,5 @@
+import {NamespaceProjectsCreatePage} from "@edition/dashboard/namespace/NamespaceProjectsCreatePage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/projects/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/projects/page.tsx
new file mode 100644
index 00000000..98e317e3
--- /dev/null
+++ b/src/app/(dashboard)/namespace/[namespaceId]/projects/page.tsx
@@ -0,0 +1,5 @@
+import {NamespaceProjectsPage} from "@edition/dashboard/namespace/NamespaceProjectsPage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/roles/[roleId]/settings/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/roles/[roleId]/settings/page.tsx
new file mode 100644
index 00000000..4eed9bc3
--- /dev/null
+++ b/src/app/(dashboard)/namespace/[namespaceId]/roles/[roleId]/settings/page.tsx
@@ -0,0 +1,7 @@
+"use client"
+
+import {RoleSettingsPage} from "@edition/dashboard/role/RoleSettingsPage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/roles/create/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/roles/create/page.tsx
new file mode 100644
index 00000000..a4998c3c
--- /dev/null
+++ b/src/app/(dashboard)/namespace/[namespaceId]/roles/create/page.tsx
@@ -0,0 +1,7 @@
+"use client"
+
+import {RoleCreatePage} from "@edition/dashboard/role/RoleCreatePage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/roles/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/roles/page.tsx
new file mode 100644
index 00000000..1268e43b
--- /dev/null
+++ b/src/app/(dashboard)/namespace/[namespaceId]/roles/page.tsx
@@ -0,0 +1,5 @@
+import {RolesPage} from "@edition/dashboard/role/RolesPage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/runtimes/[runtimeId]/settings/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/runtimes/[runtimeId]/settings/page.tsx
new file mode 100644
index 00000000..94cdc737
--- /dev/null
+++ b/src/app/(dashboard)/namespace/[namespaceId]/runtimes/[runtimeId]/settings/page.tsx
@@ -0,0 +1,5 @@
+import {RuntimeSettingsPage} from "@edition/dashboard/runtime/RuntimeSettingsPage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/runtimes/create/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/runtimes/create/page.tsx
new file mode 100644
index 00000000..9063cb15
--- /dev/null
+++ b/src/app/(dashboard)/namespace/[namespaceId]/runtimes/create/page.tsx
@@ -0,0 +1,5 @@
+import {RuntimeCreatePage} from "@edition/dashboard/runtime/RuntimeCreatePage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/runtimes/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/runtimes/page.tsx
new file mode 100644
index 00000000..f9add133
--- /dev/null
+++ b/src/app/(dashboard)/namespace/[namespaceId]/runtimes/page.tsx
@@ -0,0 +1,5 @@
+import {RuntimesPage} from "@edition/dashboard/runtime/RuntimesPage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/namespace/[namespaceId]/settings/page.tsx b/src/app/(dashboard)/namespace/[namespaceId]/settings/page.tsx
new file mode 100644
index 00000000..201fd719
--- /dev/null
+++ b/src/app/(dashboard)/namespace/[namespaceId]/settings/page.tsx
@@ -0,0 +1,7 @@
+"use client"
+
+import {OrganizationSettingsPage} from "@edition/dashboard/organization/OrganizationSettingsPage";
+
+export default function Page() {
+ return
+}
\ No newline at end of file
diff --git a/src/app/(dashboard)/organizations/create/page.tsx b/src/app/(dashboard)/organizations/create/page.tsx
index 4387ab1b..70fbc55c 100644
--- a/src/app/(dashboard)/organizations/create/page.tsx
+++ b/src/app/(dashboard)/organizations/create/page.tsx
@@ -1,4 +1,4 @@
-import {OrganizationCreatePage} from "@edition/dashboard/application/OrganizationCreatePage";
+import {OrganizationCreatePage} from "@edition/dashboard/organization/OrganizationCreatePage";
export default function Page() {
return
diff --git a/src/app/(dashboard)/organizations/page.tsx b/src/app/(dashboard)/organizations/page.tsx
index 946fd4e8..d0aed06b 100644
--- a/src/app/(dashboard)/organizations/page.tsx
+++ b/src/app/(dashboard)/organizations/page.tsx
@@ -1,4 +1,4 @@
-import {OrganizationsPage} from "@edition/dashboard/application/OrganizationsPage";
+import {OrganizationsPage} from "@edition/dashboard/organization/OrganizationsPage";
export default function Page() {
return
diff --git a/src/app/(dashboard)/page.tsx b/src/app/(dashboard)/page.tsx
index 47ed3a02..27103554 100644
--- a/src/app/(dashboard)/page.tsx
+++ b/src/app/(dashboard)/page.tsx
@@ -3,8 +3,6 @@
import React from "react";
import {ApplicationPage} from "@edition/dashboard/application/ApplicationPage";
-const Page = () => {
+export default function Page() {
return
}
-
-export default React.memo(Page);
diff --git a/src/app/(dashboard)/runtimes/[runtimeId]/settings/page.tsx b/src/app/(dashboard)/runtimes/[runtimeId]/settings/page.tsx
index 230b2453..94cdc737 100644
--- a/src/app/(dashboard)/runtimes/[runtimeId]/settings/page.tsx
+++ b/src/app/(dashboard)/runtimes/[runtimeId]/settings/page.tsx
@@ -1,5 +1,5 @@
-import {RuntimeSettingPage} from "@edition/dashboard/application/RuntimeSettingPage";
+import {RuntimeSettingsPage} from "@edition/dashboard/runtime/RuntimeSettingsPage";
export default function Page() {
- return
+ return
}
\ No newline at end of file
diff --git a/src/app/(dashboard)/runtimes/create/page.tsx b/src/app/(dashboard)/runtimes/create/page.tsx
index e40af6be..9063cb15 100644
--- a/src/app/(dashboard)/runtimes/create/page.tsx
+++ b/src/app/(dashboard)/runtimes/create/page.tsx
@@ -1,4 +1,4 @@
-import {RuntimeCreatePage} from "@edition/dashboard/application/RuntimeCreatePage";
+import {RuntimeCreatePage} from "@edition/dashboard/runtime/RuntimeCreatePage";
export default function Page() {
return
diff --git a/src/app/(dashboard)/runtimes/page.tsx b/src/app/(dashboard)/runtimes/page.tsx
index 8602067b..48bde090 100644
--- a/src/app/(dashboard)/runtimes/page.tsx
+++ b/src/app/(dashboard)/runtimes/page.tsx
@@ -1,6 +1,6 @@
"use client"
-import {RuntimesPage} from "@edition/dashboard/application/RuntimesPage";
+import {RuntimesPage} from "@edition/dashboard/runtime/RuntimesPage";
export default function Page() {
return
diff --git a/src/app/(dashboard)/users/page.tsx b/src/app/(dashboard)/users/page.tsx
index e7313452..14e72354 100644
--- a/src/app/(dashboard)/users/page.tsx
+++ b/src/app/(dashboard)/users/page.tsx
@@ -1,4 +1,4 @@
-import {UsersPage} from "@edition/dashboard/application/UsersPage";
+import {UsersPage} from "@edition/dashboard/user/UsersPage";
export default function Page() {
return
diff --git a/src/app/global.scss b/src/app/global.scss
index f7dc1ad7..90ae320d 100644
--- a/src/app/global.scss
+++ b/src/app/global.scss
@@ -13,7 +13,7 @@ html, body {
a {
text-decoration: none;
- text-decoration-color: white !important;
+ text-decoration-color: transparent !important;
&:hover {
text-decoration: underline;
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 58c0e859..e926e7a5 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -19,6 +19,7 @@ import {Toaster} from "sonner";
import {Error} from "@code0-tech/sagittarius-graphql-types";
import {toast} from "@code0-tech/pictor";
import {Inter} from 'next/font/google'
+import {GraphQLFormattedError} from "graphql/error";
/**
* Load the Inter font with Latin subset and swap display strategy
@@ -66,8 +67,8 @@ const ErrorCodeDescription: Record
= {
/**
* Handles error toasts based on error type
*/
-const toastHandler = (error: Error) => {
- if (error.__typename === "ErrorCode") {
+const toastHandler = (error: Error | GraphQLFormattedError) => {
+ if (error && "errorCode" in error) {
toast({
title: ErrorCodeDescription[(error.errorCode as string)],
color: "error",
@@ -94,7 +95,7 @@ export default function RootLayout({children}: Readonly<{ children: React.ReactN
*/
const errorLink = new ErrorLink(({error, result, operation, forward}) => {
if (error instanceof CombinedGraphQLErrors) {
- error.errors.forEach((error: Error) => {
+ error.errors.forEach((error: GraphQLFormattedError) => {
toastHandler(error)
})
return
diff --git a/src/packages/ce/src/auth/UserEmailVerificationPage.tsx b/src/packages/ce/src/auth/UserEmailVerificationPage.tsx
index 1c53b1bb..4c1199a6 100644
--- a/src/packages/ce/src/auth/UserEmailVerificationPage.tsx
+++ b/src/packages/ce/src/auth/UserEmailVerificationPage.tsx
@@ -39,7 +39,7 @@ export const UserEmailVerificationPage: React.FC = () => {
})
return <>
-
diff --git a/src/packages/ce/src/auth/UserForgotPasswordPage.tsx b/src/packages/ce/src/auth/UserForgotPasswordPage.tsx
index 00ddddbc..739e8af8 100644
--- a/src/packages/ce/src/auth/UserForgotPasswordPage.tsx
+++ b/src/packages/ce/src/auth/UserForgotPasswordPage.tsx
@@ -39,7 +39,7 @@ export const UserForgotPasswordPage: React.FC = () => {
})
return <>
-
diff --git a/src/packages/ce/src/auth/UserLoginPage.tsx b/src/packages/ce/src/auth/UserLoginPage.tsx
index 43babcd7..e116c0e1 100644
--- a/src/packages/ce/src/auth/UserLoginPage.tsx
+++ b/src/packages/ce/src/auth/UserLoginPage.tsx
@@ -59,7 +59,8 @@ export const UserLoginPage: React.FC = () => {
})
return <>
-
+
@@ -87,10 +88,10 @@ export const UserLoginPage: React.FC = () => {
Forgot password?
-
+
Don't have an account yet
-
+
Sign up
diff --git a/src/packages/ce/src/auth/UserRegistrationPage.tsx b/src/packages/ce/src/auth/UserRegistrationPage.tsx
index fc623323..9d4d3d3d 100644
--- a/src/packages/ce/src/auth/UserRegistrationPage.tsx
+++ b/src/packages/ce/src/auth/UserRegistrationPage.tsx
@@ -69,7 +69,7 @@ export const UserRegistrationPage: React.FC = () => {
})
return <>
-
diff --git a/src/packages/ce/src/auth/UserResetPasswordPage.tsx b/src/packages/ce/src/auth/UserResetPasswordPage.tsx
index 7578413e..c1d9c75a 100644
--- a/src/packages/ce/src/auth/UserResetPasswordPage.tsx
+++ b/src/packages/ce/src/auth/UserResetPasswordPage.tsx
@@ -51,7 +51,7 @@ export const UserResetPasswordPage: React.FC = () => {
})
return <>
-
diff --git a/src/packages/ce/src/dashboard/application/ApplicationPage.tsx b/src/packages/ce/src/dashboard/application/ApplicationPage.tsx
index 3fd16a1c..304d6e78 100644
--- a/src/packages/ce/src/dashboard/application/ApplicationPage.tsx
+++ b/src/packages/ce/src/dashboard/application/ApplicationPage.tsx
@@ -1,5 +1,5 @@
-import {PersonalProjectsView} from "@edition/dashboard/application/PersonalProjectsView";
-import {OrganizationsView} from "@edition/dashboard/application/OrganizationsView";
+import {PersonalProjectsView} from "@edition/dashboard/personal-project/PersonalProjectsView";
+import {OrganizationsView} from "@edition/dashboard/organization/OrganizationsView";
import {Spacing} from "@code0-tech/pictor";
export const ApplicationPage = () => {
diff --git a/src/packages/ce/src/dashboard/application/ApplicationSettingsPage.tsx b/src/packages/ce/src/dashboard/application/ApplicationSettingsPage.tsx
index f1253038..c301b0c7 100644
--- a/src/packages/ce/src/dashboard/application/ApplicationSettingsPage.tsx
+++ b/src/packages/ce/src/dashboard/application/ApplicationSettingsPage.tsx
@@ -38,13 +38,13 @@ export const ApplicationSettingsPage: React.FC = () => {
Application
-
+
-
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/namespace/NamespaceOverviewRightView.tsx b/src/packages/ce/src/dashboard/namespace/NamespaceOverviewRightView.tsx
new file mode 100644
index 00000000..5698f9df
--- /dev/null
+++ b/src/packages/ce/src/dashboard/namespace/NamespaceOverviewRightView.tsx
@@ -0,0 +1,84 @@
+"use client"
+
+import React from "react";
+import {
+ AuroraBackground,
+ Avatar,
+ Badge,
+ Button,
+ DRuntimeList,
+ Flex,
+ Spacing,
+ Text,
+ Tooltip,
+ TooltipArrow,
+ TooltipContent,
+ TooltipPortal,
+ TooltipTrigger,
+ useService,
+ useStore
+} from "@code0-tech/pictor";
+import {MemberService} from "@edition/member/Member.service";
+import {useParams} from "next/navigation";
+import {NamespaceService} from "@edition/namespace/Namespace.service";
+import {UserService} from "@edition/user/User.service";
+import Link from "next/link";
+
+export const NamespaceOverviewRightView: React.FC = () => {
+
+ const params = useParams()
+ const memberService = useService(MemberService)
+ const memberStore = useStore(MemberService)
+ const namespaceService = useService(NamespaceService)
+ const namespaceStore = useStore(NamespaceService)
+ const userService = useService(UserService)
+ const userStore = useStore(UserService)
+
+ const namespaceId = params.namespaceId as any as number
+ const namespace = React.useMemo(() => namespaceService.getById(`gid://sagittarius/Namespace/${namespaceId}`), [namespaceStore, namespaceId])
+ const members = React.useMemo(() => memberService.values({namespaceId: `gid://sagittarius/Namespace/${namespaceId}`}), [memberStore, userStore])
+
+ return
+
+
+ This is your personal space where you can manage your projects, roles, runtimes and invite outside
+ users.
+
+ Members
+
+
+ {members.map(member => {
+ const user = userService.getById(member.user?.id!!)
+ return
+
+
+
+
+
+
+
+ {user?.username}
+
+
+ {user?.email}
+
+
+
+
+
+
+ })}
+
+
+
+
+
+ Runtimes
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/application/PersonalProjectsCreatePage.tsx b/src/packages/ce/src/dashboard/namespace/NamespaceProjectsCreatePage.tsx
similarity index 74%
rename from src/packages/ce/src/dashboard/application/PersonalProjectsCreatePage.tsx
rename to src/packages/ce/src/dashboard/namespace/NamespaceProjectsCreatePage.tsx
index e605e881..0135fedc 100644
--- a/src/packages/ce/src/dashboard/application/PersonalProjectsCreatePage.tsx
+++ b/src/packages/ce/src/dashboard/namespace/NamespaceProjectsCreatePage.tsx
@@ -1,34 +1,23 @@
"use client"
import React from "react";
-import {
- Button,
- Col,
- Flex,
- Spacing,
- Text,
- TextInput,
- toast,
- useForm,
- useService,
- useStore,
- useUserSession
-} from "@code0-tech/pictor";
+import {Button, Col, Flex, Spacing, Text, TextInput, toast, useForm, useService} from "@code0-tech/pictor";
import Link from "next/link";
-import {useRouter} from "next/navigation";
+import {useParams, useRouter} from "next/navigation";
import {ProjectService} from "@edition/project/Project.service";
-import {UserService} from "@edition/user/User.service";
+import {Namespace} from "@code0-tech/sagittarius-graphql-types";
-export const PersonalProjectsCreatePage: React.FC = () => {
+export const NamespaceProjectsCreatePage: React.FC = () => {
- const currentSession = useUserSession()
- const userStore = useStore(UserService)
- const userService = useService(UserService)
+ const params = useParams()
const projectService = useService(ProjectService)
const [, startTransition] = React.useTransition()
const router = useRouter()
- const currentUser = React.useMemo(() => userService.getById(currentSession?.user?.id), [currentSession, userStore])
+ const namespaceIndex = params?.namespaceId as string
+ const namespaceId: Namespace['id'] = `gid://sagittarius/Namespace/${namespaceIndex as unknown as number}`
+
+ //TODO: user abilities for project creation within namespace
const [inputs, validate] = useForm({
initialValues: {
@@ -47,7 +36,7 @@ export const PersonalProjectsCreatePage: React.FC = () => {
},
onSubmit: (values) => {
startTransition(() => {
- if (!currentUser?.namespace?.id) {
+ if (!namespaceId) {
toast({
title: "The current user does not have a personal namespace.",
color: "error",
@@ -58,11 +47,10 @@ export const PersonalProjectsCreatePage: React.FC = () => {
projectService.projectCreate({
name: values.name as unknown as string,
description: values.description as unknown as string,
- namespaceId: currentUser.namespace.id
+ namespaceId: namespaceId
}).then(payload => {
if ((payload?.errors?.length ?? 0) <= 0) {
- router.push("/")
- //router.push(`/namespace/${currentUser.namespace?.id}`)
+ router.push(`/namespace/${namespaceIndex}/projects`)
}
})
})
@@ -72,7 +60,7 @@ export const PersonalProjectsCreatePage: React.FC = () => {
return
- Create new personal project
+ Create new project
@@ -94,11 +82,11 @@ export const PersonalProjectsCreatePage: React.FC = () => {
diff --git a/src/packages/ce/src/dashboard/namespace/NamespaceProjectsPage.tsx b/src/packages/ce/src/dashboard/namespace/NamespaceProjectsPage.tsx
new file mode 100644
index 00000000..c66e04c2
--- /dev/null
+++ b/src/packages/ce/src/dashboard/namespace/NamespaceProjectsPage.tsx
@@ -0,0 +1,8 @@
+"use client"
+
+import {NamespaceProjectsView} from "@edition/dashboard/namespace/NamespaceProjectsView";
+import React from "react";
+
+export const NamespaceProjectsPage: React.FC = () => {
+ return
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/namespace/NamespaceProjectsView.tsx b/src/packages/ce/src/dashboard/namespace/NamespaceProjectsView.tsx
new file mode 100644
index 00000000..5a72aa44
--- /dev/null
+++ b/src/packages/ce/src/dashboard/namespace/NamespaceProjectsView.tsx
@@ -0,0 +1,36 @@
+"use client"
+
+
+import React from "react";
+import {Button, DNamespaceProjectList, Flex, Spacing, Text} from "@code0-tech/pictor";
+import Link from "next/link";
+import {useParams} from "next/navigation";
+
+export const NamespaceProjectsView: React.FC = () => {
+
+ const params = useParams()
+ const namespaceId = params.namespaceId as any as number
+
+ const projectsList = React.useMemo(() => {
+ return
+ }, [namespaceId])
+
+ //TODO: user abilities for project creation within namespace
+
+ return <>
+
+
+
+ Projects
+
+
+
+
+
+
+
+
+ {projectsList}
+
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/namespace/NamespaceTabView.tsx b/src/packages/ce/src/dashboard/namespace/NamespaceTabView.tsx
new file mode 100644
index 00000000..8c21c806
--- /dev/null
+++ b/src/packages/ce/src/dashboard/namespace/NamespaceTabView.tsx
@@ -0,0 +1,103 @@
+"use client"
+
+import React from "react";
+import {Badge, Button, Container, useService, useStore} from "@code0-tech/pictor";
+import {Tab, TabList, TabTrigger} from "@code0-tech/pictor/dist/components/tab/Tab";
+import {IconFolders, IconHome, IconServer, IconSettings, IconUserCog, IconUsers} from "@tabler/icons-react";
+import {useParams, usePathname, useRouter} from "next/navigation";
+import {NamespaceService} from "@edition/namespace/Namespace.service";
+import {OrganizationService} from "@edition/organization/Organization.service";
+import {ProjectService} from "@edition/project/Project.service";
+import {RoleService} from "@edition/role/Role.service";
+import {MemberService} from "@edition/member/Member.service";
+import {RuntimeService} from "@edition/runtime/Runtime.service";
+
+export const NamespaceTabView: React.FC = () => {
+
+ const pathname = usePathname()
+ const router = useRouter()
+ const params = useParams()
+ const namespaceId = params.namespaceId as any
+
+ const namespaceService = useService(NamespaceService)
+ const namespaceStore = useStore(NamespaceService)
+ const organizationService = useService(OrganizationService)
+ const organizationStore = useStore(OrganizationService)
+ const projectService = useService(ProjectService)
+ const roleService = useService(RoleService)
+ const memberService = useService(MemberService)
+ const runtimeService = useService(RuntimeService)
+ const runtimeStore = useStore(RuntimeService)
+
+ const namespace = React.useMemo(() => namespaceService.getById(`gid://sagittarius/Namespace/${namespaceId}`), [namespaceStore, namespaceId])
+ const parentOrganization = React.useMemo(() => namespace?.parent?.__typename === "Organization" ? organizationService.getById(namespace?.parent?.id) : null, [organizationStore, namespace])
+
+ const baseLink = `/namespace/${namespaceId}`
+ const defaultValue = pathname.includes("projects") ? "projects"
+ : pathname.includes("members") ? "members"
+ : pathname.includes("roles") ? "roles"
+ : pathname.includes("runtimes") ? "runtimes"
+ : pathname.includes("settings") ? "settings"
+ : "overview"
+
+ const settings = React.useMemo(() => {
+ return namespace?.parent?.__typename == "Organization"
+ && parentOrganization
+ && (
+ parentOrganization.userAbilities?.deleteOrganization
+ || parentOrganization?.userAbilities?.updateOrganization
+ //TODO add license check for enterprise features
+ ) ? (
+
+
+
+ ) : null
+ }, [namespace, parentOrganization])
+
+ return
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {settings}
+
+
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/application/OrganizationCreatePage.tsx b/src/packages/ce/src/dashboard/organization/OrganizationCreatePage.tsx
similarity index 100%
rename from src/packages/ce/src/dashboard/application/OrganizationCreatePage.tsx
rename to src/packages/ce/src/dashboard/organization/OrganizationCreatePage.tsx
diff --git a/src/packages/ce/src/dashboard/organization/OrganizationDeleteView.tsx b/src/packages/ce/src/dashboard/organization/OrganizationDeleteView.tsx
new file mode 100644
index 00000000..b261e1d6
--- /dev/null
+++ b/src/packages/ce/src/dashboard/organization/OrganizationDeleteView.tsx
@@ -0,0 +1,64 @@
+"use client"
+
+import React from "react";
+import {Button, Card, Flex, Spacing, Text, useService, useStore, toast} from "@code0-tech/pictor";
+import {useParams, useRouter} from "next/navigation";
+import {NamespaceService} from "@edition/namespace/Namespace.service";
+import {OrganizationService} from "@edition/organization/Organization.service";
+import {Namespace} from "@code0-tech/sagittarius-graphql-types";
+
+export const OrganizationDeleteView: React.FC = () => {
+
+ const params = useParams()
+ const router = useRouter()
+ const namespaceService = useService(NamespaceService)
+ const namespaceStore = useStore(NamespaceService)
+ const organizationService = useService(OrganizationService)
+ const organizationStore = useStore(OrganizationService)
+
+ const namespaceIndex = params.namespaceId as any as number
+ const namespaceId: Namespace['id'] = `gid://sagittarius/Namespace/${namespaceIndex}`
+
+ const namespace = React.useMemo(() => namespaceService.getById(namespaceId), [namespaceStore, namespaceId])
+ const parentOrganization = React.useMemo(() => namespace?.parent?.__typename === "Organization" ? organizationService.getById(namespace?.parent?.id) : null, [organizationStore, namespace])
+
+ const [, startTransition] = React.useTransition()
+
+
+ const deleteOrganization = React.useCallback(() => {
+ startTransition(() => {
+ organizationService.organizationDelete({
+ organizationId: parentOrganization?.id!!
+ }).then(payload => {
+ if ((payload?.errors?.length ?? 0) <= 0) {
+ toast({
+ title: "The organization was successfully deleted.",
+ color: "success",
+ dismissible: true,
+ })
+ }
+ router.push("/")
+ })
+ })
+ }, [parentOrganization])
+
+ return <>
+
+ Delete organization forever
+
+
+
+
+
+ Delete organization
+
+ This will delete the organization and cannot be undone.
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/organization/OrganizationGeneralSettingsView.tsx b/src/packages/ce/src/dashboard/organization/OrganizationGeneralSettingsView.tsx
new file mode 100644
index 00000000..b7d7d5c6
--- /dev/null
+++ b/src/packages/ce/src/dashboard/organization/OrganizationGeneralSettingsView.tsx
@@ -0,0 +1,77 @@
+"use client"
+
+import React from "react";
+import CardSection from "@code0-tech/pictor/dist/components/card/CardSection";
+import {Button, Card, Flex, Spacing, Text, TextInput, toast, useForm, useService, useStore} from "@code0-tech/pictor";
+import {useParams} from "next/navigation";
+import {NamespaceService} from "@edition/namespace/Namespace.service";
+import {OrganizationService} from "@edition/organization/Organization.service";
+import {Namespace} from "@code0-tech/sagittarius-graphql-types";
+
+export const OrganizationGeneralSettingsView: React.FC = () => {
+
+ const params = useParams()
+ const namespaceService = useService(NamespaceService)
+ const namespaceStore = useStore(NamespaceService)
+ const organizationService = useService(OrganizationService)
+ const organizationStore = useStore(OrganizationService)
+
+ const namespaceIndex = params.namespaceId as any as number
+ const namespaceId: Namespace['id'] = `gid://sagittarius/Namespace/${namespaceIndex}`
+
+ const namespace = React.useMemo(() => namespaceService.getById(namespaceId), [namespaceStore, namespaceId])
+ const parentOrganization = React.useMemo(() => namespace?.parent?.__typename === "Organization" ? organizationService.getById(namespace?.parent?.id) : null, [organizationStore, namespace])
+
+ const [, startTransition] = React.useTransition()
+
+ const initialValues = React.useMemo(() => ({
+ name: parentOrganization?.name,
+ }), [parentOrganization])
+
+ const [inputs, validate] = useForm({
+ initialValues: initialValues,
+ validate: {
+ name: (value) => {
+ if (!value) return "Name is required"
+ return null
+ },
+ },
+ onSubmit: (values) => {
+ startTransition(() => {
+ organizationService.organizationUpdate({
+ name: values.name!!,
+ organizationId: parentOrganization?.id!!
+ }).then(payload => {
+ if ((payload?.errors?.length ?? 0) <= 0) {
+ toast({
+ title: "The organization was successfully updated.",
+ color: "success",
+ dismissible: true,
+ })
+ }
+ })
+ })
+ }
+ })
+
+ return <>
+
+ General adjustments
+
+
+
+
+
+ Name
+
+
+
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/organization/OrganizationSettingsPage.tsx b/src/packages/ce/src/dashboard/organization/OrganizationSettingsPage.tsx
new file mode 100644
index 00000000..92c36b27
--- /dev/null
+++ b/src/packages/ce/src/dashboard/organization/OrganizationSettingsPage.tsx
@@ -0,0 +1,117 @@
+"use client"
+
+import React from "react";
+import {useParams} from "next/navigation";
+import {Namespace} from "@code0-tech/sagittarius-graphql-types";
+import {
+ AuroraBackground,
+ Avatar,
+ Badge,
+ Button,
+ DLayout,
+ Flex,
+ Spacing,
+ Text,
+ useService,
+ useStore
+} from "@code0-tech/pictor";
+import {NamespaceService} from "@edition/namespace/Namespace.service";
+import {OrganizationService} from "@edition/organization/Organization.service";
+import {IconFolders, IconServer, IconUserCog, IconUsers} from "@tabler/icons-react";
+import {Tab, TabContent, TabList, TabTrigger} from "@code0-tech/pictor/dist/components/tab/Tab";
+import {UsageView} from "@edition/dashboard/usage/UsageView";
+import {OrganizationUpgradeView} from "@edition/dashboard/organization/OrganizationUpgradeView";
+import {OrganizationDeleteView} from "@edition/dashboard/organization/OrganizationDeleteView";
+import {OrganizationGeneralSettingsView} from "@edition/dashboard/organization/OrganizationGeneralSettingsView";
+
+export const OrganizationSettingsPage: React.FC = () => {
+
+ //TODO: add ability check for organization settings access for every settings tab
+
+ const params = useParams()
+ const namespaceService = useService(NamespaceService)
+ const namespaceStore = useStore(NamespaceService)
+ const organizationService = useService(OrganizationService)
+ const organizationStore = useStore(OrganizationService)
+
+ const namespaceIndex = params.namespaceId as any as number
+ const namespaceId: Namespace['id'] = `gid://sagittarius/Namespace/${namespaceIndex}`
+ const namespace = React.useMemo(() => namespaceService.getById(namespaceId), [namespaceStore, namespaceId])
+ const parentOrganization = React.useMemo(() => namespace?.parent?.__typename === "Organization" ? organizationService.getById(namespace?.parent?.id) : null, [organizationStore, namespace])
+
+ return <>
+
+ {React.useMemo(() => {
+ return
+
+
+
+ {parentOrganization?.name}
+
+
+
+
+ {namespace?.members?.count}
+
+
+
+ {namespace?.projects?.count}
+
+
+
+ {namespace?.roles?.count}
+
+
+
+ {namespace?.runtimes?.count}
+
+
+
+
+ }, [parentOrganization])}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }>
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/organization/OrganizationUpgradeView.tsx b/src/packages/ce/src/dashboard/organization/OrganizationUpgradeView.tsx
new file mode 100644
index 00000000..8f4f84f8
--- /dev/null
+++ b/src/packages/ce/src/dashboard/organization/OrganizationUpgradeView.tsx
@@ -0,0 +1,176 @@
+"use client"
+
+import React from "react";
+import {
+ AuroraBackground,
+ Badge,
+ Button,
+ Card,
+ Col,
+ Flex,
+ Row,
+ SegmentedControl,
+ SegmentedControlItem,
+ Spacing,
+ Text
+} from "@code0-tech/pictor";
+import {IconArrowRight, IconBuilding, IconGitBranch, IconServer, IconUserCog} from "@tabler/icons-react";
+
+export const OrganizationUpgradeView: React.FC = () => {
+
+ const [value, setValue] = React.useState("annually")
+
+ return <>
+ Upgrade to team
+
+
+ Upgrade your organization to the Team plan to unlock advanced features, enhanced collaboration tools, and
+ priority support. Elevate your team's productivity and take advantage of exclusive benefits designed to help
+ your organization thrive.
+
+
+
+ {
+ if (value )setValue(value)
+ }} value={value}>
+
+ Billed monthly
+
+
+
+ Billed annually
+
+ -27%
+
+
+
+
+
+
+
+
+
+
+
+ Team self-hosted
+
+
+ 7,95€
+ per member / month billed monthly
+
+
+
+
+
+
+
+
+ Manage projects inside organizations
+
+
+
+ Advanced role management
+
+
+
+ Unlimited flows
+
+
+
+ 10.000 runtime minutes per month
+
+
+
+
+
+
+
+
+
+ Team cloud
+
+
+
+
+ 3,95€
+
+ -27%
+
+
+ per member / month
+ billed annually
+
+
+
+
+
+
+
+
+ Manage projects inside organizations
+
+
+
+ Advanced role management
+
+
+
+ Unlimited flows
+
+
+
+ 10.000 runtime minutes per month
+
+
+
+
+
+
+
+
+
+ Team cloud (pay as you go)
+
+
+ 3,95€
+ per member / month billed monthly
+
+
+
+
+
+
+
+
+ Manage projects inside organizations
+
+
+
+ Advanced role management
+
+
+
+ Unlimited flows
+
+
+
+ 10.000 runtime minutes per month
+
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/application/OrganizationsPage.tsx b/src/packages/ce/src/dashboard/organization/OrganizationsPage.tsx
similarity index 57%
rename from src/packages/ce/src/dashboard/application/OrganizationsPage.tsx
rename to src/packages/ce/src/dashboard/organization/OrganizationsPage.tsx
index 9d988c78..cf663f27 100644
--- a/src/packages/ce/src/dashboard/application/OrganizationsPage.tsx
+++ b/src/packages/ce/src/dashboard/organization/OrganizationsPage.tsx
@@ -1,7 +1,7 @@
"use client"
import React from "react";
-import {OrganizationsView} from "@edition/dashboard/application/OrganizationsView";
+import {OrganizationsView} from "@edition/dashboard/organization/OrganizationsView";
export const OrganizationsPage = () => {
return
diff --git a/src/packages/ce/src/dashboard/application/OrganizationsView.tsx b/src/packages/ce/src/dashboard/organization/OrganizationsView.tsx
similarity index 68%
rename from src/packages/ce/src/dashboard/application/OrganizationsView.tsx
rename to src/packages/ce/src/dashboard/organization/OrganizationsView.tsx
index 3f9552a1..c43533f5 100644
--- a/src/packages/ce/src/dashboard/application/OrganizationsView.tsx
+++ b/src/packages/ce/src/dashboard/organization/OrganizationsView.tsx
@@ -1,24 +1,32 @@
+"use client"
+
import {Button, DOrganizationList, Flex, Spacing, Text, TextInput} from "@code0-tech/pictor";
import {IconSearch} from "@tabler/icons-react";
import Link from "next/link";
import React from "react";
+import {useRouter} from "next/navigation";
export const OrganizationsView = () => {
+ const router = useRouter()
+
return <>
Organizations
- } placeholder={"Find an organization..."}/>
-
+ {/**TODO: use namespaceId*/}
+ {
+ const number = organization.namespace?.id?.match(/Namespace\/(\d+)$/)?.[1]
+ router.push(`/namespace/${number}`)
+ }}/>
}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/application/PersonalProjectsView.tsx b/src/packages/ce/src/dashboard/personal-project/PersonalProjectsView.tsx
similarity index 85%
rename from src/packages/ce/src/dashboard/application/PersonalProjectsView.tsx
rename to src/packages/ce/src/dashboard/personal-project/PersonalProjectsView.tsx
index 28573be9..9eeb08cd 100644
--- a/src/packages/ce/src/dashboard/application/PersonalProjectsView.tsx
+++ b/src/packages/ce/src/dashboard/personal-project/PersonalProjectsView.tsx
@@ -2,7 +2,8 @@ import React from "react";
import {
Button,
DNamespaceProjectList,
- Flex, Spacing,
+ Flex,
+ Spacing,
Text,
TextInput,
useService,
@@ -20,6 +21,8 @@ export const PersonalProjectsView: React.FC = () => {
const userService = useService(UserService)
const currentUser = React.useMemo(() => userService.getById(userSession?.user?.id), [userStore, userSession])
+ const namespaceId = currentUser?.namespace?.id
+ const namespaceIndex = namespaceId?.match(/Namespace\/(\d+)$/)?.[1]
const projectsList = React.useMemo(() => {
if (!currentUser || !currentUser.namespace) return null
@@ -34,8 +37,7 @@ export const PersonalProjectsView: React.FC = () => {
Personal projects
- } placeholder={"Find a personal project..."}/>
-
+
diff --git a/src/packages/ce/src/dashboard/role/RoleCreatePage.tsx b/src/packages/ce/src/dashboard/role/RoleCreatePage.tsx
new file mode 100644
index 00000000..0fa649b0
--- /dev/null
+++ b/src/packages/ce/src/dashboard/role/RoleCreatePage.tsx
@@ -0,0 +1,38 @@
+"use client"
+
+import React from "react";
+import {Button, Col, Flex, Spacing, Text, TextInput} from "@code0-tech/pictor";
+import Link from "next/link";
+
+export const RoleCreatePage: React.FC = () => {
+
+ //TODO: user abilities for add role within namespace
+
+ return
+
+
+ Create new role
+
+
+
+ Global runtimes are shared runtimes that can be used across multiple organizations.
+
+
+
+
+
+
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/role/RoleSettingsPage.tsx b/src/packages/ce/src/dashboard/role/RoleSettingsPage.tsx
new file mode 100644
index 00000000..a3a4b96b
--- /dev/null
+++ b/src/packages/ce/src/dashboard/role/RoleSettingsPage.tsx
@@ -0,0 +1,421 @@
+"use client"
+
+import React from "react";
+import type {Namespace, NamespaceRole, NamespaceRoleAbility, Scalars} from "@code0-tech/sagittarius-graphql-types";
+import {useParams} from "next/navigation";
+import {
+ Alert,
+ AuroraBackground,
+ Button,
+ Card,
+ CheckboxInput,
+ Col,
+ DLayout,
+ DNamespaceProjectView,
+ Flex,
+ Row,
+ Spacing,
+ Text,
+ toast,
+ useForm,
+ useService,
+ useStore
+} from "@code0-tech/pictor";
+import {RoleService} from "@edition/role/Role.service";
+import {ProjectService} from "@edition/project/Project.service";
+import {Tab, TabContent, TabList, TabTrigger} from "@code0-tech/pictor/dist/components/tab/Tab";
+import CardSection from "@code0-tech/pictor/dist/components/card/CardSection";
+import {DNamespaceRolePermissions} from "@code0-tech/pictor/dist/components/d-role/DNamespaceRolePermissions";
+import DNamespaceProjectMenu from "@code0-tech/pictor/dist/components/d-project/DNamespaceProjectMenu";
+import {DNamespaceProjectContent} from "@code0-tech/pictor/dist/components/d-project/DNamespaceProjectContent";
+import {IconTrash} from "@tabler/icons-react";
+
+type Permission = {
+ label: string
+ ability: NamespaceRoleAbility | string
+}
+
+type PermissionGroup = {
+ title: string
+ permissions: Permission[]
+}
+
+type PermissionObject = {
+ [key: NamespaceRoleAbility | string]: boolean
+}
+
+type PermissionTemplate = {
+ name: string
+ abilities: PermissionObject
+}
+
+
+const permissions: PermissionGroup[] = [
+ {
+ title: "Member permissions",
+ permissions: [
+ {label: "Assign member roles", ability: "ASSIGN_MEMBER_ROLES"},
+ {label: "Add member", ability: "INVITE_MEMBER"},
+ {label: "Remove member", ability: "DELETE_MEMBER"},
+ ]
+ },
+ {
+ title: "Project permissions",
+ permissions: [
+ {label: "Create project", ability: "CREATE_NAMESPACE_PROJECT"},
+ {label: "Update project", ability: "UPDATE_NAMESPACE_PROJECT"},
+ {label: "Delete project", ability: "DELETE_NAMESPACE_PROJECT"},
+ {label: "Read project", ability: "READ_NAMESPACE_PROJECT"},
+ ]
+ },
+ {
+ title: "Role permissions",
+ permissions: [
+ {label: "Create role", ability: "CREATE_NAMESPACE_ROLE"},
+ {label: "Update role", ability: "UPDATE_NAMESPACE_ROLE"},
+ {label: "Limit roles to projects", ability: "ASSIGN_ROLE_PROJECTS"},
+ {label: "Assign role abilities", ability: "ASSIGN_ROLE_ABILITIES"},
+ ]
+ },
+ {
+ title: "Runtime permissions",
+ permissions: [
+ {label: "Create runtime", ability: "CREATE_RUNTIME"},
+ {label: "Update runtime", ability: "UPDATE_RUNTIME"},
+ {label: "Delete runtime", ability: "DELETE_RUNTIME"},
+ {label: "Rotate runtime token", ability: "ROTATE_RUNTIME_TOKEN"},
+ {label: "Assign runtime to projects", ability: "ASSIGN_PROJECT_RUNTIMES"},
+ ]
+ },
+ {
+ title: "Flow permissions",
+ permissions: [
+ {label: "Create flow", ability: "CREATE_FLOW"},
+ {label: "Update flow", ability: "UPDATE_FLOW"},
+ {label: "Delete flow", ability: "DELETE_FLOW"},
+ ]
+ },
+ {
+ title: "License permissions",
+ permissions: [
+ {label: "Create license", ability: "CREATE_NAMESPACE_LICENSE"},
+ {label: "Read license", ability: "READ_NAMESPACE_LICENSE"},
+ {label: "Delete license", ability: "DELETE_NAMESPACE_LICENSE"},
+ ]
+ },
+ {
+ title: "Organization permissions",
+ permissions: [
+ {label: "Update organization", ability: "UPDATE_ORGANIZATION"},
+ {label: "Delete organization", ability: "DELETE_ORGANIZATION"},
+ ]
+ },
+ {
+ title: "Administrator permissions",
+ permissions: [
+ {label: "Namespace administrator", ability: "NAMESPACE_ADMINISTRATOR"},
+ ]
+ }
+]
+
+const defaultPermissions = {
+ ...permissions.reduce((acc, group) => {
+ group.permissions.forEach(permission => {
+ acc[permission.ability] = false
+ })
+ return acc
+ }, {} as Record)
+}
+
+const permissionTemplates: PermissionTemplate[] = [
+ {
+ name: "Flow developer role template",
+ abilities: {
+ ...defaultPermissions,
+ "CREATE_FLOW": true,
+ "UPDATE_FLOW": true,
+ "DELETE_FLOW": true,
+ "CREATE_NAMESPACE_PROJECT": true,
+ "UPDATE_NAMESPACE_PROJECT": true,
+ "ASSIGN_PROJECT_RUNTIMES": true
+ }
+ },
+ {
+ name: "Team manager role template",
+ abilities: {
+ ...defaultPermissions,
+ "INVITE_MEMBER": true,
+ "DELETE_MEMBER": true,
+ "ASSIGN_MEMBER_ROLES": true,
+ "CREATE_NAMESPACE_ROLE": true,
+ "UPDATE_NAMESPACE_ROLE": true,
+ "ASSIGN_ROLE_PROJECTS": true,
+ "ASSIGN_ROLE_ABILITIES": true
+
+ }
+ },
+ {
+ name: "Runtime manager role template",
+ abilities: {
+ ...defaultPermissions,
+ "CREATE_RUNTIME": true,
+ "UPDATE_RUNTIME": true,
+ "DELETE_RUNTIME": true,
+ "ROTATE_RUNTIME_TOKEN": true,
+ "ASSIGN_PROJECT_RUNTIMES": true
+ }
+ },
+ {
+ name: "Project manager role template",
+ abilities: {
+ ...defaultPermissions,
+ "CREATE_NAMESPACE_PROJECT": true,
+ "UPDATE_NAMESPACE_PROJECT": true,
+ "DELETE_NAMESPACE_PROJECT": true,
+ "READ_NAMESPACE_PROJECT": true,
+ "ASSIGN_PROJECT_RUNTIMES": true
+ }
+ }
+]
+
+export const RoleSettingsPage: React.FC = () => {
+
+ //TODO: limit tabs based on user abilities for roles
+ //TODO: add general adjustments tab for role name update
+ //TODO: delete role functionality as tab
+
+ const params = useParams()
+ const roleService = useService(RoleService)
+ const roleStore = useStore(RoleService)
+ const projectService = useService(ProjectService)
+ const projectStore = useStore(ProjectService)
+ const [, startTransition] = React.useTransition()
+
+ const namespaceIndex = params.namespaceId as any as number
+ const roleIndex = params.roleId as any as number
+ const namespaceId: Namespace['id'] = `gid://sagittarius/Namespace/${namespaceIndex}`
+ const roleId: NamespaceRole['id'] = `gid://sagittarius/NamespaceRole/${roleIndex}`
+
+ const role = React.useMemo(() => roleService.getById(roleId, {namespaceId: namespaceId}), [roleStore, roleId, namespaceId])
+ const roleAbilities = React.useMemo(() => {
+ return {
+ ...permissions.reduce((acc, group) => {
+ group.permissions.forEach(permission => {
+ acc[permission.ability] = role?.abilities?.includes(permission.ability as NamespaceRoleAbility) ?? false
+ })
+ return acc
+ }, {} as Record)
+ }
+ }, [role])
+
+ const roleAssignedProjects = React.useMemo(() => role?.assignedProjects?.nodes?.map(p => p?.id!!) ?? [], [role])
+ const [assignedProjectIds, setAssignedProjectIds] = React.useState(roleAssignedProjects)
+ const [initialValues, setInitialValues] = React.useState(roleAbilities)
+
+ React.useEffect(() => {
+ setAssignedProjectIds(roleAssignedProjects)
+ }, [role])
+
+ React.useEffect(() => {
+ setInitialValues(roleAbilities)
+ }, [role])
+
+ const [inputs, validate] = useForm({
+ initialValues: initialValues,
+ validate: {},
+ onSubmit: (values) => {
+ startTransition(() => {
+ const updatedAbilities = Object.entries(values)
+ .filter(([_, enabled]) => enabled)
+ .map(([ability, _]) => ability as NamespaceRoleAbility)
+ roleService.roleAssignAbilities({
+ roleId: roleId!!,
+ abilities: updatedAbilities
+ }).then(payload => {
+ if ((payload?.errors?.length ?? 0) <= 0) {
+ toast({
+ title: "The permissions were successfully updated.",
+ color: "success",
+ dismissible: true,
+ })
+ }
+ })
+ })
+ }
+ })
+
+ const assignProjects = () => {
+ startTransition(() => {
+ roleService.roleAssignProject({
+ roleId: roleId,
+ projectIds: assignedProjectIds as Scalars['NamespaceProjectID']['output'][]
+ }).then(payload => {
+ if ((payload?.errors?.length ?? 0) <= 0) {
+ toast({
+ title: "All projects were successfully assigned to the role.",
+ color: "success",
+ dismissible: true,
+ })
+ }
+ })
+ })
+ }
+
+ const addAssignedProject = (projectId: Scalars['NamespaceProjectID']['output']) => {
+ setAssignedProjectIds(prevState => {
+ return [...prevState, projectId]
+ })
+ }
+
+ const removeAssignedProject = (projectId: Scalars['NamespaceProjectID']['output']) => {
+ setAssignedProjectIds(prevState => {
+ return prevState.filter(id => id !== projectId)
+ })
+ }
+
+ const filterProjects = React.useCallback((project: DNamespaceProjectView) => {
+ return !assignedProjectIds.find(projectId => projectId == project.id!!)
+ }, [assignedProjectIds])
+
+ return <>
+
+
+
+ {role?.name}
+
+
+
+
+
+
+
+
+
+
+
+
+ }>
+ <>
+
+
+ Select from role templates
+
+
+ {React.useMemo(() => {
+ return
+ {permissionTemplates.map(permissionTemplate => {
+
+ const templateAbilities = Object.entries(permissionTemplate.abilities)
+ .filter(([_, enabled]) => enabled)
+ .map(([ability]) => ability as NamespaceRoleAbility);
+
+ const roleAbilities = Object.entries(initialValues)
+ .filter(([_, enabled]) => enabled)
+ .map(([ability]) => ability as NamespaceRoleAbility);
+
+ const isSelected = templateAbilities.length === roleAbilities.length
+ && templateAbilities.every(a => new Set(roleAbilities).has(a));
+
+
+ return
+
+
+ {permissionTemplate.name}
+
+
+ enabled)
+ .map(([ability, _]) => ability as NamespaceRoleAbility)}/>
+
+
+ {isSelected ? : null}
+
+
+ })}
+
+ }, [initialValues, role])}
+
+
+
+ Current stored
+ permissions
+
+
+
+
+
+
+
+ {permissions.map(permissionGroup => {
+ return
+
+ {permissionGroup.title}
+
+ {permissionGroup.permissions.map(permission => (
+ <>
+
+
+ ))}
+
+
+
+
+ })}
+
+
+
+
+ Projects that members can
+ access
+
+
+ addAssignedProject(project.id!!)}>
+
+
+
+
+
+
+ {(assignedProjectIds.length ?? 0) <= 0 ? (
+
+
+ This role has no project assignments. Members with this role will have access to all
+ projects in the organization namespace.
+
+
+ ) : (
+
+ {assignedProjectIds.map(projectId => {
+ return
+
+
+
+
+
+ })}
+
+ )}
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/role/RolesPage.tsx b/src/packages/ce/src/dashboard/role/RolesPage.tsx
new file mode 100644
index 00000000..0d93b4b7
--- /dev/null
+++ b/src/packages/ce/src/dashboard/role/RolesPage.tsx
@@ -0,0 +1,8 @@
+"use client"
+
+import React from "react";
+import {RolesView} from "@edition/dashboard/role/RolesView";
+
+export const RolesPage: React.FC = () => {
+ return
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/role/RolesView.tsx b/src/packages/ce/src/dashboard/role/RolesView.tsx
new file mode 100644
index 00000000..d157f5f8
--- /dev/null
+++ b/src/packages/ce/src/dashboard/role/RolesView.tsx
@@ -0,0 +1,41 @@
+"use client"
+
+import React from "react";
+import {useParams, useRouter} from "next/navigation";
+import {Button, DNamespaceMemberList, DNamespaceRoleList, Flex, Spacing, Text, TextInput} from "@code0-tech/pictor";
+import {IconSearch} from "@tabler/icons-react";
+import Link from "next/link";
+
+export const RolesView: React.FC = () => {
+
+ const params = useParams()
+ const router = useRouter()
+ const namespaceId = params.namespaceId as any as number
+
+ const rolesList = React.useMemo(() => {
+ return {
+ const roleIndex = role.id?.match(/NamespaceRole\/(\d+)$/)?.[1]
+ router.push(`/namespace/${namespaceId}/roles/${roleIndex}/settings`)
+ }} namespaceId={`gid://sagittarius/Namespace/${namespaceId}`}/>
+ }, [namespaceId])
+
+ //TODO: user abilities for add role within namespace
+
+ return <>
+
+
+
+ Roles
+
+
+
+
+
+
+
+
+ {rolesList}
+
+
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/application/RuntimeCreatePage.tsx b/src/packages/ce/src/dashboard/runtime/RuntimeCreatePage.tsx
similarity index 77%
rename from src/packages/ce/src/dashboard/application/RuntimeCreatePage.tsx
rename to src/packages/ce/src/dashboard/runtime/RuntimeCreatePage.tsx
index 16e7c58d..bed0d10c 100644
--- a/src/packages/ce/src/dashboard/application/RuntimeCreatePage.tsx
+++ b/src/packages/ce/src/dashboard/runtime/RuntimeCreatePage.tsx
@@ -15,26 +15,36 @@ import {
useUserSession
} from "@code0-tech/pictor";
import Link from "next/link";
-import {notFound, useRouter} from "next/navigation";
+import {notFound, useParams, useRouter} from "next/navigation";
import {RuntimeService} from "@edition/runtime/Runtime.service";
import {UserService} from "@edition/user/User.service";
+import {NamespaceService} from "@edition/namespace/Namespace.service";
export const RuntimeCreatePage: React.FC = () => {
+ const params = useParams()
+ const namespaceIndex = params.namespaceId as any as number
+
const runtimeService = useService(RuntimeService)
const [, startTransition] = React.useTransition()
const [token, setToken] = React.useState(undefined)
const router = useRouter()
const currentSession = useUserSession()
-
const userStore = useStore(UserService)
const userService = useService(UserService)
+ const namespaceService = useService(NamespaceService)
+ const namespaceStore = useStore(NamespaceService)
+
const currentUser = React.useMemo(() => userService.getById(currentSession?.user?.id), [userStore, currentSession])
+ const namespace = React.useMemo(() => namespaceService.getById(`gid://sagittarius/Namespace/${namespaceIndex}`), [namespaceStore, namespaceIndex])
- if (currentUser && !currentUser.admin) {
+ if (!namespaceIndex && currentUser && !currentUser.admin) {
notFound()
}
+ //TODO: user abilities for runtime creation within namespace
+ // if (namespace.)
+
const [inputs, validate] = useForm({
initialValues: {
name: null,
@@ -54,7 +64,8 @@ export const RuntimeCreatePage: React.FC = () => {
startTransition(() => {
runtimeService.runtimeCreate({
name: values.name as unknown as string,
- description: values.description as unknown as string
+ description: values.description as unknown as string,
+ ...(namespaceIndex ? {namespaceId: `gid://sagittarius/Namespace/${namespaceIndex}`} : {})
}).then(payload => {
if ((payload?.errors?.length ?? 0) <= 0) {
if (payload?.runtime?.token) {
@@ -65,7 +76,7 @@ export const RuntimeCreatePage: React.FC = () => {
color: "error",
dismissible: true,
})
- router.push("/runtimes")
+ router.push(namespaceIndex ? `/namespace/${namespaceIndex}/runtimes` : "/runtimes")
}
}
})
@@ -76,11 +87,11 @@ export const RuntimeCreatePage: React.FC = () => {
return
- {!token ? "Create new global runtime" : "Global runtime created successfully"}
+ {!token ? "Create new runtime" : "Runtime created successfully"}
- Global runtimes are shared runtimes that can be used across multiple organizations.
+ Runtimes are shared runtimes that can be used across multiple organizations.
{!token ? (
@@ -108,14 +119,14 @@ export const RuntimeCreatePage: React.FC = () => {
)}
-
+
{!token ? (
) : null}
diff --git a/src/packages/ce/src/dashboard/application/RuntimeSettingPage.tsx b/src/packages/ce/src/dashboard/runtime/RuntimeSettingsPage.tsx
similarity index 86%
rename from src/packages/ce/src/dashboard/application/RuntimeSettingPage.tsx
rename to src/packages/ce/src/dashboard/runtime/RuntimeSettingsPage.tsx
index 2096f962..bff41d76 100644
--- a/src/packages/ce/src/dashboard/application/RuntimeSettingPage.tsx
+++ b/src/packages/ce/src/dashboard/runtime/RuntimeSettingsPage.tsx
@@ -6,40 +6,34 @@ import {
Card,
DLayout,
Flex,
- InputLabel,
Spacing,
Text,
TextInput,
toast,
useForm,
useService,
- useStore, useUserSession
+ useStore
} from "@code0-tech/pictor";
import {RuntimeService} from "@edition/runtime/Runtime.service";
import {notFound, useParams, useRouter} from "next/navigation";
import {Tab, TabContent, TabList, TabTrigger} from "@code0-tech/pictor/dist/components/tab/Tab";
-import {IconGavel, IconSettings} from "@tabler/icons-react";
import CardSection from "@code0-tech/pictor/dist/components/card/CardSection";
-import {UserService} from "@edition/user/User.service";
-export const RuntimeSettingPage: React.FC = () => {
+export const RuntimeSettingsPage: React.FC = () => {
+
+ //TODO: add ability check for runtime settings access for every settings tab
+
+ const params = useParams()
+ const namespaceId = params.namespaceId as any as number
+ const runtimeId = params.runtimeId as any as number
const runtimeService = useService(RuntimeService)
const runtimeStore = useStore(RuntimeService)
- const params = useParams()
const [, startTransition] = React.useTransition()
const [token, setToken] = React.useState(undefined)
const router = useRouter()
- const currentSession = useUserSession()
- const userStore = useStore(UserService)
- const userService = useService(UserService)
- const currentUser = React.useMemo(() => userService.getById(currentSession?.user?.id), [userStore, currentSession])
-
- const runtime = React.useMemo(() => runtimeService.getById(`gid://sagittarius/Runtime/${params.runtimeId as any}`), [runtimeStore, params])
- if (currentUser && !currentUser.admin) {
- notFound()
- }
+ const runtime = React.useMemo(() => runtimeService.getById(`gid://sagittarius/Runtime/${runtimeId}`), [runtimeStore, params])
if (runtime?.userAbilities && (!runtime?.userAbilities?.updateRuntime || !runtime.userAbilities.deleteRuntime || !runtime.userAbilities.rotateRuntimeToken)) {
notFound()
@@ -93,7 +87,7 @@ export const RuntimeSettingPage: React.FC = () => {
dismissible: true,
})
}
- router.push("/runtimes")
+ router.push(namespaceId ? `/namespace/${namespaceId}/runtimes` : "/runtimes")
})
})
}, [runtime, router])
@@ -132,17 +126,19 @@ export const RuntimeSettingPage: React.FC = () => {
- Runtime
-
+
-
-
diff --git a/src/packages/ce/src/dashboard/runtime/RuntimesPage.tsx b/src/packages/ce/src/dashboard/runtime/RuntimesPage.tsx
new file mode 100644
index 00000000..ce7dd952
--- /dev/null
+++ b/src/packages/ce/src/dashboard/runtime/RuntimesPage.tsx
@@ -0,0 +1,42 @@
+"use client"
+
+import React from "react";
+import {Button, DRuntimeList, Flex, Spacing, Text, useService, useStore, useUserSession} from "@code0-tech/pictor";
+import Link from "next/link";
+import {notFound, useParams, useRouter} from "next/navigation";
+import {UserService} from "@edition/user/User.service";
+
+export const RuntimesPage: React.FC = () => {
+
+ const currentSession = useUserSession()
+ const userStore = useStore(UserService)
+ const userService = useService(UserService)
+ const currentUser = React.useMemo(() => userService.getById(currentSession?.user?.id), [userStore, currentSession])
+
+ const params = useParams()
+ const namespaceIndex = params.namespaceId as any as number
+
+ if (!namespaceIndex && currentUser && !currentUser.admin) {
+ notFound()
+ }
+
+ const router = useRouter()
+ return <>
+
+
+ Runtimes
+
+
+
+
+
+
+
+
+ namespaceIndex ? true : !runtime?.namespace?.id} onSetting={(runtime) => {
+ const number = runtime.id?.match(/Runtime\/(\d+)$/)?.[1]
+ router.push(namespaceIndex ? `/namespace/${namespaceIndex}/runtimes/${number}/settings` : `/runtimes/${number}/settings`)
+ }}/>
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/usage/UsageView.tsx b/src/packages/ce/src/dashboard/usage/UsageView.tsx
new file mode 100644
index 00000000..54321a9a
--- /dev/null
+++ b/src/packages/ce/src/dashboard/usage/UsageView.tsx
@@ -0,0 +1,14 @@
+"use client"
+
+import React from "react";
+import {Button, Flex, Spacing, Text} from "@code0-tech/pictor";
+
+export const UsageView: React.FC = () => {
+ return <>
+ Runtime usage
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/dashboard/application/UsersPage.tsx b/src/packages/ce/src/dashboard/user/UsersPage.tsx
similarity index 92%
rename from src/packages/ce/src/dashboard/application/UsersPage.tsx
rename to src/packages/ce/src/dashboard/user/UsersPage.tsx
index dea4cbf0..d015ff55 100644
--- a/src/packages/ce/src/dashboard/application/UsersPage.tsx
+++ b/src/packages/ce/src/dashboard/user/UsersPage.tsx
@@ -29,7 +29,6 @@ export const UsersPage: React.FC = () => {
Users
- } placeholder={"Find a user..."}/>
diff --git a/src/packages/ce/src/member/Member.service.ts b/src/packages/ce/src/member/Member.service.ts
index 689151bc..08f6c42e 100644
--- a/src/packages/ce/src/member/Member.service.ts
+++ b/src/packages/ce/src/member/Member.service.ts
@@ -1,68 +1,129 @@
-import {DNamespaceMemberReactiveService, DNamespaceMemberView, ReactiveArrayStore} from "@code0-tech/pictor";
import {
- Namespace,
+ DMemberDependencies,
+ DNamespaceMemberReactiveService,
+ DNamespaceMemberView,
+ ReactiveArrayStore
+} from "@code0-tech/pictor"
+import {
+ Mutation,
+ NamespaceMember,
NamespacesMembersAssignRolesInput,
NamespacesMembersAssignRolesPayload,
NamespacesMembersDeleteInput,
NamespacesMembersDeletePayload,
NamespacesMembersInviteInput,
NamespacesMembersInvitePayload,
- Query,
- User
-} from "@code0-tech/sagittarius-graphql-types";
-import {GraphqlClient} from "@core/util/graphql-client";
+ Query
+} from "@code0-tech/sagittarius-graphql-types"
+import {GraphqlClient} from "@core/util/graphql-client"
import membersQuery from "./queries/Members.query.graphql"
+import memberAssignRoleMutation from "./mutations/Member.assignRoles.mutation.graphql"
+import memberDeleteMutation from "./mutations/Member.delete.mutation.graphql"
+import memberInviteMutation from "./mutations/Member.invite.mutation.graphql"
export class MemberService extends DNamespaceMemberReactiveService {
private readonly client: GraphqlClient
- private i = 0;
+ private i = 0
constructor(client: GraphqlClient, store: ReactiveArrayStore) {
- super(store);
+ super(store)
this.client = client
}
- getByNamespaceIdAndUserId(namespaceId: Namespace["id"], userId: User["id"]): DNamespaceMemberView | undefined {
- if (super.getByNamespaceIdAndUserId(namespaceId, userId)) return super.getByNamespaceIdAndUserId(namespaceId, userId)
+ values(dependencies?: DMemberDependencies): DNamespaceMemberView[] {
+ const members = super.values()
+ if (!dependencies?.namespaceId) return members
- this.client.query({
- query: membersQuery,
- variables: {
- namespaceId: namespaceId,
- firstMember: 50,
- afterMember: null,
- firstRole: 50,
- afterRole: null,
- }
- }).then(result => {
- const data = result.data
- if (!data) return
+ const namespaceId = dependencies.namespaceId
+ const filtered = members.filter(m => m.namespace?.id === namespaceId)
- if (data.namespace && data.namespace.members && data.namespace.members.nodes) {
- data.namespace.members.nodes.forEach((member) => {
- if (member) this.set(this.i++, new DNamespaceMemberView(member))
+ if (filtered.length <= 0) {
+ this.client.query({
+ query: membersQuery,
+ variables: {
+ namespaceId: namespaceId,
+ firstMember: 50,
+ afterMember: null,
+ firstRole: 50,
+ afterRole: null,
+ }
+ }).then(res => {
+ const nodes = res.data?.namespace?.members?.nodes ?? []
+ nodes.forEach(member => {
+ if (member && !this.hasById(member.id)) {
+ this.set(this.i++, new DNamespaceMemberView(member))
+ }
})
- }
- })
+ })
+ }
- return super.getByNamespaceIdAndUserId(namespaceId, userId)
+ return filtered
}
- values(): DNamespaceMemberView[] {
- return super.values();
+ hasById(id: NamespaceMember["id"]): boolean {
+ const member = super.values().find(o => o.id === id)
+ return member !== undefined
}
- memberAssignRoles(payload: NamespacesMembersAssignRolesInput): Promise {
- return Promise.resolve(undefined);
+ async memberAssignRoles(payload: NamespacesMembersAssignRolesInput): Promise {
+ const result = await this.client.mutate({
+ mutation: memberAssignRoleMutation,
+ variables: {
+ ...payload
+ }
+ })
+
+ //TODO: should be done by a new query
+ if (result.data && result.data.namespacesMembersAssignRoles) {
+ const currentMember = this.getById(payload.memberId)
+ const index = super.values().findIndex(m => m.id === payload.memberId)
+
+ const newMember = new DNamespaceMemberView({
+ ...currentMember?.json(),
+ roles: {
+ count: payload.roleIds.length,
+ nodes: payload.roleIds.map(roleId => ({ id: roleId }))
+ }
+ })
+
+ this.set(index, newMember)
+ }
+
+ return result.data?.namespacesMembersAssignRoles ?? undefined
}
- memberDelete(payload: NamespacesMembersDeleteInput): Promise {
- return Promise.resolve(undefined);
+ async memberDelete(payload: NamespacesMembersDeleteInput): Promise {
+ const result = await this.client.mutate({
+ mutation: memberDeleteMutation,
+ variables: {
+ ...payload
+ }
+ })
+
+ if (result.data && result.data.namespacesMembersDelete && result.data.namespacesMembersDelete.namespaceMember) {
+ const member = result.data.namespacesMembersDelete.namespaceMember
+ const index = this.values().findIndex(m => m.id === member.id)
+ this.delete(index)
+ }
+
+ return result.data?.namespacesMembersDelete ?? undefined
}
- memberInvite(payload: NamespacesMembersInviteInput): Promise {
- return Promise.resolve(undefined);
+ async memberInvite(payload: NamespacesMembersInviteInput): Promise {
+ const result = await this.client.mutate({
+ mutation: memberInviteMutation,
+ variables: {
+ ...payload
+ }
+ })
+
+ if (result.data && result.data.namespacesMembersInvite && result.data.namespacesMembersInvite.namespaceMember) {
+ const member = result.data.namespacesMembersInvite.namespaceMember
+ this.set(this.i++, new DNamespaceMemberView(member))
+ }
+
+ return result.data?.namespacesMembersInvite ?? undefined
}
}
\ No newline at end of file
diff --git a/src/packages/ce/src/member/fragments/Member.basic.fragment.graphql b/src/packages/ce/src/member/fragments/Member.basic.fragment.graphql
new file mode 100644
index 00000000..e5643d88
--- /dev/null
+++ b/src/packages/ce/src/member/fragments/Member.basic.fragment.graphql
@@ -0,0 +1,20 @@
+#import "../../user/fragments/User.id.fragment.graphql"
+#import "../../namespace/fragments/Namespace.id.fragment.graphql"
+fragment BasicMember on NamespaceMember {
+ id
+ roles {
+ count
+ }
+ user {
+ ...UserId
+ }
+ namespace {
+ ...NamespaceId
+ }
+ updatedAt
+ createdAt
+ userAbilities {
+ assignMemberRoles
+ deleteMember
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/member/mutations/Member.assignRoles.mutation.graphql b/src/packages/ce/src/member/mutations/Member.assignRoles.mutation.graphql
index e69de29b..ccd8f562 100644
--- a/src/packages/ce/src/member/mutations/Member.assignRoles.mutation.graphql
+++ b/src/packages/ce/src/member/mutations/Member.assignRoles.mutation.graphql
@@ -0,0 +1,15 @@
+mutation memberAssignRoles($memberId: NamespaceMemberID!, $roleIds: [NamespaceRoleID!]!) {
+ namespacesMembersAssignRoles(input: {
+ roleIds: $roleIds,
+ memberId: $memberId
+ }) {
+ errors {
+ ...on Error {
+ errorCode,
+ details {
+ __typename
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/member/mutations/Member.delete.mutation.graphql b/src/packages/ce/src/member/mutations/Member.delete.mutation.graphql
index e69de29b..d9ef49fd 100644
--- a/src/packages/ce/src/member/mutations/Member.delete.mutation.graphql
+++ b/src/packages/ce/src/member/mutations/Member.delete.mutation.graphql
@@ -0,0 +1,18 @@
+#import "../fragments/Member.basic.fragment.graphql"
+mutation deleteMember($namespaceMemberId: NamespaceMemberID!) {
+ namespacesMembersDelete(input: {
+ namespaceMemberId: $namespaceMemberId
+ }) {
+ errors {
+ ...on Error {
+ errorCode,
+ details {
+ __typename
+ }
+ }
+ }
+ namespaceMember {
+ ...BasicMember
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/member/mutations/Member.invite.mutation.graphql b/src/packages/ce/src/member/mutations/Member.invite.mutation.graphql
index e69de29b..fa928e3d 100644
--- a/src/packages/ce/src/member/mutations/Member.invite.mutation.graphql
+++ b/src/packages/ce/src/member/mutations/Member.invite.mutation.graphql
@@ -0,0 +1,19 @@
+#import "../fragments/Member.basic.fragment.graphql"
+mutation inviteMember($userId: UserID!, $namespaceId: NamespaceID!) {
+ namespacesMembersInvite(input: {
+ userId: $userId,
+ namespaceId: $namespaceId
+ }) {
+ errors {
+ ...on Error {
+ errorCode,
+ details {
+ __typename
+ }
+ }
+ }
+ namespaceMember {
+ ...BasicMember
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/namespace/fragments/Namespace.fragment.graphql b/src/packages/ce/src/namespace/fragments/Namespace.fragment.graphql
index 8a947d38..3e54c883 100644
--- a/src/packages/ce/src/namespace/fragments/Namespace.fragment.graphql
+++ b/src/packages/ce/src/namespace/fragments/Namespace.fragment.graphql
@@ -1,3 +1,5 @@
+#import "../../organization/fragments/Organization.id.fragment.graphql"
+#import "../../user/fragments/User.id.fragment.graphql"
fragment Namespace on Namespace {
__typename
id
@@ -23,6 +25,12 @@ fragment Namespace on Namespace {
}
parent {
__typename
+ ...on Organization {
+ ...OrganizationId
+ }
+ ...on User{
+ ...UserId
+ }
}
userAbilities {
createNamespaceLicense
diff --git a/src/packages/ce/src/organization/Organization.service.ts b/src/packages/ce/src/organization/Organization.service.ts
index d5d1a242..50063f9e 100644
--- a/src/packages/ce/src/organization/Organization.service.ts
+++ b/src/packages/ce/src/organization/Organization.service.ts
@@ -5,15 +5,21 @@ import {
OrganizationsCreateInput,
OrganizationsCreatePayload,
OrganizationsDeleteInput,
- OrganizationsDeletePayload, Query
+ OrganizationsDeletePayload,
+ OrganizationsUpdateInput,
+ OrganizationsUpdatePayload,
+ Query
} from "@code0-tech/sagittarius-graphql-types";
import {GraphqlClient} from "@core/util/graphql-client";
import createOrganizationMutation from "./mutations/Organization.create.mutation.graphql";
+import updateOrganizationMutation from "./mutations/Organization.update.mutation.graphql";
+import deleteOrganizationMutation from "./mutations/Organization.delete.mutation.graphql";
import organizationQuery from "./queries/Organization.query.graphql";
export class OrganizationService extends DOrganizationReactiveService {
private readonly client: GraphqlClient
+ private i = 0;
constructor(client: GraphqlClient, store: ReactiveArrayStore) {
super(store);
@@ -29,19 +35,14 @@ export class OrganizationService extends DOrganizationReactiveService {
if (!data) return
if (data.organizations && data.organizations.nodes) {
- data.organizations.nodes.forEach((organization, index) => {
- if (organization) this.set(index, new DOrganizationView(organization))
+ data.organizations.nodes.forEach((organization) => {
+ if (organization && !this.hasById(organization.id)) this.set(this.i++, new DOrganizationView(organization))
})
}
})
return super.values();
}
- deleteById(id: Organization["id"]): void {
- const index = this.values().findIndex(o => o.id === id)
- this.delete(index)
- }
-
hasById(id: Organization["id"]): boolean {
const organization = super.values().find(o => o.id === id)
return organization !== undefined
@@ -66,7 +67,39 @@ export class OrganizationService extends DOrganizationReactiveService {
}
async organizationDelete(payload: OrganizationsDeleteInput): Promise {
- return Promise.resolve(undefined)
+ const result = await this.client.mutate({
+ mutation: deleteOrganizationMutation,
+ variables: {
+ ...payload
+ }
+ })
+
+ if (result.data && result.data.organizationsDelete && result.data.organizationsDelete.organization) {
+ const organization = result.data.organizationsDelete.organization
+ const index = this.values().findIndex(o => o.id === organization.id)
+ this.delete(index)
+
+ }
+
+ return result.data?.organizationsDelete ?? undefined
+ }
+
+ async organizationUpdate(payload: OrganizationsUpdateInput): Promise {
+ const result = await this.client.mutate({
+ mutation: updateOrganizationMutation,
+ variables: {
+ ...payload
+ }
+ })
+
+ if (result.data && result.data.organizationsUpdate && result.data.organizationsUpdate.organization) {
+ const organization = result.data.organizationsUpdate.organization
+ const index = this.values().findIndex(o => o.id === organization.id)
+ this.set(index, new DOrganizationView(organization))
+
+ }
+
+ return result.data?.organizationsUpdate ?? undefined
}
}
\ No newline at end of file
diff --git a/src/packages/ce/src/organization/mutations/Organization.delete.mutation.graphql b/src/packages/ce/src/organization/mutations/Organization.delete.mutation.graphql
index 2b040e5c..390dd784 100644
--- a/src/packages/ce/src/organization/mutations/Organization.delete.mutation.graphql
+++ b/src/packages/ce/src/organization/mutations/Organization.delete.mutation.graphql
@@ -1,3 +1,5 @@
+#import '../fragments/Organization.fragment.graphql'
+
mutation deleteOrganization ($organizationId: OrganizationID!) {
organizationsDelete(input: {
organizationId: $organizationId
diff --git a/src/packages/ce/src/organization/mutations/Organization.update.mutation.graphql b/src/packages/ce/src/organization/mutations/Organization.update.mutation.graphql
new file mode 100644
index 00000000..f2ed1954
--- /dev/null
+++ b/src/packages/ce/src/organization/mutations/Organization.update.mutation.graphql
@@ -0,0 +1,20 @@
+#import '../fragments/Organization.fragment.graphql'
+
+mutation updateOrganization ($organizationId: OrganizationID!, $name: String!) {
+ organizationsUpdate(input: {
+ name: $name,
+ organizationId: $organizationId
+ }) {
+ errors {
+ ...on Error {
+ errorCode,
+ details {
+ __typename
+ }
+ }
+ }
+ organization {
+ ...Organization
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/project/Project.service.ts b/src/packages/ce/src/project/Project.service.ts
index 889ad6fc..ab94b329 100644
--- a/src/packages/ce/src/project/Project.service.ts
+++ b/src/packages/ce/src/project/Project.service.ts
@@ -30,26 +30,35 @@ export class ProjectService extends DNamespaceProjectReactiveService {
}
values(dependencies: DProjectDependencies): DNamespaceProjectView[] {
- if (super.values().length > 0) return super.values()
- this.client.query({
- query: projectsQuery,
- variables: {
- namespaceId: dependencies?.namespaceId,
- firstProject: 0,
- afterProject: null,
- },
- }).then(result => {
- const data = result.data
- if (!data) return
+ const projects = super.values()
+ if (!dependencies?.namespaceId) return projects
+
+ const namespaceId = dependencies.namespaceId
+ const filtered = projects.filter(p => p.namespace?.id === namespaceId)
- if (data.namespace && data.namespace.projects && data.namespace.projects.nodes) {
- data.namespace.projects.nodes.forEach((project) => {
- if (project) this.set(this.i++, new DNamespaceProjectView(project))
+ if (filtered.length === 0) {
+ this.client.query({
+ query: projectsQuery,
+ variables: {
+ namespaceId,
+ firstProject: 50,
+ afterProject: null,
+ },
+ }).then(res => {
+ const nodes = res.data?.namespace?.projects?.nodes ?? []
+ nodes.forEach(project => {
+ if (
+ project &&
+ project.namespace?.id === namespaceId &&
+ !this.hasById(project.id)
+ ) {
+ this.set(this.i++, new DNamespaceProjectView(project))
+ }
})
- }
- })
+ })
+ }
- return super.values(dependencies);
+ return filtered
}
hasById(id: NamespaceProject["id"]): boolean {
diff --git a/src/packages/ce/src/project/fragments/Project.id.fragment.graphql b/src/packages/ce/src/project/fragments/Project.id.fragment.graphql
new file mode 100644
index 00000000..7fc6e577
--- /dev/null
+++ b/src/packages/ce/src/project/fragments/Project.id.fragment.graphql
@@ -0,0 +1,4 @@
+fragment ProjectId on NamespaceProject {
+ __typename
+ id
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/role/Role.service.ts b/src/packages/ce/src/role/Role.service.ts
index e69de29b..46750ec5 100644
--- a/src/packages/ce/src/role/Role.service.ts
+++ b/src/packages/ce/src/role/Role.service.ts
@@ -0,0 +1,135 @@
+import {
+ DNamespaceRoleReactiveService,
+ DNamespaceRoleView,
+ DRoleDependencies,
+ ReactiveArrayStore
+} from "@code0-tech/pictor"
+import {
+ Mutation,
+ NamespaceRole,
+ NamespacesRolesAssignAbilitiesInput,
+ NamespacesRolesAssignAbilitiesPayload,
+ NamespacesRolesAssignProjectsInput,
+ NamespacesRolesAssignProjectsPayload,
+ NamespacesRolesCreateInput,
+ NamespacesRolesCreatePayload,
+ NamespacesRolesDeleteInput,
+ NamespacesRolesDeletePayload,
+ Query
+} from "@code0-tech/sagittarius-graphql-types"
+import {GraphqlClient} from "@core/util/graphql-client";
+import rolesQuery from "@edition/role/queries/Roles.query.graphql";
+import roleAssignAbilitiesMutation from "@edition/role/mutations/Role.assignAbilities.mutation.graphql";
+import roleAssignProjectsMutation from "@edition/role/mutations/Role.assignProjects.mutation.graphql";
+
+export class RoleService extends DNamespaceRoleReactiveService {
+
+ private readonly client: GraphqlClient
+ private i = 0;
+
+ constructor(client: GraphqlClient, store: ReactiveArrayStore) {
+ super(store);
+ this.client = client
+ }
+
+ values(dependencies: DRoleDependencies): DNamespaceRoleView[] {
+ const roles = super.values()
+ if (!dependencies?.namespaceId) return roles
+
+ const namespaceId = dependencies.namespaceId
+ const filtered = roles.filter(r => r.namespace?.id === namespaceId)
+
+ if (filtered.length === 0) {
+ this.client.query({
+ query: rolesQuery,
+ variables: {
+ namespaceId,
+ firstRole: 50,
+ afterRole: null,
+ firstProject: 50,
+ afterProject: null,
+ },
+ }).then(res => {
+ const nodes = res.data?.namespace?.roles?.nodes ?? []
+ nodes.forEach(role => {
+ if (
+ role &&
+ role.namespace?.id === namespaceId &&
+ !this.hasById(role.id)
+ ) {
+ this.set(this.i++, new DNamespaceRoleView(role))
+ }
+ })
+ })
+ }
+
+ return filtered
+ }
+
+ hasById(id: NamespaceRole["id"]): boolean {
+ const role = super.values().find(r => r.id === id)
+ return role !== undefined
+ }
+
+ async roleAssignAbilities(payload: NamespacesRolesAssignAbilitiesInput): Promise {
+ const result = await this.client.mutate({
+ mutation: roleAssignAbilitiesMutation,
+ variables: {
+ ...payload
+ }
+ })
+
+ //TODO: should be done by a new query
+ if (result.data && result.data.namespacesRolesAssignAbilities) {
+ const currentRole = this.getById(payload.roleId)
+ const index = super.values().findIndex(m => m.id === payload.roleId)
+
+ const newRole = new DNamespaceRoleView({
+ ...currentRole?.json(),
+ abilities: payload.abilities
+ })
+
+ this.set(index, newRole)
+ }
+
+ return result.data?.namespacesRolesAssignAbilities ?? undefined
+ }
+
+ async roleAssignProject(payload: NamespacesRolesAssignProjectsInput): Promise {
+ const result = await this.client.mutate({
+ mutation: roleAssignProjectsMutation,
+ variables: {
+ ...payload
+ }
+ })
+
+ //TODO: should be done by a new query
+ if (result.data && result.data.namespacesRolesAssignProjects) {
+ const currentRole = this.getById(payload.roleId)
+ const index = super.values().findIndex(m => m.id === payload.roleId)
+
+ const newRole = new DNamespaceRoleView({
+ ...currentRole?.json(),
+ assignedProjects: {
+ count: payload.projectIds.length,
+ nodes: payload.projectIds.map(id => ({
+ id: id,
+ })),
+ }
+ })
+
+ this.set(index, newRole)
+ }
+
+ return result.data?.namespacesRolesAssignProjects ?? undefined
+ }
+
+ roleCreate(payload: NamespacesRolesCreateInput): Promise {
+ throw new Error("Method not implemented.")
+ }
+
+ roleDelete(payload: NamespacesRolesDeleteInput): Promise {
+ throw new Error("Method not implemented.")
+ }
+
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/role/fragments/Role.basic.fragment.graphql b/src/packages/ce/src/role/fragments/Role.basic.fragment.graphql
new file mode 100644
index 00000000..eb91d664
--- /dev/null
+++ b/src/packages/ce/src/role/fragments/Role.basic.fragment.graphql
@@ -0,0 +1,22 @@
+#import "../../namespace/fragments/Namespace.id.fragment.graphql"
+fragment RoleBasic on NamespaceRole {
+ __typename
+ id
+ name
+ createdAt
+ updatedAt
+ namespace {
+ ...NamespaceId
+ }
+ assignedProjects {
+ count
+ }
+ abilities
+ userAbilities {
+ __typename
+ assignRoleAbilities
+ assignRoleProjects
+ deleteNamespaceRole
+ updateNamespaceRole
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/role/fragments/Role.fragment.graphql b/src/packages/ce/src/role/fragments/Role.fragment.graphql
new file mode 100644
index 00000000..150f9d3f
--- /dev/null
+++ b/src/packages/ce/src/role/fragments/Role.fragment.graphql
@@ -0,0 +1,31 @@
+#import "../../namespace/fragments/Namespace.id.fragment.graphql"
+#import "../../project/fragments/Project.id.fragment.graphql"
+fragment Role on NamespaceRole {
+ __typename
+ id
+ name
+ createdAt
+ updatedAt
+ namespace {
+ ...NamespaceId
+ }
+ assignedProjects (first: $firstProject, after: $afterProject) {
+ count
+ nodes {
+ ...ProjectId
+ }
+ pageInfo {
+ endCursor
+ hasNextPage
+ }
+
+ }
+ abilities
+ userAbilities {
+ __typename
+ assignRoleAbilities
+ assignRoleProjects
+ deleteNamespaceRole
+ updateNamespaceRole
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/role/fragments/Role.id.fragment.graphql b/src/packages/ce/src/role/fragments/Role.id.fragment.graphql
new file mode 100644
index 00000000..8cab8db7
--- /dev/null
+++ b/src/packages/ce/src/role/fragments/Role.id.fragment.graphql
@@ -0,0 +1,4 @@
+fragment RoleId on NamespaceRole {
+ __typename
+ id
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/role/mutations/Role.assignAbilities.mutation.graphql b/src/packages/ce/src/role/mutations/Role.assignAbilities.mutation.graphql
new file mode 100644
index 00000000..302e71f7
--- /dev/null
+++ b/src/packages/ce/src/role/mutations/Role.assignAbilities.mutation.graphql
@@ -0,0 +1,16 @@
+mutation roleAssignAbilities($roleId: NamespaceRoleID!, $abilities: [NamespaceRoleAbility!]!) {
+ namespacesRolesAssignAbilities(input: {
+ roleId: $roleId,
+ abilities: $abilities
+ }) {
+ errors {
+ ...on Error {
+ errorCode,
+ details {
+ __typename
+ }
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/role/mutations/Role.assignProjects.mutation.graphql b/src/packages/ce/src/role/mutations/Role.assignProjects.mutation.graphql
new file mode 100644
index 00000000..d3cf4b7d
--- /dev/null
+++ b/src/packages/ce/src/role/mutations/Role.assignProjects.mutation.graphql
@@ -0,0 +1,16 @@
+mutation roleAssignProjects($roleId: NamespaceRoleID!, $projectIds: [NamespaceProjectID!]!) {
+ namespacesRolesAssignProjects(input: {
+ roleId: $roleId,
+ projectIds: $projectIds
+ }) {
+ errors {
+ ...on Error {
+ errorCode,
+ details {
+ __typename
+ }
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/role/mutations/Role.create.mutation.graphql b/src/packages/ce/src/role/mutations/Role.create.mutation.graphql
new file mode 100644
index 00000000..df98c3fa
--- /dev/null
+++ b/src/packages/ce/src/role/mutations/Role.create.mutation.graphql
@@ -0,0 +1,18 @@
+mutation createRole($namespaceId: NamespaceID!, $name: String!) {
+ namespacesRolesCreate(input: {
+ namespaceId: $namespaceId,
+ name: $name,
+ }) {
+ errors {
+ ...on Error {
+ errorCode,
+ details {
+ __typename
+ }
+ }
+ }
+ namespaceRole {
+ ...RoleBasic
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/role/queries/Roles.query.graphql b/src/packages/ce/src/role/queries/Roles.query.graphql
new file mode 100644
index 00000000..9fe0cc77
--- /dev/null
+++ b/src/packages/ce/src/role/queries/Roles.query.graphql
@@ -0,0 +1,24 @@
+#import "../fragments/Role.fragment.graphql"
+query Roles (
+ $namespaceId: NamespaceID!,
+
+ $firstRole: Int!,
+ $afterRole: String,
+
+ $firstProject: Int!,
+ $afterProject: String
+
+) {
+ namespace(id: $namespaceId) {
+ roles (first: $firstRole, after: $afterRole) {
+ count
+ nodes {
+ ...Role
+ }
+ pageInfo {
+ endCursor
+ hasNextPage
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/runtime/Runtime.service.ts b/src/packages/ce/src/runtime/Runtime.service.ts
index 0b4b20d0..959e17f4 100644
--- a/src/packages/ce/src/runtime/Runtime.service.ts
+++ b/src/packages/ce/src/runtime/Runtime.service.ts
@@ -23,6 +23,7 @@ import rotateTokenRuntimeMutation from "./mutations/Runtime.rotateToken.mutation
export class RuntimeService extends DRuntimeReactiveService {
private readonly client: GraphqlClient
+ private i = 0
constructor(client: GraphqlClient, store: ReactiveArrayStore) {
super(store);
@@ -35,52 +36,55 @@ export class RuntimeService extends DRuntimeReactiveService {
}
values(dependencies?: DRuntimeDependencies): DRuntimeView[] {
- if (super.values().length > 0) return super.values();
-
- let i = 0;
-
- this.client.query({
- query: globalRuntimesQuery,
- variables: {
- firstRuntime: 50,
- afterRuntime: null,
- firstDataType: 0,
- afterDataType: null,
- firstFlowType: 0,
- afterFlowType: null,
- firstProject: 0,
- afterProject: null,
- },
- }).then(result => {
- const data = result.data
- if (!data) return
-
- if (data.globalRuntimes && data.globalRuntimes.nodes) {
- data.globalRuntimes.nodes.forEach((runtime) => {
- if (runtime) this.set(i++, new DRuntimeView(runtime))
+ const runtimes = super.values()
+
+ if (!dependencies?.namespaceId) {
+ if (runtimes.length === 0) {
+ this.client.query({
+ query: globalRuntimesQuery,
+ variables: {
+ firstRuntime: 50,
+ afterRuntime: null
+ },
+ }).then(res => {
+ const nodes = res.data?.globalRuntimes?.nodes ?? []
+ nodes.forEach(runtime => {
+ if (runtime && !this.hasById(runtime.id)) {
+ this.set(this.i++, new DRuntimeView(runtime))
+ }
+ })
})
}
- })
- if (dependencies?.namespaceId) {
+ return runtimes
+ }
+
+ const namespaceId = dependencies.namespaceId
+ const filtered = runtimes.filter(r => r.namespace?.id === namespaceId)
+
+ if (filtered.length === 0) {
this.client.query({
query: namespaceRuntimesQuery,
variables: {
- namespaceId: dependencies.namespaceId
- }
- }).then(result => {
- const data = result.data
- if (!data) return
-
- if (data.namespace && data.namespace.runtimes && data.namespace.runtimes.nodes) {
- data.namespace.runtimes.nodes.forEach((runtime) => {
- if (runtime) this.set(i++, new DRuntimeView(runtime))
- })
- }
+ namespaceId,
+ firstRuntime: 50,
+ afterRuntime: null
+ },
+ }).then(res => {
+ const nodes = res.data?.namespace?.runtimes?.nodes ?? []
+ nodes.forEach(runtime => {
+ if (
+ runtime &&
+ runtime.namespace?.id === namespaceId &&
+ !this.hasById(runtime.id)
+ ) {
+ this.set(this.i++, new DRuntimeView(runtime))
+ }
+ })
})
}
- return super.values();
+ return filtered
}
async runtimeCreate(payload: RuntimesCreateInput): Promise {
diff --git a/src/packages/ce/src/user/User.service.ts b/src/packages/ce/src/user/User.service.ts
index 23ebe6b7..51daf1d6 100644
--- a/src/packages/ce/src/user/User.service.ts
+++ b/src/packages/ce/src/user/User.service.ts
@@ -37,11 +37,14 @@ import registerMutation from "./mutations/User.register.mutation.graphql";
import emailVerificationMutation from "./mutations/User.emailVerification.mutation.graphql";
import passwordResetMutation from "./mutations/User.passwordReset.mutation.graphql"
import passwordResetRequestMutation from "./mutations/User.passwordResetRequest.mutation.graphql"
-import userQuery from "./queries/User.query.graphql";
+import usersQuery from "./queries/Users.query.graphql";
+import userByUsernameQuery from "./queries/User.byUsername.query.graphql";
+import userByIdQuery from "./queries/User.byId.query.graphql";
export class UserService extends DUserReactiveService {
private readonly client: GraphqlClient
+ private i = 0;
constructor(client: GraphqlClient, store: ReactiveArrayStore) {
super(store);
@@ -51,22 +54,60 @@ export class UserService extends DUserReactiveService {
values(): DUserView[] {
if (super.values().length > 0) return super.values();
this.client.query({
- query: userQuery
+ query: usersQuery
}).then(result => {
- let i = 0;
const data = result.data
if (!data) return
- if (data && data.currentUser) this.set(i++, new DUserView(data.currentUser))
+ if (data && data.currentUser && !this.hasById(data.currentUser.id)) this.set(this.i++, new DUserView(data.currentUser))
if (data.users && data.users.nodes) {
data.users.nodes.forEach((user) => {
- if (user && !(user.id === data.currentUser?.id)) this.set(i++, new DUserView(user))
+ if (user && !(user.id === data.currentUser?.id) && !this.hasById(user.id)) this.set(this.i++, new DUserView(user))
})
}
})
return super.values();
}
+ getById(id: User["id"]): DUserView | undefined {
+ const user = super.getById(id)
+ if (user) return user
+
+ if (id) {
+ this.client.query({
+ query: userByIdQuery,
+ variables: {
+ id: id
+ }
+ }).then(result => {
+ const data = result.data
+ if (!data) return
+
+ if (data && data.user && !this.hasById(data.user.id)) this.set(this.i++, new DUserView(data.user))
+ })
+ }
+
+ return super.getById(id)
+ }
+
+ getByUsername(username: User["username"]): DUserView | undefined {
+ if (super.getByUsername(username)) return super.getByUsername(username)
+
+ this.client.query({
+ query: userByUsernameQuery,
+ variables: {
+ username: username ?? ""
+ }
+ }).then(result => {
+ const data = result.data
+ if (!data) return
+
+ if (data && data.user && !this.hasById(data.user.id)) this.set(this.i++, new DUserView(data.user))
+ })
+
+ return super.getByUsername(username)
+ }
+
deleteById(id: User["id"]): void {
const index = this.values().findIndex(user => user.id === id)
this.delete(index)
diff --git a/src/packages/ce/src/user/queries/User.byId.query.graphql b/src/packages/ce/src/user/queries/User.byId.query.graphql
new file mode 100644
index 00000000..ba9d12fd
--- /dev/null
+++ b/src/packages/ce/src/user/queries/User.byId.query.graphql
@@ -0,0 +1,6 @@
+#import '../fragments/User.basic.fragment.graphql'
+query User ($id: UserID!) {
+ user (id: $id) {
+ ...UserBasic
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/user/queries/User.byUsername.query.graphql b/src/packages/ce/src/user/queries/User.byUsername.query.graphql
new file mode 100644
index 00000000..9e232098
--- /dev/null
+++ b/src/packages/ce/src/user/queries/User.byUsername.query.graphql
@@ -0,0 +1,6 @@
+#import '../fragments/User.basic.fragment.graphql'
+query User ($username: String!) {
+ user (username: $username) {
+ ...UserBasic
+ }
+}
\ No newline at end of file
diff --git a/src/packages/ce/src/user/queries/User.query.graphql b/src/packages/ce/src/user/queries/Users.query.graphql
similarity index 70%
rename from src/packages/ce/src/user/queries/User.query.graphql
rename to src/packages/ce/src/user/queries/Users.query.graphql
index f4e0d61a..6cac0624 100644
--- a/src/packages/ce/src/user/queries/User.query.graphql
+++ b/src/packages/ce/src/user/queries/Users.query.graphql
@@ -1,7 +1,7 @@
#import '../fragments/User.fragment.graphql'
#import '../fragments/User.basic.fragment.graphql'
-query User($firstUser: Int, $afterUser: String, $firstIdentity: Int, $afterIdentity: String, $firstSession: Int, $afterSession: String) {
+query Users($firstUser: Int, $afterUser: String, $firstIdentity: Int, $afterIdentity: String, $firstSession: Int, $afterSession: String) {
currentUser {
...User
}