Merge pull request #232 from code0-tech/feat/#197

Module configuration page within project page

Author: nicosammito

.env.local

@@ -4,7 +4,7 @@ NEXT_PUBLIC_EDITION=ce
 SAGITTARIUS_GRAPHQL_URL=http://localhost:80/graphql
 
 NEXT_PUBLIC_SCULPTOR_VERSION=0.0.0
-NEXT_PUBLIC_PICTOR_VERSION=0.9.0
+NEXT_PUBLIC_PICTOR_VERSION=0.9.1
 NEXT_PUBLIC_ALLOWED_REDIRECT_DOMAINS=*.code0.tech,*.codezero.build
 
 NEXT_PUBLIC_OTEL_SERVICE_NAME=#"sculptor-client"

package-lock.json

@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@apollo/client": "^4.0.9",
-    "@code0-tech/pictor": "^0.9.0",
-    "@code0-tech/triangulum": "^0.18.0",
+    "@code0-tech/pictor": "^0.9.1",
+    "@code0-tech/triangulum": "^0.19.0",
     "@codemirror/lang-javascript": "^6.2.5",
     "@codemirror/lint": "^6.9.5",
     "@opentelemetry/api": "^1.9.1",

package.json

@@ -18,10 +18,9 @@ import {Application, ApplicationService} from "@edition/application/services/App
 import {useUserSession} from "@edition/user/hooks/User.session.hook";
 import {OrganizationView} from "@edition/organization/services/Organization.view";
 import {MemberView} from "@edition/member/services/Member.view";
-import {ProjectView} from "@edition/project/services/Project.view";
 import {RoleView} from "@edition/role/services/Role.view";
 import {Layout} from "@code0-tech/pictor/dist/components/layout/Layout";
-import {Namespace, Runtime, User} from "@code0-tech/sagittarius-graphql-types";
+import {Namespace, NamespaceProject, Runtime, User} from "@code0-tech/sagittarius-graphql-types";
 import {ApplicationMiddlewareComponent} from "@edition/application/components/ApplicationMiddlewareComponent";
 
 interface ApplicationLayoutProps {
@@ -43,7 +42,7 @@ const ApplicationLayout: React.FC<ApplicationLayoutProps> = ({children, bar, tab
     const member = usePersistentReactiveArrayService<MemberView, MemberService>(`dashboard::members::${currentSession?.id}`, (store) => new MemberService(graphqlClient, store))
     const namespace = usePersistentReactiveArrayService<Namespace, NamespaceService>(`dashboard::namespaces::${currentSession?.id}`, (store) => new NamespaceService(graphqlClient, store))
     const runtime = usePersistentReactiveArrayService<Runtime, RuntimeService>(`dashboard::global_runtimes::${currentSession?.id}`, (store) => new RuntimeService(graphqlClient, store))
-    const project = usePersistentReactiveArrayService<ProjectView, ProjectService>(`dashboard::projects::${currentSession?.id}`, (store) => new ProjectService(graphqlClient, store))
+    const project = usePersistentReactiveArrayService<NamespaceProject, ProjectService>(`dashboard::projects::${currentSession?.id}`, (store) => new ProjectService(graphqlClient, store))
     const role = usePersistentReactiveArrayService<RoleView, RoleService>(`dashboard::roles::${currentSession?.id}`, (store) => new RoleService(graphqlClient, store))
     const application = usePersistentReactiveArrayService<Application, ApplicationService>(`dashboard::application::${currentSession?.id}`, (store) => new ApplicationService(graphqlClient, store))
 

src/app/(dashboard)/layout.tsx

@@ -0,0 +1,5 @@
+"use client"
+
+import {ProjectTabView} from "@ce-internal/project/views/ProjectTabView";
+
+export default ProjectTabView

src/app/(flow)/@tab/namespace/[namespaceId]/project/[projectId]/module/[moduleId]/page.tsx

@@ -0,0 +1,5 @@
+"use client"
+
+import {ProjectTabView} from "@ce-internal/project/views/ProjectTabView";
+
+export default ProjectTabView

src/app/(flow)/@tab/namespace/[namespaceId]/project/[projectId]/module/page.tsx

@@ -29,7 +29,6 @@ import {FlowTypeService} from "@edition/flowtype/services/FlowType.service";
 import Image from "next/image";
 import {OrganizationView} from "@edition/organization/services/Organization.view";
 import {MemberView} from "@edition/member/services/Member.view";
-import {ProjectView} from "@edition/project/services/Project.view";
 import {RoleView} from "@edition/role/services/Role.view";
 import {useUserSession} from "@edition/user/hooks/User.session.hook";
 import {Layout} from "@code0-tech/pictor/dist/components/layout/Layout";
@@ -61,7 +60,7 @@ export default function FlowLayout({bar, tab, children}: {
     const member = usePersistentReactiveArrayService<MemberView, MemberService>(`dashboard::members::${currentSession?.id}`, (store) => new MemberService(graphqlClient, store))
     const namespace = usePersistentReactiveArrayService<Namespace, NamespaceService>(`dashboard::namespaces::${currentSession?.id}`, (store) => new NamespaceService(graphqlClient, store))
     const runtime = usePersistentReactiveArrayService<Runtime, RuntimeService>(`dashboard::global_runtimes::${currentSession?.id}`, (store) => new RuntimeService(graphqlClient, store))
-    const project = usePersistentReactiveArrayService<ProjectView, ProjectService>(`dashboard::projects::${currentSession?.id}`, (store) => new ProjectService(graphqlClient, store))
+    const project = usePersistentReactiveArrayService<NamespaceProject, ProjectService>(`dashboard::projects::${currentSession?.id}`, (store) => new ProjectService(graphqlClient, store))
     const role = usePersistentReactiveArrayService<RoleView, RoleService>(`dashboard::roles::${currentSession?.id}`, (store) => new RoleService(graphqlClient, store))
     const flow = usePersistentReactiveArrayService<Flow, FlowService>(`dashboard::flows::${currentSession?.id}`, (store) => new FlowService(graphqlClient, store))
     const functions = usePersistentReactiveArrayService<FunctionDefinition, FunctionService>(`dashboard::functions::${currentSession?.id}`, (store) => new FunctionService(graphqlClient, store))

src/app/(flow)/layout.tsx

@@ -0,0 +1,20 @@
+"use client"
+
+import React from "react";
+import {Col, Flex} from "@code0-tech/pictor";
+
+export default function AuthLayout({children}: Readonly<{ children: React.ReactNode }>) {
+    return <div style={{
+        background: "#070514",
+        height: "100%",
+        padding: "1rem",
+        borderTopLeftRadius: "1rem",
+        borderTopRightRadius: "1rem"
+    }}>
+        <Flex h={"100%"} w={"100%"} align={"center"} justify={"center"}>
+            <Col xs={4} style={{marginTop: "auto", marginBottom: "auto"}}>
+                {children}
+            </Col>
+        </Flex>
+    </div>
+}

src/app/(flow)/namespace/[namespaceId]/project/[projectId]/module/[moduleId]/layout.tsx

@@ -0,0 +1,3 @@
+import {ModuleConfigurationPage} from "@ce-internal/module/pages/ModuleConfigurationPage";
+
+export default ModuleConfigurationPage

src/app/(flow)/namespace/[namespaceId]/project/[projectId]/module/[moduleId]/page.tsx

@@ -0,0 +1,3 @@
+import {ModulesPage} from "@ce-internal/module/pages/ModulesPage";
+
+export default ModulesPage