{accountId}
- {!isCreateNewIndexer && (
+ {indexerName && (
{indexerName}
@@ -169,21 +169,33 @@ const EditorButtons = ({
- {currentUserAccountId && (
+ {(!isUserIndexer && !isCreateNewIndexer) ? (
{getActionButtonText()}}
+ overlay={Fork Indexer }
+ >
+ setShowForkIndexerModal(true)}
+ >
+ Fork Indexer
+
+
+ ) : (
+
Publish}
>
setShowPublishModal(true)}
>
- {getActionButtonText()}
+ Publish
)}
-
@@ -208,6 +220,5 @@ const EditorButtons = ({
);
};
-
export default EditorButtons;
diff --git a/frontend/src/components/Form/IndexerConfigOptionsInputGroup.jsx b/frontend/src/components/Form/IndexerConfigOptionsInputGroup.jsx
index ca84bd625..c728d0e9a 100644
--- a/frontend/src/components/Form/IndexerConfigOptionsInputGroup.jsx
+++ b/frontend/src/components/Form/IndexerConfigOptionsInputGroup.jsx
@@ -51,11 +51,11 @@ const IndexerConfigOptions = ({ updateConfig }) => {
Indexer Name
setIndexerNameField(e.target.value)}
+ onChange={(e) => setIndexerNameField(e.target.value.toLowerCase().trim())}
/>
diff --git a/frontend/src/components/Modals/ForkIndexerModal.jsx b/frontend/src/components/Modals/ForkIndexerModal.jsx
index 7e427e238..71b7cb37b 100644
--- a/frontend/src/components/Modals/ForkIndexerModal.jsx
+++ b/frontend/src/components/Modals/ForkIndexerModal.jsx
@@ -1,46 +1,41 @@
import React, { useContext, useState } from "react";
-import { Button, Modal, Alert } from "react-bootstrap";
+import { Button, Modal, Alert, InputGroup, Form } from "react-bootstrap";
import IndexerConfigOptions from "../Form/IndexerConfigOptionsInputGroup";
-import { IndexerDetailsContext } from '../../contexts/IndexerDetailsContext';
+import { IndexerDetailsContext } from "../../contexts/IndexerDetailsContext";
import { validateContractId } from "../../utils/validators";
-export const ForkIndexerModal = ({
- registerFunction,
-}) => {
+export const ForkIndexerModal = ({ registerFunction, forkIndexer }) => {
const {
indexerDetails,
showForkIndexerModal,
setShowForkIndexerModal,
+ setIsCreateNewIndexer,
+ setIndexerName,
+ setIndexerConfig,
+ isCreateNewIndexer,
} = useContext(IndexerDetailsContext);
- const [indexerConfig, setIndexerConfig] = useState({ filter: "social.near", startBlockHeight: null })
- const [indexerName, setIndexerName] = useState("")
- const [error, setError] = useState(null)
+ const [indexerName, setIndexerNameField] = useState("");
+ const [error, setError] = useState(null);
- const updateConfig = (indexerName, filter, startBlockHeight, option) => {
- let finalStartBlockHeight = option === "latestBlockHeight" ? null : startBlockHeight;
- setIndexerConfig({ filter, startBlockHeight: finalStartBlockHeight })
- setIndexerName(indexerName)
- }
- const register = async () => {
+ const fork = async () => {
if (!indexerName) {
- setError("Please provide an Indexer Name")
- return
+ setError("Please provide an Indexer Name");
+ return;
}
if (indexerName === indexerDetails.indexerName) {
- setError("Please provide a different Indexer Name than the orginal Indexer")
- return
+ setError(
+ "Please provide a different Indexer Name than the orginal Indexer"
+ );
+ return;
}
-
- if (!validateContractId(indexerConfig.filter)) {
- setError("Please provide a valid contract name")
- return
- }
- setError(null)
- registerFunction(indexerName, indexerConfig)
- setShowForkIndexerModal(false)
- }
+ setError(null);
+ setIndexerName(indexerName);
+ setIsCreateNewIndexer(true);
+ forkIndexer(indexerName);
+ setShowForkIndexerModal(false);
+ };
return (
Enter Indexer Details
-
+ Indexer Name
+ setIndexerNameField(e.target.value.trim().toLowerCase())}
+ />
+
{error && (
{error}
@@ -60,11 +64,14 @@ export const ForkIndexerModal = ({
)}
- setShowPublishModal(false)}>
+ setShowForkIndexerModal(false)}
+ >
Cancel
- register()}>
- Fork Your Own Indexer
+ fork()}>
+ Fork Indexer
diff --git a/frontend/src/components/Playground/graphiql.jsx b/frontend/src/components/Playground/graphiql.jsx
index 1e1917b01..e0aa80f91 100644
--- a/frontend/src/components/Playground/graphiql.jsx
+++ b/frontend/src/components/Playground/graphiql.jsx
@@ -1,9 +1,9 @@
-import React, { useContext, useState } from "react";
+import React, { useContext, useState, useMemo } from "react";
import GraphiQL from "graphiql";
import { sessionStorage } from "near-social-bridge";
import { IndexerDetailsContext } from '../../contexts/IndexerDetailsContext';
-import { useExporterPlugin } from '@graphiql/plugin-code-exporter';
-import { useExplorerPlugin } from '@graphiql/plugin-explorer';
+import { codeExporterPlugin } from '@graphiql/plugin-code-exporter';
+import { explorerPlugin } from '@graphiql/plugin-explorer';
import "graphiql/graphiql.min.css";
import '@graphiql/plugin-code-exporter/dist/style.css';
import '@graphiql/plugin-explorer/dist/style.css';
@@ -90,36 +90,28 @@ const renderData = (a) => {
const renderedData = state.data.map(renderData);
return (
+ <>
{renderedData}
+
);`;
}
}
};
+
+const explorer = explorerPlugin();
+
export const GraphqlPlayground = () => {
const { indexerDetails } = useContext(IndexerDetailsContext);
- const snippets = [bosQuerySnippet(indexerDetails.accountId)];
- const [query, setQuery] = useState("");
-
- const explorerPlugin = useExplorerPlugin({
- query,
- onEdit: setQuery,
- });
- const exporterPlugin = useExporterPlugin({
- query,
- snippets,
- codeMirrorTheme: 'graphiql',
- });
+ const snippets = useMemo(()=>[bosQuerySnippet(indexerDetails.accountId)], [indexerDetails.accountId]);
+ const exporter = useMemo(()=> codeExporterPlugin({snippets}), [snippets])
return (
graphQLFetcher(params, indexerDetails.accountId)}
- defaultQuery=""
storage={sessionStorage}
- plugins={[explorerPlugin, exporterPlugin]}
+ plugins={[exporter, explorer]}
/>
);
diff --git a/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Comment.jsx b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Comment.jsx
index 42a673856..96429ca0d 100644
--- a/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Comment.jsx
+++ b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Comment.jsx
@@ -1,6 +1,6 @@
const GRAPHQL_ENDPOINT =
- "https://queryapi-hasura-graphql-24ktefolwq-ew.a.run.app";
-const APP_OWNER = "dev-queryapi.dataplatform.near";
+ props.GRAPHQL_ENDPOINT || "https://near-queryapi.api.pagoda.co";
+const APP_OWNER = props.APP_OWNER || "dataplatform.near";
const accountId = props.accountId;
const blockHeight =
props.blockHeight === "now" ? "now" : parseInt(props.blockHeight);
@@ -26,7 +26,7 @@ const commentUrl = `https://alpha.near.org/#/${APP_OWNER}/widget/QueryApi.Exampl
if (!state.content && accountId && blockHeight !== "now") {
const commentQuery = `
query CommentQuery {
- roshaan_near_feed_indexer_comments(
+ dataplatform_near_social_feed_comments(
where: {_and: {account_id: {_eq: "${accountId}"}, block_height: {_eq: ${blockHeight}}}}
) {
content
@@ -44,7 +44,7 @@ query CommentQuery {
`${GRAPHQL_ENDPOINT}/v1/graphql`,
{
method: "POST",
- headers: { "x-hasura-role": "roshaan_near" },
+ headers: { "x-hasura-role": "dataplatform_near" },
body: JSON.stringify({
query: operationsDoc,
variables: variables,
@@ -57,7 +57,7 @@ query CommentQuery {
fetchGraphQL(commentQuery, "CommentQuery", {}).then((result) => {
if (result.status === 200) {
if (result.body.data) {
- const comments = result.body.data.roshaan_near_feed_indexer_comments;
+ const comments = result.body.data.dataplatform_near_social_feed_comments;
if (comments.length > 0) {
const comment = comments[0];
let content = JSON.parse(comment.content);
diff --git a/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.LikeButton.jsx b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.LikeButton.jsx
index a0c79896d..1eddbda39 100644
--- a/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.LikeButton.jsx
+++ b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.LikeButton.jsx
@@ -1,7 +1,6 @@
-
const GRAPHQL_ENDPOINT =
- "https://queryapi-hasura-graphql-24ktefolwq-ew.a.run.app";
-const APP_OWNER = "dev-queryapi.dataplatform.near";
+ props.GRAPHQL_ENDPOINT || "https://near-queryapi.api.pagoda.co";
+const APP_OWNER = props.APP_OWNER || "dataplatform.near";
const item = props.item;
const likes = JSON.parse(props.likes?.length ? props.likes : "[]") ?? [];
diff --git a/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Post.jsx b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Post.jsx
index c3817a435..4e7673a31 100644
--- a/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Post.jsx
+++ b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Post.jsx
@@ -1,6 +1,6 @@
const GRAPHQL_ENDPOINT =
- "https://queryapi-hasura-graphql-24ktefolwq-ew.a.run.app";
-const APP_OWNER = "dev-queryapi.dataplatform.near";
+ props.GRAPHQL_ENDPOINT || "https://near-queryapi.api.pagoda.co";
+const APP_OWNER = props.APP_OWNER || "dataplatform.near";
const accountId = props.accountId;
const blockHeight =
props.blockHeight === "now" ? "now" : parseInt(props.blockHeight);
@@ -23,10 +23,9 @@ const item = {
// Load post if not contents and comments are not passed in
if (!state.content || !state.comments || !state.likes) {
- console.log("making call again");
const postsQuery = `
query IndexerQuery {
- roshaan_near_feed_indexer_posts(
+ dataplatform_near_social_feed_posts(
order_by: {block_height: desc}
where: {_and: {block_height: {_eq: ${blockHeight}}, account_id: {_eq: "${accountId}"}}}
) {
@@ -51,7 +50,7 @@ query IndexerQuery {
`${GRAPHQL_ENDPOINT}/v1/graphql`,
{
method: "POST",
- headers: { "x-hasura-role": "roshaan_near" },
+ headers: { "x-hasura-role": "dataplatform_near" },
body: JSON.stringify({
query: operationsDoc,
variables: variables,
@@ -64,7 +63,7 @@ query IndexerQuery {
fetchGraphQL(postsQuery, "IndexerQuery", {}).then((result) => {
if (result.status === 200) {
if (result.body.data) {
- const posts = result.body.data.roshaan_near_feed_indexer_posts;
+ const posts = result.body.data.dataplatform_near_social_feed_posts;
if (posts.length > 0) {
const post = posts[0];
let content = JSON.parse(post.content);
diff --git a/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.PostPage.jsx b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.PostPage.jsx
index d772ee4c1..27afc38bb 100644
--- a/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.PostPage.jsx
+++ b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.PostPage.jsx
@@ -1,5 +1,5 @@
const GRAPHQL_ENDPOINT =
- props.GRAPHQL_ENDPOINT || "https://queryapi-hasura-graphql-24ktefolwq-ew.a.run.app";
+ props.GRAPHQL_ENDPOINT || "https://near-queryapi.api.pagoda.co";
const APP_OWNER = props.APP_OWNER || "dataplatform.near";
const accountId = props.accountId;
const commentBlockHeight = parseInt(props.commentBlockHeight);
@@ -13,7 +13,7 @@ State.init({
});
const parentPostByComment = `query ParentPostByComment {
- roshaan_near_feed_indexer_comments(
+ dataplatform_near_social_feed_comments(
where: {_and: {account_id: {_eq: "${accountId}"}, block_height: {_eq: ${commentBlockHeight}}}}
) {
post {
@@ -49,7 +49,7 @@ function fetchGraphQL(operationsDoc, operationName, variables) {
`${GRAPHQL_ENDPOINT}/v1/graphql`,
{
method: "POST",
- headers: { "x-hasura-role": "roshaan_near" },
+ headers: { "x-hasura-role": "dataplatform_near" },
body: JSON.stringify({
query: operationsDoc,
variables: variables,
@@ -64,7 +64,7 @@ if (commentBlockHeight) {
(result) => {
if (result.status === 200) {
if (result.body.data) {
- const posts = result.body.data.roshaan_near_feed_indexer_comments;
+ const posts = result.body.data.dataplatform_near_social_feed_comments;
if (posts.length > 0) {
const post = posts[0].post;
let content = JSON.parse(post.content);
diff --git a/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Posts.jsx b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Posts.jsx
new file mode 100644
index 000000000..9c59d7a71
--- /dev/null
+++ b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.Posts.jsx
@@ -0,0 +1,304 @@
+const APP_OWNER = props.APP_OWNER || "dataplatform.near";
+const GRAPHQL_ENDPOINT =
+ props.GRAPHQL_ENDPOINT || "https://near-queryapi.api.pagoda.co";
+const sortOption = props.postsOrderOption || "blockHeight"; // following, blockHeight
+const LIMIT = 25;
+let accountsFollowing = props.accountsFollowing
+
+if (context.accountId && !accountsFollowing) {
+ const graph = Social.keys(`${context.accountId}/graph/follow/*`, "final");
+ if (graph !== null) {
+ accountsFollowing = Object.keys(graph[context.accountId].graph.follow || {});
+ }
+}
+
+State.init({
+ selectedTab: Storage.privateGet("selectedTab") || "all",
+ posts: [],
+ postsCountLeft: 0,
+ initLoadPosts: false,
+ initLoadPostsAll: false
+});
+
+function fetchGraphQL(operationsDoc, operationName, variables) {
+ return asyncFetch(
+ `${GRAPHQL_ENDPOINT}/v1/graphql`,
+ {
+ method: "POST",
+ headers: { "x-hasura-role": "dataplatform_near" },
+ body: JSON.stringify({
+ query: operationsDoc,
+ variables: variables,
+ operationName: operationName,
+ }),
+ }
+ );
+}
+
+const createQuery = (sortOption, type) => {
+let querySortOption = "";
+switch (sortOption) {
+ case "recentComments":
+ querySortOption = `{ last_comment_timestamp: desc_nulls_last },`;
+ break;
+ // More options...
+ default:
+ querySortOption = "";
+}
+
+let queryFilter = "";
+switch (type) {
+ case "following":
+ let queryAccountsString = accountsFollowing.map(account => `"${account}"`).join(", ");
+ queryFilter = `account_id: { _in: [${queryAccountsString}]}`;
+ break;
+ // More options...
+ default:
+ queryFilter = "";
+}
+
+const indexerQueries = `
+query GetPostsQuery($offset: Int, $limit: Int) {
+ dataplatform_near_social_feed_posts(order_by: [${querySortOption} { block_height: desc }], offset: $offset, limit: $limit) {
+ account_id
+ block_height
+ block_timestamp
+ content
+ receipt_id
+ accounts_liked
+ last_comment_timestamp
+ comments(order_by: {block_height: asc}) {
+ account_id
+ block_height
+ block_timestamp
+ content
+ }
+ }
+ dataplatform_near_social_feed_posts_aggregate(order_by: [${querySortOption} { block_height: desc }], offset: $offset){
+ aggregate {
+ count
+ }
+ }
+}
+query GetFollowingPosts($offset: Int, $limit: Int) {
+ dataplatform_near_social_feed_posts(where: {${queryFilter}}, order_by: [${querySortOption} { block_height: desc }], offset: $offset, limit: $limit) {
+ account_id
+ block_height
+ block_timestamp
+ content
+ receipt_id
+ accounts_liked
+ last_comment_timestamp
+ comments(order_by: {block_height: asc}) {
+ account_id
+ block_height
+ block_timestamp
+ content
+ }
+ }
+ dataplatform_near_social_feed_posts_aggregate(where: {${queryFilter}}, order_by: [${querySortOption} { block_height: desc }], offset: $offset) {
+ aggregate {
+ count
+ }
+ }
+}
+`;
+return indexerQueries
+}
+
+const loadMorePosts = () => {
+ const queryName = state.selectedTab == "following" && accountsFollowing ? "GetFollowingPosts" : "GetPostsQuery"
+ const type = state.selectedTab == "following" && accountsFollowing ? "following" : "all"
+
+ if(state.selectedTab == "following" && accountsSelected && accountsSelected.length == 0) {
+ console.log("user has no followers")
+ return
+ }
+ fetchGraphQL(createQuery(sortOption, type), queryName, {
+ offset: state.posts.length,
+ limit: LIMIT
+ }).then((result) => {
+ if (result.status === 200 && result.body) {
+ if(result.body.errors) {
+ console.log('error:', result.body.errors)
+ return
+ }
+ let data = result.body.data;
+ if (data) {
+ const newPosts = data.dataplatform_near_social_feed_posts;
+ const postsCountLeft =
+ data.dataplatform_near_social_feed_posts_aggregate.aggregate.count;
+ if (newPosts.length > 0) {
+ State.update({
+ posts: [...state.posts, ...newPosts],
+ postsCountLeft,
+ });
+ }
+ }
+ }
+ });
+};
+
+const previousSelectedTab = Storage.privateGet("selectedTab");
+if (previousSelectedTab && previousSelectedTab !== state.selectedTab) {
+ State.update({
+ selectedTab: previousSelectedTab,
+ });
+}
+
+function selectTab(selectedTab) {
+ Storage.privateSet("selectedTab", selectedTab);
+ State.update({
+ posts: [],
+ postsCountLeft: 0,
+ selectedTab
+ });
+ loadMorePosts()
+}
+
+const H2 = styled.h2`
+ font-size: 19px;
+ line-height: 22px;
+ color: #11181C;
+ margin: 0 0 24px;
+ padding: 0 24px;
+
+ @media (max-width: 1200px) {
+ display: none;
+ }
+`;
+
+const Content = styled.div`
+ @media (max-width: 1200px) {
+ > div:first-child {
+ border-top: none;
+ }
+ }
+`;
+
+const ComposeWrapper = styled.div`
+ border-top: 1px solid #ECEEF0;
+`;
+
+const FilterWrapper = styled.div`
+ border-top: 1px solid #ECEEF0;
+ padding: 24px 24px 0;
+
+ @media (max-width: 1200px) {
+ padding: 12px;
+ }
+`;
+
+const PillSelect = styled.div`
+ display: inline-flex;
+ align-items: center;
+
+ @media (max-width: 600px) {
+ width: 100%;
+
+ button {
+ flex: 1;
+ }
+ }
+`;
+
+const PillSelectButton = styled.button`
+ display: block;
+ position: relative;
+ border: 1px solid #E6E8EB;
+ border-right: none;
+ padding: 3px 24px;
+ border-radius: 0;
+ font-size: 12px;
+ line-height: 18px;
+ color: ${(p) => (p.selected ? "#fff" : "#687076")};
+ background: ${(p) => (p.selected ? "#006ADC !important" : "#FBFCFD")};
+ font-weight: 600;
+ transition: all 200ms;
+
+ &:hover {
+ background: #ECEDEE;
+ text-decoration: none;
+ }
+
+ &:focus {
+ outline: none;
+ border-color: #006ADC !important;
+ box-shadow: 0 0 0 1px #006ADC;
+ z-index: 5;
+ }
+
+ &:first-child {
+ border-radius: 6px 0 0 6px;
+ }
+ &:last-child {
+ border-radius: 0 6px 6px 0;
+ border-right: 1px solid #E6E8EB;
+ }
+`;
+
+const FeedWrapper = styled.div`
+ .post {
+ padding-left: 24px;
+ padding-right: 24px;
+
+ @media (max-width: 1200px) {
+ padding-left: 12px;
+ padding-right: 12px;
+ }
+ }
+`;
+
+const hasMore = state.postsCountLeft != state.posts.length
+
+if(!state.initLoadPostsAll) {
+ loadMorePosts()
+ State.update({initLoadPostsAll: true})
+}
+
+if(state.initLoadPostsAll == true && !state.initLoadPosts && accountsFollowing) {
+ if (accountsFollowing.length > 0 && state.selectedTab == "following") {
+ selectTab("following")
+ }
+ State.update({initLoadPosts: true})
+}
+
+return (
+ <>
+ Posts
+
+
+ {context.accountId && (
+ <>
+
+
+
+
+
+ selectTab("all")}
+ selected={state.selectedTab === "all"}
+ >
+ All
+
+
+ selectTab("following")}
+ selected={state.selectedTab === "following"}
+ >
+ Following
+
+
+
+
+ )}
+
+
+
+
+
+);
diff --git a/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.jsx b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.jsx
index 0d83123c8..f8855e248 100644
--- a/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.jsx
+++ b/frontend/widgets/examples/feed/src/QueryApi.Examples.Feed.jsx
@@ -1,14 +1,9 @@
-
const GRAPHQL_ENDPOINT =
- props.GRAPHQL_ENDPOINT || "https://queryapi-hasura-graphql-24ktefolwq-ew.a.run.app";
+ props.GRAPHQL_ENDPOINT || "https://near-queryapi.api.pagoda.co";
const APP_OWNER = props.APP_OWNER || "dataplatform.near";
-const LIMIT = 10;
-const option = props.postsOrderOption ?? "blockHeight";
-
-State.init({
- posts: [],
- postsCount: 0,
-});
+const loadMorePosts = props.loadMorePosts;
+const hasMore = props.hasMore || false;
+const posts = props.posts || [];
const Subheading = styled.h2`
display: block;
@@ -24,55 +19,6 @@ const Subheading = styled.h2`
outline: none;
`;
-let querySortFilter = "";
-switch (option) {
- case "recentComments":
- querySortFilter = `{ last_comment_timestamp: desc_nulls_last },`;
- break;
- // More options...
- default:
- querySortFilter = "";
-}
-
-const indexerQueries = `
- query GetPostsQuery($offset: Int) {
- roshaan_near_feed_indexer_posts(order_by: [${querySortFilter} { block_height: desc }], offset: $offset, limit: ${LIMIT}) {
- account_id
- block_height
- block_timestamp
- content
- receipt_id
- accounts_liked
- last_comment_timestamp
- comments(order_by: {block_height: asc}) {
- account_id
- block_height
- block_timestamp
- content
- }
- }
- roshaan_near_feed_indexer_posts_aggregate {
- aggregate {
- count
- }
- }
-}
-`;
-
-function fetchGraphQL(operationsDoc, operationName, variables) {
- return asyncFetch(
- `${GRAPHQL_ENDPOINT}/v1/graphql`,
- {
- method: "POST",
- headers: { "x-hasura-role": "roshaan_near" },
- body: JSON.stringify({
- query: operationsDoc,
- variables: variables,
- operationName: operationName,
- }),
- }
- );
-}
const Post = styled.div`
border-bottom: 1px solid #ECEEF0;
@@ -105,34 +51,27 @@ const renderItem = (item, i) => {
);
};
-const loadMorePosts = () => {
- fetchGraphQL(indexerQueries, "GetPostsQuery", {
- offset: state.posts.length,
- }).then((result) => {
- if (result.status === 200) {
- let data = result.body.data;
- if (data) {
- const newPosts = data.roshaan_near_feed_indexer_posts;
- console.log(newPosts);
- const postsCount =
- data.roshaan_near_feed_indexer_posts_aggregate.aggregate.count;
- if (newPosts.length > 0) {
- State.update({
- posts: [...state.posts, ...newPosts],
- postsCount: postsCount,
- });
- }
- }
- }
- });
-};
+const renderedItems = posts.map(renderItem);
+
+const Loader = () => {
+return(
+
+
)
+}
+
+if (!posts) return(
(p.primary ? "1px solid #ECEEF0" : "none")};
+ border-right: ${(p) => (p.primary ? "1px solid #ECEEF0" : "none")};
+
+ > div {
+ padding-bottom: 24px;
+ margin-bottom: 24px;
+ border-bottom: 1px solid #ECEEF0;
+
+ &:last-child {
+ padding-bottom: 0;
+ margin-bottom: 0;
+ border-bottom: none;
+ }
+ }
+
+ @media (max-width: 1200px) {
+ padding-top: 0px;
+ border-left: none;
+ border-right: none;
+ display: ${(p) => (p.active ? "block" : "none")};
+ margin: ${(p) => (p.negativeMargin ? "0 -12px" : "0")};
+ }
+`;
+
+const Tabs = styled.div`
+ display: none;
+ height: 48px;
+ background: #F8F9FA;
+ border-bottom: 1px solid #ECEEF0;
+ margin-bottom: ${(p) => (p.noMargin ? "0" : p.halfMargin ? "24px" : "24px")};
+ overflow: auto;
+ scroll-behavior: smooth;
+
+ @media (max-width: 1200px) {
+ display: flex;
+ margin-left: -12px;
+ margin-right: -12px;
+
+ > * {
+ flex: 1;
+ }
+ }
+`;
+
+const TabsButton = styled.a`
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+ font-weight: 600;
+ font-size: 12px;
+ padding: 0 12px;
+ position: relative;
+ color: ${(p) => (p.selected ? "#11181C" : "#687076")};
+ background: none;
+ border: none;
+ outline: none;
+ text-align: center;
+ text-decoration: none !important;
+
+ &:hover {
+ color: #11181C;
+ }
+
+ &::after {
+ content: '';
+ display: ${(p) => (p.selected ? "block" : "none")};
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ height: 3px;
+ background: #59E692;
+ }
+`;
+
+return (
+
+
+
+ Posts
+
+
+
+ Components
+
+
+
+ Explore
+
+
+
+
+
+
+
+
+
+);
+
diff --git a/frontend/widgets/examples/feed/src/QueryApi.Feed.jsx b/frontend/widgets/examples/feed/src/QueryApi.Feed.jsx
index 42028338e..e800bf49e 100644
--- a/frontend/widgets/examples/feed/src/QueryApi.Feed.jsx
+++ b/frontend/widgets/examples/feed/src/QueryApi.Feed.jsx
@@ -1,13 +1,75 @@
-const GRAPHQL_ENDPOINT =
- "https://queryapi-hasura-graphql-24ktefolwq-ew.a.run.app";
+const GRAPHQL_ENDPOINT = "https://near-queryapi.api.pagoda.co";
const APP_OWNER = "dataplatform.near";
+let lastPostSocialApi = Social.index("post", "main", {
+ limit: 1,
+ order: "desc",
+});
+
+State.init({
+ shouldFallback: props.shouldFallback ?? false,
+});
+
+function fetchGraphQL(operationsDoc, operationName, variables) {
+ return asyncFetch(`${GRAPHQL_ENDPOINT}/v1/graphql`, {
+ method: "POST",
+ headers: { "x-hasura-role": "dataplatform_near" },
+ body: JSON.stringify({
+ query: operationsDoc,
+ variables: variables,
+ operationName: operationName,
+ }),
+ });
+}
+
+const lastPostQuery = `
+query IndexerQuery {
+ dataplatform_near_social_feed_posts( limit: 1, order_by: { block_height: desc }) {
+ block_height
+ }
+}
+`;
+
+fetchGraphQL(lastPostQuery, "IndexerQuery", {})
+ .then((feedIndexerResponse) => {
+ if (feedIndexerResponse && feedIndexerResponse.body.data.dataplatform_near_social_feed_posts.length > 0) {
+ const nearSocialBlockHeight = lastPostSocialApi[0].blockHeight;
+ const feedIndexerBlockHeight =
+ feedIndexerResponse.body.data.dataplatform_near_social_feed_posts[0]
+ .block_height;
+
+ const lag = nearSocialBlockHeight - feedIndexerBlockHeight;
+
+ let shouldFallback = lag > 2 || !feedIndexerBlockHeight;
+
+ // console.log(`Social API block height: ${nearSocialBlockHeight}`);
+ // console.log(`Feed block height: ${feedIndexerBlockHeight}`);
+ // console.log(`Lag: ${lag}`);
+ // console.log(`Fallback to old widget? ${shouldFallback}`);
+
+ State.update({ shouldFallback });
+ } else {
+ console.log("Falling back to old widget.");
+ State.update({ shouldFallback: true });
+ }
+ })
+ .catch((error) => {
+ console.log("Error while fetching GraphQL(falling back to old widget): ", error);
+ State.update({ shouldFallback: true });
+ });
+
return (
- ,
) {
// only request provisioning on the first block
- if current_block != start_block {
+ if current_block != first_block {
indexer_function.provisioned = true;
}
diff --git a/indexer/queryapi_coordinator/src/historical_block_processing_integration_tests.rs b/indexer/queryapi_coordinator/src/historical_block_processing_integration_tests.rs
index 8a862b2eb..3457974e7 100644
--- a/indexer/queryapi_coordinator/src/historical_block_processing_integration_tests.rs
+++ b/indexer/queryapi_coordinator/src/historical_block_processing_integration_tests.rs
@@ -1,140 +1,167 @@
-use crate::historical_block_processing::filter_matching_blocks_from_index_files;
-use crate::indexer_types::IndexerFunction;
-use crate::opts::{Opts, Parser};
-use crate::{historical_block_processing, opts};
-use aws_types::SdkConfig;
-use chrono::{DateTime, NaiveDate, Utc};
-use indexer_rule_type::indexer_rule::{IndexerRule, IndexerRuleKind, MatchingRule, Status};
-use near_lake_framework::near_indexer_primitives::types::BlockHeight;
-use std::ops::Range;
+#[cfg(test)]
+mod tests {
+ use crate::historical_block_processing::filter_matching_blocks_from_index_files;
+ use crate::indexer_types::IndexerFunction;
+ use crate::opts::{ChainId, Opts, StartOptions};
+ use crate::{historical_block_processing, opts};
+ use aws_types::SdkConfig;
+ use chrono::{DateTime, NaiveDate, Utc};
+ use indexer_rule_type::indexer_rule::{IndexerRule, IndexerRuleKind, MatchingRule, Status};
+ use near_lake_framework::near_indexer_primitives::types::BlockHeight;
+ use std::env;
+ use std::ops::Range;
-/// Parses env vars from .env, Run with
-/// cargo test historical_block_processing_integration_tests::test_indexing_metadata_file -- mainnet from-latest;
-#[tokio::test]
-async fn test_indexing_metadata_file() {
- let opts = Opts::parse();
- let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
+ impl Opts {
+ pub fn test_opts_with_aws() -> Self {
+ dotenv::dotenv().ok();
+ let lake_aws_access_key = env::var("LAKE_AWS_ACCESS_KEY").unwrap();
+ let lake_aws_secret_access_key = env::var("LAKE_AWS_SECRET_ACCESS_KEY").unwrap();
+ Opts {
+ redis_connection_string: "".to_string(),
+ lake_aws_access_key,
+ lake_aws_secret_access_key,
+ queue_aws_access_key: "".to_string(),
+ queue_aws_secret_access_key: "".to_string(),
+ aws_queue_region: "".to_string(),
+ queue_url: "".to_string(),
+ start_from_block_queue_url: "".to_string(),
+ registry_contract_id: "".to_string(),
+ port: 0,
+ chain_id: ChainId::Mainnet(StartOptions::FromLatest),
+ }
+ }
+ }
- let last_indexed_block =
- historical_block_processing::last_indexed_block_from_metadata(aws_config)
- .await
- .unwrap();
- let a: Range = 90000000..9000000000; // valid for the next 300 years
- assert!(a.contains(&last_indexed_block));
-}
+ /// Parses env vars from .env, Run with
+ /// cargo test historical_block_processing_integration_tests::test_indexing_metadata_file -- mainnet from-latest;
+ #[tokio::test]
+ async fn test_indexing_metadata_file() {
+ let opts = Opts::test_opts_with_aws();
+ let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
-/// Parses env vars from .env, Run with
-/// cargo test historical_block_processing_integration_tests::test_process_historical_messages -- mainnet from-latest;
-#[tokio::test]
-async fn test_process_historical_messages() {
- opts::init_tracing();
+ let last_indexed_block =
+ historical_block_processing::last_indexed_block_from_metadata(aws_config)
+ .await
+ .unwrap();
+ let a: Range = 90000000..9000000000; // valid for the next 300 years
+ assert!(a.contains(&last_indexed_block));
+ }
- let contract = "queryapi.dataplatform.near";
- let matching_rule = MatchingRule::ActionAny {
- affected_account_id: contract.to_string(),
- status: Status::Any,
- };
- let filter_rule = IndexerRule {
- indexer_rule_kind: IndexerRuleKind::Action,
- matching_rule,
- id: None,
- name: None,
- };
- let indexer_function = IndexerFunction {
- account_id: "buildnear.testnet".to_string().parse().unwrap(),
- function_name: "index_stuff".to_string(),
- code: "".to_string(),
- start_block_height: Some(85376002),
- schema: None,
- provisioned: false,
- indexer_rule: filter_rule,
- };
+ /// Parses env vars from .env, Run with
+ /// cargo test historical_block_processing_integration_tests::test_process_historical_messages -- mainnet from-latest;
+ #[tokio::test]
+ async fn test_process_historical_messages() {
+ opts::init_tracing();
- let opts = Opts::parse();
- let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
- let fake_block_height =
- historical_block_processing::last_indexed_block_from_metadata(aws_config)
- .await
- .unwrap();
- historical_block_processing::process_historical_messages(
- fake_block_height + 1,
- indexer_function,
- )
- .await;
-}
+ let contract = "queryapi.dataplatform.near";
+ let matching_rule = MatchingRule::ActionAny {
+ affected_account_id: contract.to_string(),
+ status: Status::Any,
+ };
+ let filter_rule = IndexerRule {
+ indexer_rule_kind: IndexerRuleKind::Action,
+ matching_rule,
+ id: None,
+ name: None,
+ };
+ let indexer_function = IndexerFunction {
+ account_id: "buildnear.testnet".to_string().parse().unwrap(),
+ function_name: "index_stuff".to_string(),
+ code: "".to_string(),
+ start_block_height: Some(85376002),
+ schema: None,
+ provisioned: false,
+ indexer_rule: filter_rule,
+ };
-/// Parses env vars from .env, Run with
-/// cargo test historical_block_processing_integration_tests::test_filter_matching_wildcard_blocks_from_index_files -- mainnet from-latest;
-#[tokio::test]
-async fn test_filter_matching_wildcard_blocks_from_index_files() {
- let contract = "*.keypom.near";
- let matching_rule = MatchingRule::ActionAny {
- affected_account_id: contract.to_string(),
- status: Status::Any,
- };
- let filter_rule = IndexerRule {
- indexer_rule_kind: IndexerRuleKind::Action,
- matching_rule,
- id: None,
- name: None,
- };
+ let opts = Opts::test_opts_with_aws();
+ let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
+ let fake_block_height =
+ historical_block_processing::last_indexed_block_from_metadata(aws_config)
+ .await
+ .unwrap();
+ historical_block_processing::process_historical_messages(
+ fake_block_height + 1,
+ indexer_function,
+ opts,
+ )
+ .await;
+ }
- let opts = Opts::parse();
- let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
+ /// Parses env vars from .env, Run with
+ /// cargo test historical_block_processing_integration_tests::test_filter_matching_wildcard_blocks_from_index_files -- mainnet from-latest;
+ #[tokio::test]
+ async fn test_filter_matching_wildcard_blocks_from_index_files() {
+ let contract = "*.keypom.near";
+ let matching_rule = MatchingRule::ActionAny {
+ affected_account_id: contract.to_string(),
+ status: Status::Any,
+ };
+ let filter_rule = IndexerRule {
+ indexer_rule_kind: IndexerRuleKind::Action,
+ matching_rule,
+ id: None,
+ name: None,
+ };
- let start_block_height = 75472603;
- let naivedatetime_utc = NaiveDate::from_ymd_opt(2022, 10, 03)
- .unwrap()
- .and_hms_opt(0, 0, 0)
- .unwrap();
- let datetime_utc = DateTime::::from_utc(naivedatetime_utc, Utc);
- let blocks = filter_matching_blocks_from_index_files(
- start_block_height,
- &filter_rule,
- aws_config,
- datetime_utc,
- )
- .await;
+ let opts = Opts::test_opts_with_aws();
+ let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
- // // remove any blocks from after when the test was written -- not working, due to new contracts?
- // let fixed_blocks: Vec = blocks.into_iter().filter(|&b| b <= 95175853u64).collect(); // 95175853u64 95242647u64
- assert!(blocks.len() > 21830); // 22913 raw, deduped to 21830
-}
+ let start_block_height = 77016214;
+ let naivedatetime_utc = NaiveDate::from_ymd_opt(2022, 10, 03)
+ .unwrap()
+ .and_hms_opt(0, 0, 0)
+ .unwrap();
+ let datetime_utc = DateTime::::from_utc(naivedatetime_utc, Utc);
+ let blocks = filter_matching_blocks_from_index_files(
+ start_block_height,
+ &filter_rule,
+ aws_config,
+ datetime_utc,
+ )
+ .await;
-/// Parses env vars from .env, Run with
-/// cargo test historical_block_processing_integration_tests::test_filter_matching_blocks_from_index_files -- mainnet from-latest;
-#[tokio::test]
-async fn test_filter_matching_blocks_from_index_files() {
- let contract = "*.agency.near";
- let matching_rule = MatchingRule::ActionAny {
- affected_account_id: contract.to_string(),
- status: Status::Any,
- };
- let filter_rule = IndexerRule {
- indexer_rule_kind: IndexerRuleKind::Action,
- matching_rule,
- id: None,
- name: None,
- };
+ // // remove any blocks from after when the test was written -- not working, due to new contracts?
+ // let fixed_blocks: Vec = blocks.into_iter().filter(|&b| b <= 95175853u64).collect(); // 95175853u64 95242647u64
+ assert!(blocks.len() >= 71899);
+ }
- let opts = Opts::parse();
- let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
+ /// Parses env vars from .env, Run with
+ /// cargo test historical_block_processing_integration_tests::test_filter_matching_blocks_from_index_files -- mainnet from-latest;
+ #[tokio::test]
+ async fn test_filter_matching_blocks_from_index_files() {
+ let contract = "*.agency.near";
+ let matching_rule = MatchingRule::ActionAny {
+ affected_account_id: contract.to_string(),
+ status: Status::Any,
+ };
+ let filter_rule = IndexerRule {
+ indexer_rule_kind: IndexerRuleKind::Action,
+ matching_rule,
+ id: None,
+ name: None,
+ };
- let start_block_height = 45894620;
- let naivedatetime_utc = NaiveDate::from_ymd_opt(2021, 08, 01)
- .unwrap()
- .and_hms_opt(0, 0, 0)
- .unwrap();
- let datetime_utc = DateTime::::from_utc(naivedatetime_utc, Utc);
- let blocks = filter_matching_blocks_from_index_files(
- start_block_height,
- &filter_rule,
- aws_config,
- datetime_utc,
- )
- .await;
+ let opts = Opts::test_opts_with_aws();
+ let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
+
+ let start_block_height = 45894620;
+ let naivedatetime_utc = NaiveDate::from_ymd_opt(2021, 08, 01)
+ .unwrap()
+ .and_hms_opt(0, 0, 0)
+ .unwrap();
+ let datetime_utc = DateTime::::from_utc(naivedatetime_utc, Utc);
+ let blocks = filter_matching_blocks_from_index_files(
+ start_block_height,
+ &filter_rule,
+ aws_config,
+ datetime_utc,
+ )
+ .await;
- // remove any blocks from after when the test was written
- let fixed_blocks: Vec = blocks.into_iter().filter(|&b| b <= 95175853u64).collect();
- assert_eq!(fixed_blocks.len(), 6); // hackathon.agency.near = 45894627,45898423, hacker.agency.near = 45897358, hack.agency.near = 45894872,45895120,45896237
+ // remove any blocks from after when the test was written
+ let fixed_blocks: Vec =
+ blocks.into_iter().filter(|&b| b <= 95175853u64).collect();
+ assert_eq!(fixed_blocks.len(), 6); // hackathon.agency.near = 45894627,45898423, hacker.agency.near = 45897358, hack.agency.near = 45894872,45895120,45896237
+ }
}
diff --git a/indexer/queryapi_coordinator/src/main.rs b/indexer/queryapi_coordinator/src/main.rs
index d663f7c8c..e447f3316 100644
--- a/indexer/queryapi_coordinator/src/main.rs
+++ b/indexer/queryapi_coordinator/src/main.rs
@@ -46,7 +46,6 @@ pub(crate) struct QueryApiContext<'a> {
pub registry_contract_id: &'a str,
pub balance_cache: &'a BalanceCache,
pub redis_connection_manager: &'a ConnectionManager,
- pub json_rpc_client: &'a JsonRpcClient,
}
#[tokio::main]
@@ -102,7 +101,6 @@ async fn main() -> anyhow::Result<()> {
let context = QueryApiContext {
redis_connection_manager: &redis_connection_manager,
queue_url: &queue_url,
- json_rpc_client: &json_rpc_client,
balance_cache: &balances_cache,
registry_contract_id: ®istry_contract_id,
streamer_message,
@@ -245,7 +243,7 @@ async fn handle_streamer_message(
fn set_provisioned_flag(
indexer_registry_locked: &mut MutexGuard,
- indexer_function: &&IndexerFunction,
+ indexer_function: &IndexerFunction,
) {
match indexer_registry_locked.get_mut(&indexer_function.account_id) {
Some(account_functions) => {
@@ -297,3 +295,49 @@ async fn reduce_rule_matches_for_indexer_function<'x>(
#[cfg(test)]
mod historical_block_processing_integration_tests;
+
+use indexer_rule_type::indexer_rule::{IndexerRule, IndexerRuleKind, MatchingRule, Status};
+use std::collections::HashMap;
+
+#[tokio::test]
+async fn set_provisioning_finds_functions_in_registry() {
+ let mut indexer_registry = IndexerRegistry::new();
+ let indexer_function = IndexerFunction {
+ account_id: "test_near".to_string().parse().unwrap(),
+ function_name: "test_indexer".to_string(),
+ code: "".to_string(),
+ start_block_height: None,
+ schema: None,
+ provisioned: false,
+ indexer_rule: IndexerRule {
+ indexer_rule_kind: IndexerRuleKind::Action,
+ id: None,
+ name: None,
+ matching_rule: MatchingRule::ActionAny {
+ affected_account_id: "social.near".to_string(),
+ status: Status::Success,
+ },
+ },
+ };
+
+ let mut functions: HashMap = HashMap::new();
+ functions.insert(
+ indexer_function.function_name.clone(),
+ indexer_function.clone(),
+ );
+ indexer_registry.insert(indexer_function.account_id.clone(), functions);
+
+ let indexer_registry: SharedIndexerRegistry = std::sync::Arc::new(Mutex::new(indexer_registry));
+ let mut indexer_registry_locked = indexer_registry.lock().await;
+
+ set_provisioned_flag(&mut indexer_registry_locked, &&indexer_function);
+
+ let account_functions = indexer_registry_locked
+ .get(&indexer_function.account_id)
+ .unwrap();
+ let indexer_function = account_functions
+ .get(&indexer_function.function_name)
+ .unwrap();
+
+ assert!(indexer_function.provisioned);
+}
diff --git a/indexer/queryapi_coordinator/src/s3.rs b/indexer/queryapi_coordinator/src/s3.rs
index 775958af8..f5e63e753 100644
--- a/indexer/queryapi_coordinator/src/s3.rs
+++ b/indexer/queryapi_coordinator/src/s3.rs
@@ -253,7 +253,6 @@ mod tests {
#[tokio::test]
async fn list_with_single_contract() {
let opts = Opts::parse();
- let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
let list = find_index_files_by_pattern(
&opts.lake_aws_sdk_config(),
@@ -269,7 +268,6 @@ mod tests {
#[tokio::test]
async fn list_with_csv_contracts() {
let opts = Opts::parse();
- let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
let list = find_index_files_by_pattern(
&opts.lake_aws_sdk_config(),
@@ -285,7 +283,6 @@ mod tests {
#[tokio::test]
async fn list_with_wildcard_contracts() {
let opts = Opts::parse();
- let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
let list = find_index_files_by_pattern(
&opts.lake_aws_sdk_config(),
@@ -301,7 +298,6 @@ mod tests {
#[tokio::test]
async fn list_with_csv_and_wildcard_contracts() {
let opts = Opts::parse();
- let aws_config: &SdkConfig = &opts.lake_aws_sdk_config();
let list = find_index_files_by_pattern(
&opts.lake_aws_sdk_config(),