Skip to content

Commit 3c2080a

Browse files
arcusfelisarcusfelis
authored
Merge pull request #4482 from esl/graphql-cleanup
Graphql cleanup
2 parents 704a926 + 8923032 commit 3c2080a

File tree

5 files changed

+52
-119
lines changed

5 files changed

+52
-119
lines changed

‎priv/graphql/schemas/user/account.gql

-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
"""
2-
Allow user to get information about account.
3-
"""
4-
type AccountUserQuery @protected{
5-
field: Boolean
6-
}
7-
81
"""
92
Allow user to manage own account.
103
"""

‎priv/graphql/schemas/user/user_schema.gql

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ Only an authenticated user can execute these queries.
1111
type UserQuery{
1212
"Check authorization status"
1313
checkAuth: UserAuthInfo
14-
"Account management"
15-
account: AccountUserQuery
1614
"Last activity management"
1715
last: LastUserQuery
1816
"MUC room management"

‎priv/graphql/wsite/index.html

+52-108
Original file line numberDiff line numberDiff line change
@@ -2,138 +2,82 @@
22
* Copyright (c) 2021 GraphQL Contributors
33
* All rights reserved.
44
*
5-
* This source code is licensed under the license
6-
* https://github.com/graphql/graphiql/blob/main/LICENSE.
5+
* the original version of the file:
6+
* https://github.com/graphql/graphiql/blob/[email protected]/examples/graphiql-cdn/index.html
7+
*
8+
* This source code is licensed under the license found at:
9+
* https://github.com/graphql/graphiql/blob/[email protected]/LICENSE
710
-->
8-
<!DOCTYPE html>
9-
<html>
11+
<!doctype html>
12+
<html lang="en">
1013
<head>
14+
<title>GraphiQL</title>
1115
<style>
1216
body {
1317
height: 100%;
1418
margin: 0;
1519
width: 100%;
1620
overflow: hidden;
1721
}
22+
1823
#graphiql {
1924
height: 100vh;
2025
}
2126
</style>
22-
<title>GraphiQL MongooseIM Api</title>
23-
<link href="https://unpkg.com/[email protected]/graphiql.min.css" rel="stylesheet" />
24-
</head>
25-
<body style="margin: 0;">
26-
<div id="graphiql">Loading...</div>
27+
<!--
28+
This GraphiQL example depends on Promise and fetch, which are available in
29+
modern browsers, but can be "polyfilled" for older browsers.
30+
GraphiQL itself depends on React DOM.
31+
If you do not want to rely on a CDN, you can host these files locally or
32+
include them directly in your favored resource bundler.
33+
-->
2734
<script
2835
crossorigin
29-
src="https://unpkg.com/react/umd/react.production.min.js"></script>
36+
src="https://unpkg.com/react@18/umd/react.production.min.js"
37+
></script>
3038
<script
3139
crossorigin
32-
src="https://unpkg.com/react-dom/umd/react-dom.production.min.js"></script>
40+
src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"
41+
></script>
42+
<!--
43+
These two files can be found in the npm module, however you may wish to
44+
copy them directly into your environment, or perhaps include them in your
45+
favored resource bundler.
46+
-->
47+
<script
48+
src="https://unpkg.com/graphiql/graphiql.min.js"
49+
type="application/javascript"
50+
></script>
51+
<link rel="stylesheet" href="https://unpkg.com/graphiql/graphiql.min.css" />
52+
<!--
53+
These are imports for the GraphIQL Explorer plugin.
54+
-->
3355
<script
56+
src="https://unpkg.com/@graphiql/plugin-explorer/dist/index.umd.js"
3457
crossorigin
35-
src="https://unpkg.com/[email protected]/graphiql.min.js"></script>
36-
<script>
58+
></script>
3759

38-
/**
39-
* This GraphiQL example illustrates how to use some of GraphiQL's props
40-
* in order to enable reading and updating the URL parameters, making
41-
* link sharing of queries a little bit easier.
42-
*
43-
* This is only one example of this kind of feature, GraphiQL exposes
44-
* various React params to enable interesting integrations.
45-
*/
60+
<link
61+
rel="stylesheet"
62+
href="https://unpkg.com/@graphiql/plugin-explorer/dist/style.css"
63+
/>
64+
</head>
4665

47-
// Parse the search string to get url parameters.
48-
var search = window.location.search;
49-
var parameters = {};
50-
search.substr(1).split('&').forEach(function (entry) {
51-
var eq = entry.indexOf('=');
52-
if (eq >= 0) {
53-
parameters[decodeURIComponent(entry.slice(0, eq))] =
54-
decodeURIComponent(entry.slice(eq + 1));
55-
}
66+
<body>
67+
<div id="graphiql">Loading...</div>
68+
<script>
69+
const root = ReactDOM.createRoot(document.getElementById('graphiql'));
70+
const fetcher = GraphiQL.createFetcher({
71+
url: '/api/graphql/',
72+
headers: { 'X-Example-Header': 'foo' },
5673
});
57-
58-
// if variables was provided, try to format it.
59-
if (parameters.variables) {
60-
try {
61-
parameters.variables =
62-
JSON.stringify(JSON.parse(parameters.variables), null, 2);
63-
} catch (e) {
64-
// Do nothing, we want to display the invalid JSON as a string, rather
65-
// than present an error.
66-
}
67-
}
68-
69-
// When the query and variables string is edited, update the URL bar so
70-
// that it can be easily shared
71-
function onEditQuery(newQuery) {
72-
parameters.query = newQuery;
73-
updateURL();
74-
}
75-
76-
function onEditVariables(newVariables) {
77-
parameters.variables = newVariables;
78-
updateURL();
79-
}
80-
81-
function onEditOperationName(newOperationName) {
82-
parameters.operationName = newOperationName;
83-
updateURL();
84-
}
85-
86-
function updateURL() {
87-
var newSearch = '?' + Object.keys(parameters).filter(function (key) {
88-
return Boolean(parameters[key]);
89-
}).map(function (key) {
90-
return encodeURIComponent(key) + '=' +
91-
encodeURIComponent(parameters[key]);
92-
}).join('&');
93-
history.replaceState(null, null, newSearch);
94-
}
95-
96-
// Defines a GraphQL fetcher using the fetch API. You're not required to
97-
// use fetch, and could instead implement graphQLFetcher however you like,
98-
// as long as it returns a Promise or Observable.
99-
function graphQLFetcher(graphQLParams, opts = {headers: {}}) {
100-
// This example expects a GraphQL server at the path /graphql.
101-
// Change this to point wherever you host your GraphQL server.
102-
return fetch('/api/graphql/', {
103-
method: 'post',
104-
headers: Object.assign({
105-
'Accept': 'application/json',
106-
'Content-Type': 'application/json'}, opts.headers),
107-
body: JSON.stringify(graphQLParams),
108-
credentials: 'include',
109-
}).then(function (response) {
110-
return response.text();
111-
}).then(function (responseBody) {
112-
try {
113-
return JSON.parse(responseBody);
114-
} catch (error) {
115-
return responseBody;
116-
}
117-
});
118-
}
119-
120-
// Render <GraphiQL /> into the body.
121-
// See the README in the top level of this module to learn more about
122-
// how you can customize GraphiQL by providing different values or
123-
// additional child elements.
124-
ReactDOM.render(
74+
const explorerPlugin = GraphiQLPluginExplorer.explorerPlugin();
75+
root.render(
12576
React.createElement(GraphiQL, {
126-
fetcher: graphQLFetcher,
127-
query: parameters.query,
128-
variables: parameters.variables,
129-
operationName: parameters.operationName,
130-
onEditQuery: onEditQuery,
131-
onEditVariables: onEditVariables,
132-
headerEditorEnabled: true,
133-
headers: '{}',
134-
onEditOperationName: onEditOperationName
77+
fetcher,
78+
defaultEditorToolsVisibility: true,
79+
plugins: [explorerPlugin],
13580
}),
136-
document.getElementById('graphiql')
13781
);
13882
</script>
13983
</body>

‎src/graphql/mongoose_graphql.erl

-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ user_mapping_rules() ->
216216
'UserQuery' => mongoose_graphql_user_query,
217217
'UserMutation' => mongoose_graphql_user_mutation,
218218
'UserSubscription' => mongoose_graphql_user_subscription,
219-
'AccountUserQuery' => mongoose_graphql_account_user_query,
220219
'AccountUserMutation' => mongoose_graphql_account_user_mutation,
221220
'InboxUserMutation' => mongoose_graphql_inbox_user_mutation,
222221
'MUCUserMutation' => mongoose_graphql_muc_user_mutation,

‎src/graphql/user/mongoose_graphql_account_user_query.erl

-1
This file was deleted.

0 commit comments

Comments
 (0)