NEAR-DevHub · Tguntenaar · Dec 9, 2024 · Nov 6, 2024 · Nov 13, 2024 · Nov 13, 2024
@@ -6,47 +6,44 @@ State.init({
   proposalBlockHeight: null,
 });
 
-const proposalId = props.proposalId;
+const instance = props.instance ?? "";
 
-const QUERYAPI_ENDPOINT = `https://near-queryapi.api.pagoda.co/v1/graphql`;
-const fetchGraphQL = (operationsDoc, operationName, variables) => {
-  return asyncFetch(QUERYAPI_ENDPOINT, {
-    method: "POST",
-    headers: { "x-hasura-role": "${REPL_INDEXER_HASURA_ROLE}" },
-    body: JSON.stringify({
-      query: operationsDoc,
-      variables: variables,
-      operationName: operationName,
-    }),
-  });
-};
+const { cacheUrl } = VM.require(`${instance}/widget/config.data`);
 
-const queryName = "${REPL_PROPOSAL_FEED_INDEXER_QUERY_NAME}";
-const query = `query GetLatestSnapshot($offset: Int = 0, $limit: Int = 10, $where: ${queryName}_bool_exp = {}) {
-    ${queryName}(
-      offset: $offset
-      limit: $limit
-      order_by: {proposal_id: desc}
-      where: $where
-    ) {
-      block_height
-    }
-  }`;
+const fetchAndSetProposalSnapshot = () => {
+  if (!props.proposalId) {
+    return;
+  }
+  asyncFetch(`${cacheUrl}/proposal/${props.proposalId}/snapshots`, {
+    method: "GET",
+    headers: { accept: "application/json" },
+  })
+    .then((response) => {
+      if (!response.ok) {
+        console.error(`Failed to fetch snapshots: ${response.status}`);
+      }
+      return response.body;
+    })
+    .then((snapshots) => {
+      if (!Array.isArray(snapshots) || snapshots.length === 0) {
+        console.log("No snapshots found");
+        return;
+      }
 
-const variables = {
-  limit: 10,
-  offset,
-  where: { proposal_id: { _eq: proposalId } },
+      // Get the most recent snapshot
+      const latestSnapshot = (snapshots || []).reduce((latest, current) =>
+        current.block_height > latest.block_height ? current : latest
+      );
+
+      State.update({ proposalBlockHeight: latestSnapshot.block_height });
+    })
+    .catch((error) => {
+      console.error("Failed to fetch proposal snapshot:", error);
+    });
 };
 
-fetchGraphQL(query, "GetLatestSnapshot", variables).then(async (result) => {
-  if (result.status === 200) {
-    if (result.body.data) {
-      const data = result.body.data?.[queryName];
-      State.update({ proposalBlockHeight: data[0].block_height });
-    }
-  }
-});
+// Fetch snapshot data on component mount
+fetchAndSetProposalSnapshot();
 
 let acceptedTermsVersion = Near.block().header.height;
 

@@ -171,7 +171,7 @@ const Comment = ({ commentItem }) => {
   };
   const content = JSON.parse(Social.get(item.path, blockHeight) ?? "null");
   const link = `https://${instanceAccount}.page/proposal/${proposalId}?accountId=${accountId}&blockHeight=${blockHeight}`;
-  const hightlightComment =
+  const highlightComment =
     parseInt(props.blockHeight ?? "") === blockHeight &&
     props.accountId === accountId;
 
@@ -188,7 +188,7 @@ const Comment = ({ commentItem }) => {
         </div>
         <CommentContainer
           id={`${accountId.replace(/[^a-z0-9]/g, "")}${blockHeight}`}
-          style={{ border: hightlightComment ? "2px solid black" : "" }}
+          style={{ border: highlightComment ? "2px solid black" : "" }}
           className="rounded-2 flex-1"
         >
           <Header className="d-flex gap-3 align-items-center p-2 px-3">
@@ -334,7 +334,7 @@ const parseProposalKeyAndValue = (key, modifiedValue, originalValue) => {
           accepted
           <Widget
             src={"${REPL_DEVHUB}/widget/devhub.entity.proposal.AcceptedTerms"}
-            props={{ proposalId: proposalId }}
+            props={{ ...props, proposalId: proposalId }}
           />
         </span>
       );

@@ -909,7 +909,7 @@ const ConsentComponent = useMemo(() => {
                 src={
                   "${REPL_DEVHUB}/widget/devhub.entity.proposal.AcceptedTerms"
                 }
-                props={{ proposalId: proposalId, portal: "DevHub" }}
+                props={{ ...props, proposalId: proposalId, portal: "DevHub" }}
               />
               and commit to honoring it
             </>

@@ -939,6 +939,7 @@ return (
                   }
                   props={{
                     ...props,
+                    instance: props.instance,
                     item: item,
                     notifyAccountId: authorId,
                     id: proposal.id,

@@ -1,4 +1,5 @@
 const options = [
+  { label: "All", value: "" },
   { label: "Most recent", value: "id_desc" }, // proposal_id desc
   { label: "Oldest", value: "id_asc" }, // proposal_id desc
   { label: "Recently updated", value: "ts_desc" }, // timestamp desc

@@ -520,7 +520,7 @@ useEffect(() => {
   }
 }, [props.transactionHashes]);
 
-const DropdowntBtnContainer = styled.div`
+const DropdownBtnContainer = styled.div`
   font-size: 13px;
   min-width: 150px;
 
@@ -670,7 +670,7 @@ const SubmitBtn = () => {
   const selectedOption = btnOptions.find((i) => i.value === selectedStatus);
 
   return (
-    <DropdowntBtnContainer>
+    <DropdownBtnContainer>
       <div
         className="custom-select"
         tabIndex="0"
@@ -722,7 +722,7 @@ const SubmitBtn = () => {
           </div>
         )}
       </div>
-    </DropdowntBtnContainer>
+    </DropdownBtnContainer>
   );
 };
 

@@ -9,5 +9,6 @@
   "REPL_RFP_INDEXER_QUERY_NAME": "polyprogrammist_near_devhub_ic_v1_rfp_snapshots",
   "REPL_PROPOSAL_FEED_INDEXER_QUERY_NAME": "polyprogrammist_near_devhub_ic_v1_proposals_with_latest_snapshot",
   "REPL_PROPOSAL_QUERY_NAME": "polyprogrammist_near_devhub_ic_v1_proposal_snapshots",
-  "REPL_INDEXER_HASURA_ROLE": "polyprogrammist_near"
+  "REPL_INDEXER_HASURA_ROLE": "polyprogrammist_near",
+  "REPL_CACHE_URL": "https://infra-cache-api-rs.fly.dev"
 }
@@ -1,28 +1,15 @@
-const { fetchGraphQL } = VM.require(
-  `${REPL_INFRASTRUCTURE_COMMITTEE}/widget/core.common`
-);
-
 const { href } = VM.require(`${REPL_DEVHUB}/widget/core.lib.url`);
 href || (href = () => {});
 
+const { fetchCacheApi, searchCacheApi } = VM.require(
+  `${REPL_INFRASTRUCTURE_COMMITTEE}/widget/core.common`
+);
+
 const linkedProposals = props.linkedProposals;
 const onChange = props.onChange;
 const [selectedProposals, setSelectedProposals] = useState(linkedProposals);
 const [proposalsOptions, setProposalsOptions] = useState([]);
-const [searchProposalId, setSearchProposalId] = useState("");
-
-const queryName = "${REPL_PROPOSAL_FEED_INDEXER_QUERY_NAME}";
-const query = `query GetLatestSnapshot($offset: Int = 0, $limit: Int = 10, $where: ${queryName}_bool_exp = {}) {
-${queryName}(
-  offset: $offset
-  limit: $limit
-  order_by: {proposal_id: desc}
-  where: $where
-) {
-  name
-  proposal_id
-}
-}`;
+const [textAfterHash, setTextAfterHash] = useState("");
 
 useEffect(() => {
   if (JSON.stringify(linkedProposals) !== JSON.stringify(selectedProposals)) {
@@ -36,70 +23,29 @@ useEffect(() => {
   }
 }, [selectedProposals]);
 
-function separateNumberAndText(str) {
-  const numberRegex = /\d+/;
+function searchProposals(input) {
+  if (state.loading) return;
+  State.update({ loading: true });
 
-  if (numberRegex.test(str)) {
-    const number = str.match(numberRegex)[0];
-    const text = str.replace(numberRegex, "").trim();
-    return { number: parseInt(number), text };
-  } else {
-    return { number: null, text: str.trim() };
-  }
-}
+  searchCacheApi("proposals", input).then((result) => {
+    let proposalsData = result.body.records;
 
-const buildWhereClause = () => {
-  let where = {};
-  const { number, text } = separateNumberAndText(searchProposalId);
-
-  if (number) {
-    where = { proposal_id: { _eq: number }, ...where };
-  }
-
-  if (text) {
-    where = {
-      _or: [
-        { name: { _iregex: `${text}` } },
-        { summary: { _iregex: `${text}` } },
-        { description: { _iregex: `${text}` } },
-      ],
-      ...where,
-    };
-  }
-
-  return where;
-};
-
-const fetchProposals = () => {
-  const FETCH_LIMIT = 30;
-  const variables = {
-    limit: FETCH_LIMIT,
-    offset: 0,
-    where: buildWhereClause(),
-  };
-  if (typeof fetchGraphQL !== "function") {
-    return;
-  }
-  fetchGraphQL(query, "GetLatestSnapshot", variables).then(async (result) => {
-    if (result.status === 200) {
-      if (result.body.data) {
-        const proposalsData = result.body.data?.[queryName];
-        const data = [];
-        for (const prop of proposalsData) {
-          data.push({
-            label: "# " + prop.proposal_id + " : " + prop.name,
-            value: prop.proposal_id,
-          });
-        }
-        setProposalsOptions(data);
-      }
+    const data = [];
+    for (const prop of proposalsData) {
+      data.push({
+        label: "# " + prop.proposal_id + " : " + prop.name,
+        value: prop.proposal_id,
+      });
     }
+    setProposalsOptions(data);
   });
-};
+}
 
 useEffect(() => {
-  fetchProposals();
-}, [searchProposalId]);
+  if (textAfterHash.trim()) {
+    searchProposals(textAfterHash);
+  }
+}, [textAfterHash]);
 
 return (
   <>
@@ -150,7 +96,7 @@ return (
         defaultLabel: "Search proposals",
         searchByValue: true,
         onSearch: (value) => {
-          setSearchProposalId(value);
+          setTextAfterHash(value);
         },
       }}
     />

@@ -1,6 +1,10 @@
-const { RFP_TIMELINE_STATUS, fetchGraphQL, parseJSON } = VM.require(
-  `${REPL_INFRASTRUCTURE_COMMITTEE}/widget/core.common`
-) || { RFP_TIMELINE_STATUS: {}, parseJSON: () => {} };
+const { RFP_TIMELINE_STATUS, parseJSON, fetchCacheApi, searchCacheApi } =
+  VM.require(`${REPL_INFRASTRUCTURE_COMMITTEE}/widget/core.common`) || {
+    RFP_TIMELINE_STATUS: {},
+    parseJSON: () => {},
+    fetchCacheApi: () => {},
+    searchCacheApi: () => {},
+  };
 const { href } = VM.require(`${REPL_DEVHUB}/widget/core.lib.url`);
 href || (href = () => {});
 
@@ -20,69 +24,14 @@ const [allRfpOptions, setAllRfpOptions] = useState([]);
 const [searchRFPId, setSearchRfpId] = useState("");
 const [initialStateApplied, setInitialState] = useState(false);
 
-const queryName = "${REPL_RFP_FEED_INDEXER_QUERY_NAME}";
-const query = `query GetLatestSnapshot($offset: Int = 0, $limit: Int = 10, $where: ${queryName}_bool_exp = {}) {
-  ${queryName}(
-    offset: $offset
-    limit: $limit
-    order_by: {rfp_id: desc}
-    where: $where
-  ) {
-    name
-    rfp_id
-    timeline
-  }
-  }`;
-
-function separateNumberAndText(str) {
-  const numberRegex = /\d+/;
-
-  if (numberRegex.test(str)) {
-    const number = str.match(numberRegex)[0];
-    const text = str.replace(numberRegex, "").trim();
-    return { number: parseInt(number), text };
-  } else {
-    return { number: null, text: str.trim() };
-  }
-}
-
-const buildWhereClause = () => {
-  // show only accepting submissions stage rfps
-  let where = {};
-  const { number, text } = separateNumberAndText(searchRFPId);
-
-  if (number) {
-    where = { rfp_id: { _eq: number }, ...where };
-  }
-
-  if (text) {
-    where = {
-      _or: [
-        { name: { _iregex: `${text}` } },
-        { summary: { _iregex: `${text}` } },
-        { description: { _iregex: `${text}` } },
-      ],
-      ...where,
-    };
-  }
-
-  return where;
-};
-
 const fetchRfps = () => {
-  const FETCH_LIMIT = 30;
-  const variables = {
-    limit: FETCH_LIMIT,
-    offset: 0,
-    where: buildWhereClause(),
-  };
-  if (typeof fetchGraphQL !== "function") {
+  if (typeof searchCacheApi !== "function") {
     return;
   }
-  fetchGraphQL(query, "GetLatestSnapshot", variables).then(async (result) => {
+  searchCacheApi("rfps", searchRFPId).then(async (result) => {
     if (result.status === 200) {
-      if (result.body.data) {
-        const rfpsData = result.body.data?.[queryName];
+      if (result.body.records) {
+        const rfpsData = result.body.records;
         const data = [];
         const acceptingData = [];
         for (const prop of rfpsData) {