[Feature] Allow admins to create an Organization.

prisma/migrations/20231118160452_organization/migration.sql

@@ -0,0 +1,111 @@
+-- AlterTable
+ALTER TABLE "network" ADD COLUMN     "organizationId" TEXT;
+
+-- CreateTable
+CREATE TABLE "Organization" (
+    "id" TEXT NOT NULL,
+    "ownerId" TEXT NOT NULL,
+    "orgName" TEXT NOT NULL,
+    "description" TEXT,
+    "isActive" BOOLEAN NOT NULL DEFAULT true,
+
+    CONSTRAINT "Organization_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "UserOrganizationRole" (
+    "userId" TEXT NOT NULL,
+    "organizationId" TEXT NOT NULL,
+    "role" "Role" NOT NULL,
+
+    CONSTRAINT "UserOrganizationRole_pkey" PRIMARY KEY ("userId","organizationId")
+);
+
+-- CreateTable
+CREATE TABLE "NetworkAccess" (
+    "userId" TEXT NOT NULL,
+    "networkId" TEXT NOT NULL,
+    "organizationId" TEXT NOT NULL,
+
+    CONSTRAINT "NetworkAccess_pkey" PRIMARY KEY ("userId","networkId","organizationId")
+);
+
+-- CreateTable
+CREATE TABLE "OrganizationSettings" (
+    "id" SERIAL NOT NULL,
+    "organizationId" TEXT NOT NULL,
+
+    CONSTRAINT "OrganizationSettings_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "OrganizationInvitation" (
+    "id" SERIAL NOT NULL,
+    "token" TEXT NOT NULL,
+    "organizationId" TEXT NOT NULL,
+
+    CONSTRAINT "OrganizationInvitation_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "MembershipRequest" (
+    "id" SERIAL NOT NULL,
+    "userId" TEXT NOT NULL,
+    "organizationId" TEXT NOT NULL,
+
+    CONSTRAINT "MembershipRequest_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "_MemberRelation" (
+    "A" TEXT NOT NULL,
+    "B" TEXT NOT NULL
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "OrganizationSettings_organizationId_key" ON "OrganizationSettings"("organizationId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "OrganizationInvitation_token_key" ON "OrganizationInvitation"("token");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_MemberRelation_AB_unique" ON "_MemberRelation"("A", "B");
+
+-- CreateIndex
+CREATE INDEX "_MemberRelation_B_index" ON "_MemberRelation"("B");
+
+-- AddForeignKey
+ALTER TABLE "network" ADD CONSTRAINT "network_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "UserOrganizationRole" ADD CONSTRAINT "UserOrganizationRole_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "UserOrganizationRole" ADD CONSTRAINT "UserOrganizationRole_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "NetworkAccess" ADD CONSTRAINT "NetworkAccess_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "NetworkAccess" ADD CONSTRAINT "NetworkAccess_networkId_fkey" FOREIGN KEY ("networkId") REFERENCES "network"("nwid") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "NetworkAccess" ADD CONSTRAINT "NetworkAccess_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "OrganizationSettings" ADD CONSTRAINT "OrganizationSettings_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "OrganizationInvitation" ADD CONSTRAINT "OrganizationInvitation_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "MembershipRequest" ADD CONSTRAINT "MembershipRequest_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "MembershipRequest" ADD CONSTRAINT "MembershipRequest_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "_MemberRelation" ADD CONSTRAINT "_MemberRelation_A_fkey" FOREIGN KEY ("A") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "_MemberRelation" ADD CONSTRAINT "_MemberRelation_B_fkey" FOREIGN KEY ("B") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/schema.prisma

@@ -12,6 +12,12 @@ datasource db {
   shadowDatabaseUrl = env("MIGRATE_DATABASE_URL")
 }
 
+enum Role {
+  USER
+  MODERATOR
+  ADMIN
+}
+
 model GlobalOptions {
   id                    Int                               @id @default(autoincrement())
 
@@ -52,11 +58,6 @@ model GlobalOptions {
   welcomeMessageBody                    String?
 }
 
-enum Role {
-  USER
-  MODERATOR
-  ADMIN
-}
 
 model network_members {
   nodeid               Int       @id @default(autoincrement())
@@ -86,8 +87,9 @@ model network {
   tagsByName                  Json?
   capabilitiesByName          Json?
 
-  organizationId  Int?
-  organization    Organization? @relation(fields: [organizationId], references: [id], onDelete: SetNull)
+  organizationId              String?
+  organization                Organization? @relation(fields: [organizationId], references: [id], onDelete: SetNull)
+  networkAccesses             NetworkAccess[]
 
   networkMembers              network_members[]
   notations                   Notation[]
@@ -191,48 +193,42 @@ model APIToken {
 }
 
 model User {
-    id                                    String            @id @default(cuid())
+    id                                    String                  @id @default(cuid())
     name                                  String
-    email                                 String            @unique
+    email                                 String                  @unique
     emailVerified                         DateTime?
     lastLogin                             DateTime
     lastseen                              DateTime?
-    expirationDate                        String            @default("")
-    online                                Boolean?          @default(false)
-    role                                  Role              @default(USER)
+    expirationDate                        String                  @default("")
+    online                                Boolean?                @default(false)
+    role                                  Role                    @default(USER)
     image                                 String?
     hash                                  String
     licenseStatus                         String?
     orderStatus                           String?
-    orderId                               Int               @default(0)
-    product_id                            Int?              @default(0)
-    licenseKey                            String?           @default("")
+    orderId                               Int                     @default(0)
+    product_id                            Int?                    @default(0)
+    licenseKey                            String?                 @default("")
     tempPassword                          String?
-    firstTime                             Boolean           @default(true)
+    firstTime                             Boolean                 @default(true)
     userGroupId                           Int?
 
-    adminOrgs       Organization[] @relation("AdminRelation")
-    organizations   Organization[] @relation("MemberRelation")
+    memberOfOrgs                          Organization[]          @relation("MemberRelation") // user can be member of multiple organizations
+    organizationRoles                     UserOrganizationRole[]
+    membershipRequests                    MembershipRequest[]     @relation("MembershipRequestsForUser")
+    networkAccesses                       NetworkAccess[] 
     expiresAt                             DateTime? // null means it never expires
-    isActive                              Boolean           @default(true)
-
-    userGroup       UserGroup? @relation(fields: [userGroupId], references: [id], onDelete: Restrict)
-    options         UserOptions?
-    accounts        Account[]
-    sessions        Session[]
-    network         network[]
-    apiTokens       APIToken[]
+    isActive                              Boolean                 @default(true)
+
+    userGroup                             UserGroup? @relation(fields: [userGroupId], references: [id], onDelete: Restrict)
+    options                               UserOptions?
+    accounts                              Account[]
+    sessions                              Session[]
+    network                               network[]
+    apiTokens                             APIToken[]
 }
 
-model Organization {
-  id             Int          @id @default(autoincrement())
-  name           String
-  description    String?
-  adminId        String
-  admin          User         @relation("AdminRelation", fields: [adminId], references: [id])
-  members        User[]       @relation("MemberRelation")
-  networks       network[]
-}
+
 
 model VerificationToken {
     identifier String
@@ -257,6 +253,69 @@ model UserInvitation {
 }
 
 
+//
+// ORGANIZATION
+//
+
+model Organization {
+  id                        String                      @id @default(cuid())
+  ownerId                   String
+  orgName                   String 
+  description               String?
+  users                     User[]                      @relation("MemberRelation")
+  networks                  network[]
+  settings                  OrganizationSettings?       
+  invitations               OrganizationInvitation[]    
+  membershipRequests        MembershipRequest[] @relation("MembershipRequestsForOrganization")     
+  isActive                  Boolean                     @default(true) 
+  userRoles                 UserOrganizationRole[]
+  networkAccesses           NetworkAccess[]
+}
+
+model UserOrganizationRole {
+  userId         String
+  organizationId String
+  role           Role
+  user           User             @relation(fields: [userId], references: [id])
+  organization   Organization     @relation(fields: [organizationId], references: [id])
+
+  @@id([userId, organizationId])
+}
+
+model NetworkAccess {
+  userId         String
+  networkId      String
+  organizationId String
+  user           User             @relation(fields: [userId], references: [id])
+  network        network          @relation(fields: [networkId], references: [nwid])
+  organization   Organization     @relation(fields: [organizationId], references: [id])
+
+  @@id([userId, networkId, organizationId])
+}
+
+model OrganizationSettings {
+  id                Int                         @id @default(autoincrement())
+  organizationId    String                      @unique
+  organization      Organization                @relation(fields: [organizationId], references: [id])
+  // Add specific settings fields here
+}
+
+model OrganizationInvitation {
+  id                Int                         @id @default(autoincrement())
+  token             String                      @unique
+  organizationId    String
+  organization      Organization                @relation(fields: [organizationId], references: [id])
+}
+
+model MembershipRequest {
+  id             Int                            @id @default(autoincrement())
+  userId         String
+  organizationId String
+  user           User                           @relation(fields: [userId], references: [id], name: "MembershipRequestsForUser")
+  organization   Organization                   @relation(fields: [organizationId], references: [id], name: "MembershipRequestsForOrganization")
+}
+
+
 // To map your data model to the database schema, you need to use the prisma migrate CLI commands:
 // npx prisma migrate dev --name (NAME)
 

src/components/layouts/sidebar.tsx

@@ -52,7 +52,6 @@ const Sidebar = (): JSX.Element => {
 			document.removeEventListener("mousedown", handleClickOutside);
 		};
 	}, [isBelowMd, open, setOpenState, sidebarRef]);
-
 	return (
 		<aside
 			ref={sidebarRef}
@@ -121,6 +120,45 @@ const Sidebar = (): JSX.Element => {
 							<span className="ml-3">{t("networks")}</span>
 						</Link>
 					</li>
+					{me?.memberOfOrgs?.length > 0 ? (
+						<>
+							<li className="my-px">
+								<span className="my-4 flex px-4 text-sm font-medium uppercase text-primary">
+									Organiszation
+								</span>
+							</li>
+							{me?.memberOfOrgs.map((org) => (
+								<li key={org.orgName} className="my-px">
+									<Link
+										href={`/organization/${org.orgName}`}
+										className={`flex h-10 flex-row items-center rounded-lg px-3 
+								${
+									router.pathname.includes("/network")
+										? "bg-gray-100 text-gray-700"
+										: "hover:bg-slate-700"
+								}`}
+									>
+										<span className="flex items-center justify-center text-lg text-gray-400">
+											{/* https://heroicons.com/  */}
+											<svg
+												fill="none"
+												strokeLinecap="round"
+												strokeLinejoin="round"
+												strokeWidth="2"
+												viewBox="0 0 24 24"
+												stroke="currentColor"
+												className="h-6 w-6"
+											>
+												<path d="M5 8h14M5 8a2 2 0 110-4h14a2 2 0 110 4M5 8v10a2 2 0 002 2h10a2 2 0 002-2V8m-9 4h4" />
+											</svg>
+										</span>
+										<span className="ml-3">{org.orgName}</span>
+									</Link>
+								</li>
+							))}
+						</>
+					) : null}
+
 					{me?.options?.ztCentralApiKey ? (
 						<li className="my-px">
 							<Link

src/components/networkByIdPage/organization/addOrgForm.tsx

@@ -28,7 +28,7 @@ const AddOrgForm = () => {
 			refetch();
 		},
 	});
-
+	// console.log(userOrgs);
 	return (
 		<div className="space-y-10">
 			<div className="pb-5">