Skip to content

Commit aed8c3d

Browse files
hichana10thfloor
hichana
and
10thfloor
authored
Code submission for FLIP fest 'Playground Feature: Improve the resource explorer 29 - Milestone 3' (#175)
* squash merge for final submission for flip 29 * add changes based on Max feedback * add revisions to eof and absolute import requested by Max * Remove console.log from ResourcesBar.tsx * fix remaining util relative to absolute imports * rebase onflow master to flip 29 hichana submission (#4) * Add Max as Codeowner * Update CODEOWNERS Co-authored-by: Mackenzie <remember.mackenzie@gmail.com> Co-authored-by: Mackenzie <remember.mackenzie@gmail.com>
1 parent 3d0c5e3 commit aed8c3d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1375
-21918
lines changed

‎.env.local‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎codegen.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
overwrite: true
22
schema:
3+
- "http://localhost:8080/query"
34
- "https://playground.staging.flow.dapperlabs.com/query"
45
- "src/api/apollo/local.graphql"
56
documents: "src/api/apollo/**/*.ts"

‎package-lock.json‎

Lines changed: 19 additions & 21394 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/App.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Router, Redirect, globalHistory } from '@reach/router';
66
import { ApolloProvider } from '@apollo/react-hooks';
77
import AppMobileWrapper from 'containers/AppMobileWrapper';
88
import BrowserDetector from 'components/BrowserDetector';
9-
import * as GoogleAnalytics from './util/google-analytics';
9+
import * as GoogleAnalytics from 'util/google-analytics';
1010
import client from 'api/apollo/client';
1111
import globalStyles from './globalStyles';
1212
import theme from './theme';

‎src/api/apollo/generated/graphql.tsx‎

Lines changed: 151 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -10,157 +10,43 @@ export type Scalars = {
1010
Boolean: boolean;
1111
Int: number;
1212
Float: number;
13-
UUID: any;
1413
Version: any;
1514
Address: any;
15+
UUID: any;
1616
ExecutionResultValue: any;
1717
RawExecutionResult: any;
1818
};
1919

20-
export type Project = {
21-
__typename?: 'Project';
22-
id: Scalars['UUID'];
23-
publicId: Scalars['UUID'];
24-
parentId?: Maybe<Scalars['UUID']>;
25-
title: Scalars['String'];
26-
seed: Scalars['Int'];
27-
version: Scalars['Version'];
28-
persist?: Maybe<Scalars['Boolean']>;
29-
mutable?: Maybe<Scalars['Boolean']>;
30-
accounts?: Maybe<Array<Account>>;
31-
transactionTemplates?: Maybe<Array<TransactionTemplate>>;
32-
transactionExecutions?: Maybe<Array<TransactionExecution>>;
33-
scriptTemplates?: Maybe<Array<ScriptTemplate>>;
34-
scriptExecutions?: Maybe<Array<ScriptExecution>>;
35-
};
36-
3720
export type NewProject = {
21+
accounts?: Maybe<Array<Scalars['String']>>;
3822
parentId?: Maybe<Scalars['UUID']>;
39-
title: Scalars['String'];
23+
scriptTemplates?: Maybe<Array<NewProjectScriptTemplate>>;
4024
seed: Scalars['Int'];
41-
accounts?: Maybe<Array<Scalars['String']>>;
25+
title: Scalars['String'];
4226
transactionTemplates?: Maybe<Array<NewProjectTransactionTemplate>>;
43-
scriptTemplates?: Maybe<Array<NewProjectScriptTemplate>>;
4427
};
4528

4629
export type NewProjectTransactionTemplate = {
47-
title: Scalars['String'];
4830
script: Scalars['String'];
49-
};
50-
51-
export type NewScriptExecution = {
52-
projectId: Scalars['UUID'];
53-
script: Scalars['String'];
54-
arguments?: Maybe<Array<Scalars['String']>>;
55-
};
56-
57-
export type ProgramPosition = {
58-
__typename?: 'ProgramPosition';
59-
offset: Scalars['Int'];
60-
line: Scalars['Int'];
61-
column: Scalars['Int'];
62-
};
63-
64-
export type Query = {
65-
__typename?: 'Query';
66-
account: Account;
67-
activeProject: Scalars['Boolean'];
68-
activeProjectId?: Maybe<Scalars['Int']>;
69-
cachedExecutionResults: Array<Maybe<ExecutionResults>>;
70-
localProject?: Maybe<Project>;
71-
playgroundInfo: PlaygroundInfo;
72-
project: Project;
73-
scriptTemplate: ScriptTemplate;
74-
transactionTemplate: TransactionTemplate;
75-
};
76-
77-
78-
export type QueryAccountArgs = {
79-
accountId?: Maybe<Scalars['String']>;
80-
id: Scalars['UUID'];
81-
projectId: Scalars['UUID'];
82-
};
83-
84-
85-
export type QueryProjectArgs = {
86-
id: Scalars['UUID'];
87-
};
88-
89-
90-
export type QueryScriptTemplateArgs = {
91-
id: Scalars['UUID'];
92-
projectId: Scalars['UUID'];
93-
};
94-
95-
96-
export type QueryTransactionTemplateArgs = {
97-
id: Scalars['UUID'];
98-
projectId: Scalars['UUID'];
99-
};
100-
101-
export type TransactionTemplate = {
102-
__typename?: 'TransactionTemplate';
103-
id: Scalars['UUID'];
104-
index: Scalars['Int'];
105-
title: Scalars['String'];
106-
script: Scalars['String'];
107-
};
108-
109-
export type TransactionExecution = {
110-
__typename?: 'TransactionExecution';
111-
id: Scalars['UUID'];
112-
script: Scalars['String'];
113-
arguments?: Maybe<Array<Scalars['String']>>;
114-
signers: Array<Account>;
115-
errors?: Maybe<Array<ProgramError>>;
116-
events: Array<Maybe<Event>>;
117-
logs: Array<Scalars['String']>;
118-
};
119-
120-
export type NewTransactionTemplate = {
121-
projectId: Scalars['UUID'];
12231
title: Scalars['String'];
123-
script: Scalars['String'];
12432
};
12533

126-
export type UpdateTransactionTemplate = {
34+
export type UpdateProject = {
12735
id: Scalars['UUID'];
36+
persist?: Maybe<Scalars['Boolean']>;
12837
title?: Maybe<Scalars['String']>;
129-
projectId: Scalars['UUID'];
130-
index?: Maybe<Scalars['Int']>;
131-
script?: Maybe<Scalars['String']>;
13238
};
13339

134-
135-
136-
export type ProgramError = {
137-
__typename?: 'ProgramError';
138-
message: Scalars['String'];
139-
startPosition?: Maybe<ProgramPosition>;
140-
endPosition?: Maybe<ProgramPosition>;
141-
};
142-
143-
export type ScriptExecution = {
144-
__typename?: 'ScriptExecution';
145-
id: Scalars['UUID'];
40+
export type NewScriptTemplate = {
41+
projectId: Scalars['UUID'];
14642
script: Scalars['String'];
147-
arguments?: Maybe<Array<Scalars['String']>>;
148-
errors?: Maybe<Array<ProgramError>>;
149-
value: Scalars['String'];
150-
logs: Array<Scalars['String']>;
151-
};
152-
153-
export type NewProjectScriptTemplate = {
15443
title: Scalars['String'];
155-
script: Scalars['String'];
15644
};
15745

158-
export type UpdateScriptTemplate = {
159-
id: Scalars['UUID'];
160-
title?: Maybe<Scalars['String']>;
46+
export type NewScriptExecution = {
47+
arguments?: Maybe<Array<Scalars['String']>>;
16148
projectId: Scalars['UUID'];
162-
index?: Maybe<Scalars['Int']>;
163-
script?: Maybe<Scalars['String']>;
49+
script: Scalars['String'];
16450
};
16551

16652
export type Mutation = {
@@ -255,61 +141,175 @@ export type MutationUpdateTransactionTemplateArgs = {
255141
input: UpdateTransactionTemplate;
256142
};
257143

144+
145+
export type ProgramPosition = {
146+
__typename?: 'ProgramPosition';
147+
column: Scalars['Int'];
148+
line: Scalars['Int'];
149+
offset: Scalars['Int'];
150+
};
151+
152+
export type UpdateTransactionTemplate = {
153+
id: Scalars['UUID'];
154+
index?: Maybe<Scalars['Int']>;
155+
projectId: Scalars['UUID'];
156+
script?: Maybe<Scalars['String']>;
157+
title?: Maybe<Scalars['String']>;
158+
};
159+
160+
161+
export type Project = {
162+
__typename?: 'Project';
163+
accounts?: Maybe<Array<Account>>;
164+
id: Scalars['UUID'];
165+
mutable?: Maybe<Scalars['Boolean']>;
166+
parentId?: Maybe<Scalars['UUID']>;
167+
persist?: Maybe<Scalars['Boolean']>;
168+
publicId: Scalars['UUID'];
169+
scriptExecutions?: Maybe<Array<ScriptExecution>>;
170+
scriptTemplates?: Maybe<Array<ScriptTemplate>>;
171+
seed: Scalars['Int'];
172+
title: Scalars['String'];
173+
transactionExecutions?: Maybe<Array<TransactionExecution>>;
174+
transactionTemplates?: Maybe<Array<TransactionTemplate>>;
175+
version: Scalars['Version'];
176+
};
177+
178+
export type ProgramError = {
179+
__typename?: 'ProgramError';
180+
endPosition?: Maybe<ProgramPosition>;
181+
message: Scalars['String'];
182+
startPosition?: Maybe<ProgramPosition>;
183+
};
184+
185+
export type NewTransactionExecution = {
186+
arguments?: Maybe<Array<Scalars['String']>>;
187+
projectId: Scalars['UUID'];
188+
script: Scalars['String'];
189+
signers?: Maybe<Array<Scalars['Address']>>;
190+
};
191+
192+
export type NewTransactionTemplate = {
193+
projectId: Scalars['UUID'];
194+
script: Scalars['String'];
195+
title: Scalars['String'];
196+
};
197+
198+
export type UpdateScriptTemplate = {
199+
id: Scalars['UUID'];
200+
index?: Maybe<Scalars['Int']>;
201+
projectId: Scalars['UUID'];
202+
script?: Maybe<Scalars['String']>;
203+
title?: Maybe<Scalars['String']>;
204+
};
205+
206+
export type ScriptTemplate = {
207+
__typename?: 'ScriptTemplate';
208+
id: Scalars['UUID'];
209+
index: Scalars['Int'];
210+
script: Scalars['String'];
211+
title: Scalars['String'];
212+
};
213+
214+
export type NewProjectScriptTemplate = {
215+
script: Scalars['String'];
216+
title: Scalars['String'];
217+
};
218+
219+
export type UpdateAccount = {
220+
deployedCode?: Maybe<Scalars['String']>;
221+
draftCode?: Maybe<Scalars['String']>;
222+
id: Scalars['UUID'];
223+
projectId: Scalars['UUID'];
224+
};
225+
226+
258227
export type PlaygroundInfo = {
259228
__typename?: 'PlaygroundInfo';
260229
apiVersion: Scalars['Version'];
261230
cadenceVersion: Scalars['Version'];
262231
};
263232

233+
export type TransactionTemplate = {
234+
__typename?: 'TransactionTemplate';
235+
id: Scalars['UUID'];
236+
index: Scalars['Int'];
237+
script: Scalars['String'];
238+
title: Scalars['String'];
239+
};
240+
264241
export type Event = {
265242
__typename?: 'Event';
266243
type: Scalars['String'];
267244
values: Array<Scalars['String']>;
268245
};
269246

270-
export type ScriptTemplate = {
271-
__typename?: 'ScriptTemplate';
272-
id: Scalars['UUID'];
273-
index: Scalars['Int'];
274-
title: Scalars['String'];
275-
script: Scalars['String'];
247+
export type Query = {
248+
__typename?: 'Query';
249+
account: Account;
250+
activeProject: Scalars['Boolean'];
251+
activeProjectId?: Maybe<Scalars['Int']>;
252+
cachedExecutionResults: Array<Maybe<ExecutionResults>>;
253+
localProject?: Maybe<Project>;
254+
playgroundInfo: PlaygroundInfo;
255+
project: Project;
256+
scriptTemplate: ScriptTemplate;
257+
transactionTemplate: TransactionTemplate;
276258
};
277259

278-
export type UpdateProject = {
260+
261+
export type QueryAccountArgs = {
262+
accountId?: Maybe<Scalars['String']>;
279263
id: Scalars['UUID'];
280-
title?: Maybe<Scalars['String']>;
281-
persist?: Maybe<Scalars['Boolean']>;
264+
projectId: Scalars['UUID'];
282265
};
283266

284-
export type UpdateAccount = {
267+
268+
export type QueryProjectArgs = {
285269
id: Scalars['UUID'];
286-
projectId: Scalars['UUID'];
287-
draftCode?: Maybe<Scalars['String']>;
288-
deployedCode?: Maybe<Scalars['String']>;
289270
};
290271

291-
export type Account = {
292-
__typename?: 'Account';
272+
273+
export type QueryScriptTemplateArgs = {
293274
id: Scalars['UUID'];
294-
address: Scalars['Address'];
295-
draftCode: Scalars['String'];
296-
deployedCode: Scalars['String'];
297-
deployedContracts: Array<Scalars['String']>;
298-
state: Scalars['String'];
275+
projectId: Scalars['UUID'];
299276
};
300277

301278

302-
export type NewTransactionExecution = {
279+
export type QueryTransactionTemplateArgs = {
280+
id: Scalars['UUID'];
303281
projectId: Scalars['UUID'];
304-
script: Scalars['String'];
305-
signers?: Maybe<Array<Scalars['Address']>>;
282+
};
283+
284+
export type TransactionExecution = {
285+
__typename?: 'TransactionExecution';
306286
arguments?: Maybe<Array<Scalars['String']>>;
287+
errors?: Maybe<Array<ProgramError>>;
288+
events: Array<Maybe<Event>>;
289+
id: Scalars['UUID'];
290+
logs: Array<Scalars['String']>;
291+
script: Scalars['String'];
292+
signers: Array<Account>;
307293
};
308294

309-
export type NewScriptTemplate = {
310-
projectId: Scalars['UUID'];
311-
title: Scalars['String'];
295+
export type ScriptExecution = {
296+
__typename?: 'ScriptExecution';
297+
arguments?: Maybe<Array<Scalars['String']>>;
298+
errors?: Maybe<Array<ProgramError>>;
299+
id: Scalars['UUID'];
300+
logs: Array<Scalars['String']>;
312301
script: Scalars['String'];
302+
value: Scalars['String'];
303+
};
304+
305+
export type Account = {
306+
__typename?: 'Account';
307+
address: Scalars['Address'];
308+
deployedCode: Scalars['String'];
309+
deployedContracts: Array<Scalars['String']>;
310+
draftCode: Scalars['String'];
311+
id: Scalars['UUID'];
312+
state: Scalars['String'];
313313
};
314314

315315

‎src/api/apollo/resolvers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { InMemoryCache } from 'apollo-cache-inmemory';
22
import gql from 'graphql-tag';
3-
import { normalizeInteractionResponse } from '../../util/normalize-interaction-response';
3+
import { normalizeInteractionResponse } from 'util/normalize-interaction-response';
44
import {
55
SetExecutionResultsMutationVariables,
66
ClearExecutionResultsMutationVariables,

0 commit comments

Comments
 (0)