1.5.0

prisma-cms · Apr 11, 2020 · 4910114 · 4910114
1 parent 278b3e9
commit 4910114
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 92 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+1.5.0
+===============================
+- Update schema
+- Fix create uri
+
 1.4.0
 ===============================
 - Update schema

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@prisma-cms/resource-module",
   "description": "Resource module for prisma-cms",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "main": "src/",
   "files": [
     "src"

diff --git a/src/modules/index.mjs b/src/modules/index.mjs
@@ -161,6 +161,7 @@ export class ResourceProcessor extends PrismaProcessor {
         data,
       });
 
+      // console.log('ResourceProcessor data', JSON.stringify(data, true, 2));
     }
 
     return super.mutate(method, args);
@@ -331,7 +332,6 @@ export class ResourceProcessor extends PrismaProcessor {
 
       if (!pathname.startsWith("/")) {
         pathname = `/${pathname}`;
-        uri.pathname(pathname);
       }
 
 
@@ -341,10 +341,16 @@ export class ResourceProcessor extends PrismaProcessor {
         if (!suffix) {
           this.addSuffix(uri);
         }
-
       }
+      else {
+
+        if (!pathname.endsWith("/")) {
+          pathname = `${pathname}/`;
+        }
 
+      }
 
+      uri.pathname(pathname);
 
       // Проверяем на уникальность
       const exists = await db.exists.Resource({
@@ -482,18 +488,18 @@ class Module extends PrismaModule {
     }
 
     let apiSchema = super.getApiSchema(types.concat(baseSchema), [
-      "ResourceCreateInput",
-      "ResourceUpdateInput",
-      "UserCreateOneWithoutResourcesInput",
-      "ResourceCreateOneWithoutChildsInput",
-      "ResourceCreateManyWithoutParentInput",
-      "UserUpdateOneWithoutResourcesInput",
-      "ResourceUpdateOneWithoutChildsInput",
-      "ResourceUpdateManyWithoutParentInput",
-      "ResourceUpdateManyWithoutCreatedByInput",
-      "ResourceCreateManyWithoutCreatedByInput",
-      "FileCreateOneWithoutImageResourceInput",
-      "FileUpdateOneWithoutImageResourceInput",
+      // "ResourceCreateInput",
+      // "ResourceUpdateInput",
+      // "UserCreateOneWithoutResourcesInput",
+      // "ResourceCreateOneWithoutChildsInput",
+      // "ResourceCreateManyWithoutParentInput",
+      // "UserUpdateOneWithoutResourcesInput",
+      // "ResourceUpdateOneWithoutChildsInput",
+      // "ResourceUpdateManyWithoutParentInput",
+      // "ResourceUpdateManyWithoutCreatedByInput",
+      // "ResourceCreateManyWithoutCreatedByInput",
+      // "FileCreateOneWithoutImageResourceInput",
+      // "FileUpdateOneWithoutImageResourceInput",
     ]);
 
     let schema = fileLoader(__dirname + '/schema/api/', {

diff --git a/src/modules/schema/api/resource.graphql b/src/modules/schema/api/resource.graphql
@@ -1,93 +1,93 @@
 
-input ResourceCreateInput {
-  type: ResourceType
-  code: ID
-  name: String
-  longtitle: String
-  content: Json
-  contentText: String
-  published: Boolean
-  deleted: Boolean
-  hidemenu: Boolean
-  searchable: Boolean
-  uri: String
-  isfolder: Boolean
-  # CreatedBy: UserCreateOneWithoutResourcesInput!
-  Parent: ResourceCreateOneWithoutChildsInput
-  Childs: ResourceCreateManyWithoutParentInput
-  Image: FileCreateOneWithoutImageResourceInput
-}
+# input ResourceCreateInput {
+#   type: ResourceType
+#   code: ID
+#   name: String
+#   longtitle: String
+#   content: Json
+#   contentText: String
+#   published: Boolean
+#   deleted: Boolean
+#   hidemenu: Boolean
+#   searchable: Boolean
+#   uri: String
+#   isfolder: Boolean
+#   # CreatedBy: UserCreateOneWithoutResourcesInput!
+#   Parent: ResourceCreateOneWithoutChildsInput
+#   Childs: ResourceCreateManyWithoutParentInput
+#   Image: FileCreateOneWithoutImageResourceInput
+# }
 
 
-input ResourceUpdateInput {
-  type: ResourceType
-  code: ID
-  name: String
-  longtitle: String
-  content: Json
-  contentText: String
-  published: Boolean
-  deleted: Boolean
-  hidemenu: Boolean
-  searchable: Boolean
-  uri: String
-  isfolder: Boolean
-  # CreatedBy: UserUpdateOneWithoutResourcesInput
-  Parent: ResourceUpdateOneWithoutChildsInput
-  Childs: ResourceUpdateManyWithoutParentInput
-  Image: FileUpdateOneWithoutImageResourceInput
-}
+# input ResourceUpdateInput {
+#   type: ResourceType
+#   code: ID
+#   name: String
+#   longtitle: String
+#   content: Json
+#   contentText: String
+#   published: Boolean
+#   deleted: Boolean
+#   hidemenu: Boolean
+#   searchable: Boolean
+#   uri: String
+#   isfolder: Boolean
+#   # CreatedBy: UserUpdateOneWithoutResourcesInput
+#   Parent: ResourceUpdateOneWithoutChildsInput
+#   Childs: ResourceUpdateManyWithoutParentInput
+#   Image: FileUpdateOneWithoutImageResourceInput
+# }
 
 
-input UserCreateOneWithoutResourcesInput {
-  connect: UserWhereUniqueInput
-}
+# input UserCreateOneWithoutResourcesInput {
+#   connect: UserWhereUniqueInput
+# }
 
-input ResourceCreateOneWithoutChildsInput {
-  connect: ResourceWhereUniqueInput
-}
+# input ResourceCreateOneWithoutChildsInput {
+#   connect: ResourceWhereUniqueInput
+# }
 
-input ResourceCreateManyWithoutParentInput {
-  connect: [ResourceWhereUniqueInput!]
-}
+# input ResourceCreateManyWithoutParentInput {
+#   connect: [ResourceWhereUniqueInput!]
+# }
 
-input UserUpdateOneWithoutResourcesInput {
-  connect: UserWhereUniqueInput
-  disconnect: Boolean
-}
+# input UserUpdateOneWithoutResourcesInput {
+#   connect: UserWhereUniqueInput
+#   disconnect: Boolean
+# }
 
-input ResourceUpdateOneWithoutChildsInput {
-  connect: ResourceWhereUniqueInput
-  disconnect: Boolean
-}
+# input ResourceUpdateOneWithoutChildsInput {
+#   connect: ResourceWhereUniqueInput
+#   disconnect: Boolean
+# }
 
-input ResourceUpdateManyWithoutParentInput {
-  connect: [ResourceWhereUniqueInput!]
-  disconnect: [ResourceWhereUniqueInput!]
-}
+# input ResourceUpdateManyWithoutParentInput {
+#   connect: [ResourceWhereUniqueInput!]
+#   disconnect: [ResourceWhereUniqueInput!]
+# }
 
-input ResourceUpdateManyWithoutCreatedByInput {
-  connect: [ResourceWhereUniqueInput!]
-  disconnect: [ResourceWhereUniqueInput!]
-}
+# input ResourceUpdateManyWithoutCreatedByInput {
+#   connect: [ResourceWhereUniqueInput!]
+#   disconnect: [ResourceWhereUniqueInput!]
+# }
 
-input ResourceCreateManyWithoutCreatedByInput {
-  connect: [ResourceWhereUniqueInput!]
-}
+# input ResourceCreateManyWithoutCreatedByInput {
+#   connect: [ResourceWhereUniqueInput!]
+# }
 
-input FileCreateOneWithoutImageResourceInput {
-  # create: FileCreateWithoutImageResourceInput
-  connect: FileWhereUniqueInput
-}
+# input FileCreateOneWithoutImageResourceInput {
+#   # create: FileCreateWithoutImageResourceInput
+#   connect: FileWhereUniqueInput
+# }
 
-input FileUpdateOneWithoutImageResourceInput {
-  # create: FileCreateWithoutImageResourceInput
-  connect: FileWhereUniqueInput
-  disconnect: Boolean
-  # delete: Boolean
-  # update: FileUpdateWithoutImageResourceDataInput
-  # upsert: FileUpsertWithoutImageResourceInput
-}
+# input FileUpdateOneWithoutImageResourceInput {
+#   # create: FileCreateWithoutImageResourceInput
+#   connect: FileWhereUniqueInput
+#   disconnect: Boolean
+#   # delete: Boolean
+#   # update: FileUpdateWithoutImageResourceDataInput
+#   # upsert: FileUpsertWithoutImageResourceInput
+# }
 
 type ResourceResponse {
   success: Boolean!

diff --git a/src/modules/schema/database/resource.graphql b/src/modules/schema/database/resource.graphql
@@ -25,7 +25,7 @@ type Resource {
   uri: String @unique
   isfolder: Boolean! @default(value: true)
 
-  CreatedBy: User! @relation(name: "ResourceCreatedBy")
+  CreatedBy: User @relation(name: "ResourceCreatedBy")
   Parent: Resource @relation(name: "ResourceParent")
   Childs: [Resource!]! @relation(name: "ResourceParent")
   # Image: File @relation(name: "ResourceImage")

diff --git a/src/server/index.mjs b/src/server/index.mjs
@@ -1,5 +1,6 @@
 
 import startServer from "@prisma-cms/server";
+import URI from 'urijs';
 
 import Module from "../";