refactor: Query/handle new registry types

near · Feb 20, 2024 · 5d04394 · 5d04394
1 parent 7e56f93
commit 5d04394
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 21 deletions.
diff --git a/frontend/src/components/Editor/EditorButtons.jsx b/frontend/src/components/Editor/EditorButtons.jsx
@@ -83,7 +83,7 @@ const EditorButtons = ({
                 <InputGroup.Text> Contract Filter</InputGroup.Text>
                 <Form.Control
                   disabled={!isCreateNewIndexer}
-                  value={indexerDetails.config.filter}
+                  value={indexerDetails.rule.affected_account_id}
                   type="text"
                   placeholder="social.near"
                   required={true}

diff --git a/frontend/src/components/Form/IndexerConfigOptionsInputGroup.jsx b/frontend/src/components/Form/IndexerConfigOptionsInputGroup.jsx
@@ -23,20 +23,32 @@ const IndexerConfigOptions = ({ updateConfig }) => {
   const [blockHeightError, setBlockHeightError] = useState(null)
 
   useEffect(() => {
-    if (indexerDetails.config?.startBlockHeight) {
+    if (indexerDetails.rule?.affected_account_id) {
+      setContractFilter(indexerDetails.rule.affected_account_id)
+    }
+
+    if (indexerDetails.startBlock?.HEIGHT) {
       setStartBlock(START_BLOCK.HEIGHT)
-      setBlockHeight(indexerDetails.config.startBlockHeight)
+      setBlockHeight(indexerDetails.startBlock.HEIGHT)
+      return;
     }
-    if (indexerDetails.config?.filter) {
-      setContractFilter(indexerDetails.config.filter)
+
+    if (indexerDetails.startBlock == "LATEST") {
+      setStartBlock(START_BLOCK.LATEST)
+      return;
+    }
+
+    if (indexerDetails.startBlock == "CONTINUE") {
+      setStartBlock(START_BLOCK.CONTINUE)
+      return;
     }
   }, [indexerDetails])
 
   const onChangeStartBlock = (e) => {
     setStartBlock(e.target.value)
 
     if (e.target.value === START_BLOCK.CONTINUE) {
-      handleSetContractFilter(indexerDetails.config.filter)
+      handleSetContractFilter(indexerDetails.rule.affected_account_id)
     }
   }
 
@@ -110,7 +122,7 @@ const IndexerConfigOptions = ({ updateConfig }) => {
       <InputGroup size="sm" hasValidation={true} className="pt-3">
         <InputGroup.Text>Contract Filter</InputGroup.Text>
         <Form.Control
-          value={startBlock === START_BLOCK.CONTINUE ? indexerDetails.config.filter : contractFilter}
+          value={startBlock === START_BLOCK.CONTINUE ? indexerDetails.rule.affected_account_id : contractFilter}
           onChange={(e) => handleSetContractFilter(e.target.value)}
           isValid={isContractFilterValid}
           type="text"

diff --git a/frontend/src/components/Logs/LogButtons.jsx b/frontend/src/components/Logs/LogButtons.jsx
@@ -78,7 +78,7 @@ const LogButtons = ({
                 <InputGroup size="sm" style={{ width: "fit-content" }}>
                   <InputGroup.Text> Contract Filter</InputGroup.Text>
                   <Form.Control
-                    value={indexerDetails.config.filter}
+                    value={indexerDetails.rule.affected_account_id}
                     disabled={true}
                     type="text"
                     placeholder="social.near"

diff --git a/frontend/src/contexts/IndexerDetailsContext.js b/frontend/src/contexts/IndexerDetailsContext.js
@@ -22,7 +22,7 @@ import { getLatestBlockHeight } from "../utils/getLatestBlockHeight";
 // }
 
 export const IndexerDetailsContext = React.createContext({
-  indexerDetails: { code: undefined, schema: undefined, config: { filter: "social.near", startBlockHeight: null }, accountId: "", indexerName: "" },
+  indexerDetails: { code: undefined, schema: undefined, rule: { affected_account_id: "social.near" }, startBlock: "LATEST", accountId: "", indexerName: "" },
   showResetCodeModel: false,
   setShowResetCodeModel: () => { },
   showPublishModal: false,
@@ -65,16 +65,13 @@ export const IndexerDetailsProvider = ({ children }) => {
   const requestIndexerDetails = async () => {
     const data = await queryIndexerFunctionDetails(accountId, indexerName);
     if (data) {
-      const indexerConfig = {
-        startBlockHeight: data.start_block_height,
-        filter: data.filter.matching_rule.affected_account_id,
-      }
       const details = {
         accountId: accountId,
         indexerName: indexerName,
         code: wrapCode(data.code),
         schema: data.schema,
-        config: indexerConfig
+        startBlock: data.start_block,
+        rule: data.rule
       }
       return details
     }
@@ -102,7 +99,8 @@ export const IndexerDetailsProvider = ({ children }) => {
         indexerName: indexer.indexerName,
         code: indexer.code,
         schema: indexer.schema,
-        config: indexer.config
+        startBlock: indexer.startBlock,
+        rule: indexer.rule
       }
       setIndexerDetails(details);
     })();

diff --git a/frontend/src/utils/queryIndexerFunction.js b/frontend/src/utils/queryIndexerFunction.js
@@ -8,21 +8,27 @@ const provider = new providers.JsonRpcProvider(
 );
 
 export const queryIndexerFunctionDetails = async (accountId, functionName) => {
-  let args = { account_id: accountId, function_name: functionName };
+  let args = { account_id: accountId };
 
   try {
     const result = await provider.query({
       request_type: "call_function",
       account_id: REGISTRY_CONTRACT,
-      method_name: "read_indexer_function",
+      // TODO Create method to query single indexer
+      method_name: "list_by_account",
       args_base64: Buffer.from(JSON.stringify(args)).toString("base64"),
       finality: "optimistic",
     });
-    return (
-      result.result &&
+
+    const indexers = result.result &&
       result.result.length > 0 &&
-      JSON.parse(Buffer.from(result.result).toString())
-    );
+      JSON.parse(Buffer.from(result.result).toString());
+
+    if (!indexers) {
+      return null;
+    }
+
+    return indexers[functionName];
   } catch (error) {
     console.log(`Could not query indexer function details from registry ${REGISTRY_CONTRACT}, for ${accountId}/${functionName}`)
     console.log(error, "error");