Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: put toggle + disclaimer #237

Merged
merged 5 commits into from
Oct 3, 2023
Merged

feat: put toggle + disclaimer #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f50a2e8
feat: put toggle + disclaimer
roshaans Sep 26, 2023
266e3d7
feat: add append role to enable aggregations
roshaans Oct 2, 2023
5f45407
feat: update text
roshaans Oct 2, 2023
276ca10
feat: pull state from storage
roshaans Oct 3, 2023
5d313e8
nit: fix copy
roshaans Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/replacement.dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"REPL_ACCOUNT_ID": "dev-queryapi.dataplatform.near",
"REPL_GRAPHQL_ENDPOINT": "https://near-queryapi.dev.api.pagoda.co",
"REPL_GRAPHQL_ENDPOINT_V2": "https://queryapi-hasura-graphql-mainnet-vcqilefdcq-ew.a.run.app",
roshaans marked this conversation as resolved.
Show resolved Hide resolved
"REPL_EXTERNAL_APP_URL": "https://queryapi-frontend-vcqilefdcq-ew.a.run.app",
"REPL_REGISTRY_CONTRACT_ID": "dev-queryapi.dataplatform.near"
}
1 change: 1 addition & 0 deletions frontend/replacement.local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"REPL_ACCOUNT_ID": "dataplatform.near",
"REPL_GRAPHQL_ENDPOINT": "https://near-queryapi.api.pagoda.co",
"REPL_GRAPHQL_ENDPOINT_V2": "https://queryapi-hasura-graphql-mainnet-vcqilefdcq-ew.a.run.app",
"REPL_EXTERNAL_APP_URL": "http://localhost:3000",
"REPL_REGISTRY_CONTRACT_ID": "queryapi.dataplatform.near"
}
3 changes: 2 additions & 1 deletion frontend/replacement.mainnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"REPL_ACCOUNT_ID": "dataplatform.near",
"REPL_GRAPHQL_ENDPOINT": "https://near-queryapi.api.pagoda.co",
"REPL_EXTERNAL_APP_URL": "https://queryapi-frontend-24ktefolwq-ew.a.run.app",
"REPL_GRAPHQL_ENDPOINT_V2": "https://queryapi-hasura-graphql-mainnet-vcqilefdcq-ew.a.run.app",
"REPL_EXTERNAL_APP_URL": "http://localhost:3000",
"REPL_REGISTRY_CONTRACT_ID": "queryapi.dataplatform.near"
}
101 changes: 92 additions & 9 deletions frontend/widgets/src/QueryApi.IndexerStatus.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ const TextLink = styled.a`

if (!indexer_name) return "missing indexer_name";

let v1_endpoint = `${REPL_GRAPHQL_ENDPOINT}`;
let v2_endpoint = `${REPL_GRAPHQL_ENDPOINT_V2}`;

State.init({
logs: [],
state: [],
Expand All @@ -105,11 +108,17 @@ State.init({
indexer_resPage: 0,
logsPage: 0,
statePage: 0,
v2Toggle: Storage.privateGet("QueryApiV2Toggle") || false,
});

let graphQLEndpoint = state.v2Toggle ? v2_endpoint : v1_endpoint;

function fetchGraphQL(operationsDoc, operationName, variables) {
return asyncFetch(`${REPL_GRAPHQL_ENDPOINT}/v1/graphql`, {
return asyncFetch(`${graphQLEndpoint}/v1/graphql`, {
method: "POST",
headers: {
"x-hasura-role": "append"
},
body: JSON.stringify({
query: operationsDoc,
variables: variables,
Expand All @@ -119,7 +128,7 @@ function fetchGraphQL(operationsDoc, operationName, variables) {
}

const createGraphQLLink = () => {
const queryLink = `https://cloud.hasura.io/public/graphiql?endpoint=${REPL_GRAPHQL_ENDPOINT}/v1/graphql&query=query+IndexerQuery+%7B%0A++indexer_state%28where%3A+%7Bfunction_name%3A+%7B_eq%3A+%22function_placeholder%22%7D%7D%29+%7B%0A++++function_name%0A++++current_block_height%0A++%7D%0A++indexer_log_entries%28%0A++++where%3A+%7Bfunction_name%3A+%7B_eq%3A+%22function_placeholder%22%7D%7D%0A++++order_by%3A+%7B+timestamp%3A+desc%7D%0A++%29+%7B%0A++++function_name%0A++++id%0A++++message%0A++++timestamp%0A++%7D%0A%7D%0A`;
const queryLink = `https://cloud.hasura.io/public/graphiql?endpoint=${graphQLEndpoint}/v1/graphql&query=query+IndexerQuery+%7B%0A++indexer_state%28where%3A+%7Bfunction_name%3A+%7B_eq%3A+%22function_placeholder%22%7D%7D%29+%7B%0A++++function_name%0A++++current_block_height%0A++%7D%0A++indexer_log_entries%28%0A++++where%3A+%7Bfunction_name%3A+%7B_eq%3A+%22function_placeholder%22%7D%7D%0A++++order_by%3A+%7B+timestamp%3A+desc%7D%0A++%29+%7B%0A++++function_name%0A++++id%0A++++message%0A++++timestamp%0A++%7D%0A%7D%0A`;
return queryLink.replaceAll(
"function_placeholder",
`${accountId}/${indexer_name}`
Expand Down Expand Up @@ -152,14 +161,15 @@ const indexerStateDoc = `
current_block_height
current_historical_block_height
}
indexer_state_aggregate(where: {function_name: {_eq: "${accountId}/${indexer_name}"}}) {
aggregate {
count
}
}
}
`;
if (!state.initialFetch) {

const prevV2ToggleSelected = Storage.privateGet("QueryApiV2Toggle");
if (
!state.initialFetch ||
(prevV2ToggleSelected !== state.v2Toggle)
) {
Storage.privateSet("QueryApiV2Toggle", state.v2Toggle);
fetchGraphQL(logsDoc, "QueryLogs", {
offset: state.logsPage * LIMIT,
}).then((result) => {
Expand Down Expand Up @@ -235,6 +245,44 @@ const onIndexerResPageChange = (page) => {
State.update({ indexer_resPage: page, currentPage: page });
};

const DisclaimerContainer = styled.div`
padding: 10px;
margin: 0.5px;
text-color: black;
display: flex;
width: 50;
border: 2px solid rgb(240, 240, 240);
border-radius: 8px;
align-items: "center";
margin-bottom: 5px;
`;

const Notice = styled.div`
font-weight: 900;
font-size: 22px;
align-self: flex-start;
margin: 10px 0px 30px;
text-align: center;
padding-bottom: 5px;
border-bottom: 1px solid rgb(240, 240, 241);
color: rgb(36, 39, 42);
`;

const DisclaimerText = styled.p`
font-size: 14px;
line-height: 20px;
font-weight: 400;
color: rgb(17, 24, 28);
word-break: break-word;
width: 700px;
text-align: start;
padding-left: 10px;

@media (max-width: 1024px) {
width: 80%;
}
`;

return (
<>
<Card>
Expand All @@ -244,6 +292,39 @@ return (
GraphQL Playground
<i className="bi bi-box-arrow-up-right"></i>
</TextLink>
<div
style={{
marginTop: "5px",
display: "flex",
width: "100%",
justifyContent: "center",
}}
>
<DisclaimerContainer>
<div className="flex">
<Notice>V2 Testing Notice</Notice>
<div style={{ display: "flex" }}>
<DisclaimerText>
QueryAPI is still in beta. We are working on a OueryAPI V2
with faster historical processing, easier access to DB and
more control over your indexer. V2 is running in parallel and
you can see the logs from this new version by toggling this
button.
</DisclaimerText>
<Widget
src={`${REPL_ACCOUNT_ID}/widget/components.toggle`}
props={{
active: state.v2Toggle,
label: "",
onSwitch: () => {
State.update({ v2Toggle: !state.v2Toggle });
},
}}
/>
</div>
</div>
</DisclaimerContainer>
</div>
</Title>

<CardBody>
Expand All @@ -270,7 +351,9 @@ return (
<tr>
<TableElement>{x.function_name}</TableElement>
<TableElement>{x.current_block_height}</TableElement>
<TableElement>{x.current_historical_block_height}</TableElement>
<TableElement>
{x.current_historical_block_height}
</TableElement>
<TableElement>{x.status}</TableElement>
</tr>
))}
Expand Down
78 changes: 78 additions & 0 deletions frontend/widgets/src/components/toggle.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
const ToggleRoot = styled.div`
justify-content: space-between;
width: fit-content;
max-width: 100%;
`;

const ToggleSwitchRoot = styled("Switch.Root")`
all: unset;
display: block;
width: 42px;
height: 25px;
background-color: #d1d1d1;
border-radius: 9999px;
position: relative;
box-shadow: 0 2px 10px var(--blackA7);

&[data-state="checked"] {
background-color: #00d084;
}

&[data-disabled=""] {
opacity: 0.7;
}
`;

const ToggleSwitchThumb = styled("Switch.Thumb")`
all: unset;
display: block;
width: 21px;
height: 21px;
border-radius: 9999px;
transition: transform 100ms;
transform: translateX(2px);
will-change: transform;

&[data-state="checked"] {
transform: translateX(19px);
}
`;

const ToggleLabel = styled.label`
white-space: nowrap;
`;

const Toggle = ({
active,
className,
direction,
disabled,
key,
label,
onSwitch,
...rest
}) => (
<ToggleRoot
className={[
"d-flex justify-content-between, align-items-center gap-3",
direction === "rtl" ? "flex-row-reverse" : "",
className,
].join(" ")}
{...rest}
>
<ToggleLabel htmlFor={`toggle-${key}`}>{label}</ToggleLabel>

<ToggleSwitchRoot
checked={active}
className="shadow-none"
id={`toggle-${key}`}
onCheckedChange={disabled ? null : onSwitch}
title={disabled ? `Permanently ${active ? "enabled" : "disabled"}` : null}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this line do? What is supposed to be "permanently enabled/disabled"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not quite sure actually. I copied this component from devgogs.near

{...{ disabled }}
>
{!disabled && <ToggleSwitchThumb className="bg-light shadow" />}
</ToggleSwitchRoot>
</ToggleRoot>
);

return Toggle(props);