feat: support multiple contract filters (#451)

This PR enables support for multiple contract filter support.
near · Dec 14, 2023 · 663d4bc · 663d4bc
1 parent 28bc9f3
commit 663d4bc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/frontend/src/components/Form/IndexerConfigOptionsInputGroup.jsx b/frontend/src/components/Form/IndexerConfigOptionsInputGroup.jsx
@@ -2,7 +2,7 @@ import React, { useContext, useState, useEffect } from "react";
 import { InputGroup, Alert } from "react-bootstrap";
 import Form from "react-bootstrap/Form";
 import { IndexerDetailsContext } from '../../contexts/IndexerDetailsContext';
-import { validateContractId } from "../../utils/validators";
+import { validateContractIds } from "../../utils/validators";
 const  GENESIS_BLOCK_HEIGHT = 9820210;
 const IndexerConfigOptions = ({ updateConfig }) => {
   const { indexerDetails, showPublishModal, isCreateNewIndexer, latestHeight } = useContext(IndexerDetailsContext); 
@@ -31,7 +31,7 @@ const IndexerConfigOptions = ({ updateConfig }) => {
   function handleSetContractFilter(e) {
     const contractFilter = e.target.value;
     setContractFilter(contractFilter);
-    const isContractFilterValid = validateContractId(contractFilter);
+    const isContractFilterValid = validateContractIds(contractFilter);
     setIsContractFilterValid(isContractFilterValid);
   }
 

diff --git a/frontend/src/components/Modals/ForkIndexerModal.jsx b/frontend/src/components/Modals/ForkIndexerModal.jsx
@@ -2,7 +2,6 @@ import React, { useContext, useState } from "react";
 import { Button, Modal, Alert, InputGroup, Form  } from "react-bootstrap";
 import IndexerConfigOptions from "../Form/IndexerConfigOptionsInputGroup";
 import { IndexerDetailsContext } from "../../contexts/IndexerDetailsContext";
-import { validateContractId } from "../../utils/validators";
 
 export const ForkIndexerModal = ({ registerFunction, forkIndexer }) => {
   const {

diff --git a/frontend/src/components/Modals/PublishModal.jsx b/frontend/src/components/Modals/PublishModal.jsx
@@ -2,7 +2,7 @@ import React, { useContext, useState } from "react";
 import { Button, Modal, Alert } from "react-bootstrap";
 import IndexerConfigOptions from "../Form/IndexerConfigOptionsInputGroup";
 import { IndexerDetailsContext } from '../../contexts/IndexerDetailsContext';
-import { validateContractId } from "../../utils/validators";
+import { validateContractIds } from "../../utils/validators";
 
 export const PublishModal = ({
   registerFunction,
@@ -30,7 +30,7 @@ export const PublishModal = ({
       return
     }
 
-    if (!validateContractId(indexerConfig.filter)) {
+    if (!validateContractIds(indexerConfig.filter)) {
       setError( () => "Please provide a valid contract name")
       return
     }

diff --git a/frontend/src/utils/validators.js b/frontend/src/utils/validators.js
@@ -8,3 +8,7 @@ export function validateContractId(accountId) {
   );
 }
 
+export function validateContractIds(accountIds) {
+  const ids = accountIds.split(',').map(id => id.trim());
+  return ids.every(accountId => validateContractId(accountId));
+}