Skip to content

Commit ad0e8df

Browse files
committed
Merge branch 'master' into ROMMAN-T-289-kick-default-resolver
2 parents b7e206b + 4498925 commit ad0e8df

16 files changed

+92
-192
lines changed

frappe_graphql/frappe_graphql/types/docfield.graphql

Lines changed: 43 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ type DocField implements BaseDocType {
66
modified: String
77
modified_by: User!
88
parent: BaseDocType
9-
parent__name: String
109
parentfield: String
1110
parenttype: String
1211
idx: Int
1312
docstatus: Int
1413
owner__name: String!
1514
modified_by__name: String!
15+
parent__name: String
1616
label: String
17-
fieldtype: String!
17+
fieldtype: DocFieldTypeSelectOptions!
1818
fieldname: String
1919
precision: String
2020
length: Int
@@ -63,32 +63,44 @@ type DocField implements BaseDocType {
6363
oldfieldtype: String
6464
}
6565

66-
enum DocFieldSortField {
67-
NAME
68-
CREATION
69-
MODIFIED
70-
LABEL
71-
FIELDTYPE
72-
FIELDNAME
73-
}
74-
75-
input DocFieldSortingInput {
76-
direction: SortDirection!
77-
field: DocFieldSortField!
78-
}
79-
80-
type DocFieldCountableEdge {
81-
cursor: String!
82-
node: DocField!
83-
}
84-
85-
type DocFieldCountableConnection {
86-
pageInfo: PageInfo!
87-
totalCount: Int
88-
edges: [DocFieldCountableEdge!]!
89-
}
90-
91-
extend type Query {
92-
DocField(name: String!): DocField!
93-
DocFields(filter: [DBFilterInput], sortBy: DocFieldSortingInput, before: String, after: String, first: Int, last: Int): DocFieldCountableConnection!
94-
}
66+
enum DocFieldTypeSelectOptions {
67+
ATTACH
68+
ATTACH_IMAGE
69+
BARCODE
70+
BUTTON
71+
CHECK
72+
CODE
73+
COLOR
74+
COLUMN_BREAK
75+
CURRENCY
76+
DATA
77+
DATE
78+
DATETIME
79+
DURATION
80+
DYNAMIC_LINK
81+
FLOAT
82+
FOLD
83+
GEOLOCATION
84+
HEADING
85+
HTML
86+
HTML_EDITOR
87+
ICON
88+
IMAGE
89+
INT
90+
LINK
91+
LONG_TEXT
92+
MARKDOWN_EDITOR
93+
PASSWORD
94+
PERCENT
95+
READ_ONLY
96+
RATING
97+
SECTION_BREAK
98+
SELECT
99+
SMALL_TEXT
100+
TABLE
101+
TABLE_MULTISELECT
102+
TEXT
103+
TEXT_EDITOR
104+
TIME
105+
SIGNATURE
106+
}

frappe_graphql/frappe_graphql/types/docperm.graphql

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ type DocPerm implements BaseDocType {
66
modified: String
77
modified_by: User!
88
parent: BaseDocType
9-
parent__name: String
109
parentfield: String
1110
parenttype: String
1211
idx: Int
1312
docstatus: Int
1413
owner__name: String!
1514
modified_by__name: String!
15+
parent__name: String
1616
role: Role!
1717
role__name: String
1818
if_owner: Int
@@ -32,31 +32,4 @@ type DocPerm implements BaseDocType {
3232
share: Int
3333
print: Int
3434
email: Int
35-
}
36-
37-
enum DocPermSortField {
38-
NAME
39-
CREATION
40-
MODIFIED
41-
}
42-
43-
input DocPermSortingInput {
44-
direction: SortDirection!
45-
field: DocPermSortField!
46-
}
47-
48-
type DocPermCountableEdge {
49-
cursor: String!
50-
node: DocPerm!
51-
}
52-
53-
type DocPermCountableConnection {
54-
pageInfo: PageInfo!
55-
totalCount: Int
56-
edges: [DocPermCountableEdge!]!
57-
}
58-
59-
extend type Query {
60-
DocPerm(name: String!): DocPerm!
61-
DocPerms(filter: [DBFilterInput], sortBy: DocPermSortingInput, before: String, after: String, first: Int, last: Int): DocPermCountableConnection!
62-
}
35+
}

frappe_graphql/frappe_graphql/types/doctype.graphql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ type DocType implements BaseDocType {
2626
track_views: Int
2727
custom: Int
2828
beta: Int
29+
is_virtual: Int
2930
fields: [DocField!]!
3031
autoname: String
3132
name_case: DocTypeNameCaseSelectOptions
33+
allow_rename: Int
3234
description: String
3335
documentation: String
3436
image_field: String
@@ -37,7 +39,6 @@ type DocType implements BaseDocType {
3739
max_attachments: Int
3840
hide_toolbar: Int
3941
allow_copy: Int
40-
allow_rename: Int
4142
allow_import: Int
4243
allow_events_in_timeline: Int
4344
allow_auto_repeat: Int
@@ -51,6 +52,7 @@ type DocType implements BaseDocType {
5152
color: String
5253
show_preview_popup: Int
5354
show_name_in_global_search: Int
55+
default_email_template__name: String
5456
email_append_to: Int
5557
sender_field: String
5658
subject_field: String

frappe_graphql/frappe_graphql/types/doctype_action.graphql

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,44 +6,22 @@ type DocTypeAction implements BaseDocType {
66
modified: String
77
modified_by: User!
88
parent: BaseDocType
9-
parent__name: String
109
parentfield: String
1110
parenttype: String
1211
idx: Int
1312
docstatus: Int
1413
owner__name: String!
1514
modified_by__name: String!
15+
parent__name: String
1616
label: String!
17-
action_type: String!
17+
action_type: DocTypeActionActionTypeSelectOptions!
1818
action: String!
1919
group: String
2020
hidden: Int
2121
custom: Int
2222
}
2323

24-
enum DocTypeActionSortField {
25-
NAME
26-
CREATION
27-
MODIFIED
28-
}
29-
30-
input DocTypeActionSortingInput {
31-
direction: SortDirection!
32-
field: DocTypeActionSortField!
33-
}
34-
35-
type DocTypeActionCountableEdge {
36-
cursor: String!
37-
node: DocTypeAction!
38-
}
39-
40-
type DocTypeActionCountableConnection {
41-
pageInfo: PageInfo!
42-
totalCount: Int
43-
edges: [DocTypeActionCountableEdge!]!
44-
}
45-
46-
extend type Query {
47-
DocTypeAction(name: String!): DocTypeAction!
48-
DocTypeActions(filter: [DBFilterInput], sortBy: DocTypeActionSortingInput, before: String, after: String, first: Int, last: Int): DocTypeActionCountableConnection!
49-
}
24+
enum DocTypeActionActionTypeSelectOptions {
25+
SERVER_ACTION
26+
ROUTE
27+
}

frappe_graphql/frappe_graphql/types/doctype_link.graphql

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,44 +6,21 @@ type DocTypeLink implements BaseDocType {
66
modified: String
77
modified_by: User!
88
parent: BaseDocType
9-
parent__name: String
109
parentfield: String
1110
parenttype: String
1211
idx: Int
1312
docstatus: Int
1413
owner__name: String!
1514
modified_by__name: String!
15+
parent__name: String
1616
link_doctype: DocType!
1717
link_doctype__name: String
1818
link_fieldname: String!
19+
parent_doctype: DocType
20+
parent_doctype__name: String
21+
table_fieldname: String
1922
group: String
2023
hidden: Int
24+
is_child_table: Int
2125
custom: Int
22-
}
23-
24-
enum DocTypeLinkSortField {
25-
NAME
26-
CREATION
27-
MODIFIED
28-
}
29-
30-
input DocTypeLinkSortingInput {
31-
direction: SortDirection!
32-
field: DocTypeLinkSortField!
33-
}
34-
35-
type DocTypeLinkCountableEdge {
36-
cursor: String!
37-
node: DocTypeLink!
38-
}
39-
40-
type DocTypeLinkCountableConnection {
41-
pageInfo: PageInfo!
42-
totalCount: Int
43-
edges: [DocTypeLinkCountableEdge!]!
44-
}
45-
46-
extend type Query {
47-
DocTypeLink(name: String!): DocTypeLink!
48-
DocTypeLinks(filter: [DBFilterInput], sortBy: DocTypeLinkSortingInput, before: String, after: String, first: Int, last: Int): DocTypeLinkCountableConnection!
49-
}
26+
}

frappe_graphql/frappe_graphql/types/domain.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ type Domain implements BaseDocType {
66
modified: String
77
modified_by: User!
88
parent: BaseDocType
9-
parent__name: String
109
parentfield: String
1110
parenttype: String
1211
idx: Int
1312
docstatus: Int
1413
owner__name: String!
1514
modified_by__name: String!
15+
parent__name: String
1616
domain: String!
1717
}
1818

frappe_graphql/frappe_graphql/types/dynamic_link.graphql

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,4 @@ type DynamicLink implements BaseDocType {
1818
link_name: BaseDocType!
1919
link_name__name: String
2020
link_title: String
21-
}
22-
23-
enum DynamicLinkSortField {
24-
NAME
25-
CREATION
26-
MODIFIED
27-
}
28-
29-
input DynamicLinkSortingInput {
30-
direction: SortDirection!
31-
field: DynamicLinkSortField!
32-
}
33-
34-
type DynamicLinkCountableEdge {
35-
cursor: String!
36-
node: DynamicLink!
37-
}
38-
39-
type DynamicLinkCountableConnection {
40-
pageInfo: PageInfo!
41-
totalCount: Int
42-
edges: [DynamicLinkCountableEdge!]!
43-
}
44-
45-
extend type Query {
46-
DynamicLink(name: String!): DynamicLink!
47-
DynamicLinks(filter: [DBFilterInput], sortBy: DynamicLinkSortingInput, before: String, after: String, first: Int, last: Int): DynamicLinkCountableConnection!
48-
}
21+
}

frappe_graphql/frappe_graphql/types/file.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ type File implements BaseDocType {
66
modified: String
77
modified_by: User!
88
parent: BaseDocType
9-
parent__name: String
109
parentfield: String
1110
parenttype: String
1211
idx: Int
1312
docstatus: Int
1413
owner__name: String!
1514
modified_by__name: String!
15+
parent__name: String
1616
file_name: String
1717
is_private: Int
1818
is_home_folder: Int

frappe_graphql/frappe_graphql/types/gender.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ type Gender implements BaseDocType {
66
modified: String
77
modified_by: User!
88
parent: BaseDocType
9-
parent__name: String
109
parentfield: String
1110
parenttype: String
1211
idx: Int
1312
docstatus: Int
1413
owner__name: String!
1514
modified_by__name: String!
15+
parent__name: String
1616
gender: String
1717
}
1818

frappe_graphql/frappe_graphql/types/has_role.graphql

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,13 @@ type HasRole implements BaseDocType {
66
modified: String
77
modified_by: User!
88
parent: BaseDocType
9-
parent__name: String
109
parentfield: String
1110
parenttype: String
1211
idx: Int
1312
docstatus: Int
1413
owner__name: String!
1514
modified_by__name: String!
15+
parent__name: String
1616
role: Role
1717
role__name: String
18-
}
19-
20-
enum HasRoleSortField {
21-
NAME
22-
CREATION
23-
MODIFIED
24-
}
25-
26-
input HasRoleSortingInput {
27-
direction: SortDirection!
28-
field: HasRoleSortField!
29-
}
30-
31-
type HasRoleCountableEdge {
32-
cursor: String!
33-
node: HasRole!
34-
}
35-
36-
type HasRoleCountableConnection {
37-
pageInfo: PageInfo!
38-
totalCount: Int
39-
edges: [HasRoleCountableEdge!]!
40-
}
41-
42-
extend type Query {
43-
HasRole(name: String!): HasRole!
44-
HasRoles(filter: [DBFilterInput], sortBy: HasRoleSortingInput, before: String, after: String, first: Int, last: Int): HasRoleCountableConnection!
45-
}
18+
}

0 commit comments

Comments
 (0)