Refactor: similar files between portals (#916)

* refactor: remove duplicate components and core files from events-committee and refer to devhub * fix: DropDownWithSearch path * fix: another broken link * refactor: similar events molecules * fmt --------- Co-authored-by: Peter Salomonsen <[email protected]>
NEAR-DevHub · Oct 27, 2024 · 223d0c8 · 223d0c8
1 parent fe9ecec
commit 223d0c8
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 293 deletions.
diff --git a/instances/devhub.near/widget/devhub/components/molecule/MarkdownEditor.jsx b/instances/devhub.near/widget/devhub/components/molecule/MarkdownEditor.jsx
diff --git a/instances/devhub.near/widget/devhub/components/molecule/SimpleMDE.jsx b/instances/devhub.near/widget/devhub/components/molecule/SimpleMDE.jsx
@@ -30,8 +30,7 @@ const showAccountAutoComplete = props.showAutoComplete ?? false;
 const showProposalIdAutoComplete = props.showProposalIdAutoComplete ?? false;
 const autoFocus = props.autoFocus ?? false;
 
-const queryName =
-  "polyprogrammist_near_devhub_prod_v1_proposals_with_latest_snapshot";
+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
@@ -236,7 +235,7 @@ async function getSuggestedProposals(id) {
   }
   await asyncFetch("https://near-queryapi.api.pagoda.co/v1/graphql", {
     method: "POST",
-    headers: { "x-hasura-role": "polyprogrammist_near" },
+    headers: { "x-hasura-role": "${REPL_INDEXER_HASURA_ROLE}" },
     body: JSON.stringify({
       query: query,
       variables: variables,
@@ -246,7 +245,7 @@ async function getSuggestedProposals(id) {
     .then((res) => {
       const proposals =
         res?.data?.[
-          "polyprogrammist_near_devhub_prod_v1_proposals_with_latest_snapshot"
+          "${REPL_PROPOSAL_FEED_INDEXER_QUERY_NAME}"
         ];
       results = proposals;
     })

diff --git a/instances/devhub.near/widget/devhub/entity/addon/blog/editor/form.jsx b/instances/devhub.near/widget/devhub/entity/addon/blog/editor/form.jsx
@@ -141,7 +141,7 @@ const ContentEditor = ({ content, setContent }) => {
     <div>
       <h5>Content</h5>
       <Widget
-        src="${REPL_DEVHUB}/widget/devhub.components.molecule.MarkdownEditor"
+        src="${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDE"
         props={{ data: { content }, onChange: setContent }}
       />
     </div>

diff --git a/instances/devhub.near/widget/devhub/entity/addon/wiki/Configurator.jsx b/instances/devhub.near/widget/devhub/entity/addon/wiki/Configurator.jsx
@@ -123,7 +123,7 @@ return (
             />
           </div>
           <Widget
-            src="${REPL_DEVHUB}/widget/devhub.components.molecule.MarkdownEditor"
+            src="${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDE"
             props={{ data: { content }, onChange: setContent }}
           />
         </FormContainer>

diff --git a/instances/devhub.near/widget/devhub/entity/post/PostEditor.jsx b/instances/devhub.near/widget/devhub/entity/post/PostEditor.jsx
@@ -566,7 +566,7 @@ const callDescriptionDiv = () => {
         Description
       </label>
       <Widget
-        src={"${REPL_DEVHUB}/widget/devhub.components.molecule.MarkdownEditor"}
+        src={"${REPL_DEVHUB}/widget/devhub.components.molecule.SimpleMDE"}
         props={{
           data: { handler: state.handler, content: state.description },
           onChange: (content) => {

diff --git a/instances/events-committee.near/widget/devhub/components/molecule/DropDown.jsx b/instances/events-committee.near/widget/devhub/components/molecule/DropDown.jsx
diff --git a/instances/events-committee.near/widget/devhub/components/molecule/MarkdownEditor.jsx b/instances/events-committee.near/widget/devhub/components/molecule/MarkdownEditor.jsx
diff --git a/instances/events-committee.near/widget/devhub/components/molecule/MarkdownViewer.jsx b/instances/events-committee.near/widget/devhub/components/molecule/MarkdownViewer.jsx
diff --git a/instances/events-committee.near/widget/devhub/components/molecule/ProfileCard.jsx b/instances/events-committee.near/widget/devhub/components/molecule/ProfileCard.jsx
diff --git a/instances/events-committee.near/widget/devhub/components/molecule/ProfileLine.jsx b/instances/events-committee.near/widget/devhub/components/molecule/ProfileLine.jsx
diff --git a/instances/events-committee.near/widget/devhub/components/organism/Navbar.jsx b/instances/events-committee.near/widget/devhub/components/organism/Navbar.jsx
@@ -66,7 +66,7 @@ const ProfileIcon = () => {
       })}
     >
       <Widget
-        src="${REPL_EVENTS}/widget/devhub.components.molecule.ProfileCard"
+        src="${REPL_DEVHUB}/widget/devhub.components.molecule.ProfileCard"
         props={{ iconOnly: true, accountId: context.accountId || null }}
       />
     </Link>

diff --git a/instances/events-committee.near/widget/devhub/entity/proposal/Editor.jsx b/instances/events-committee.near/widget/devhub/entity/proposal/Editor.jsx
@@ -1020,7 +1020,7 @@ const AmountComponent = useMemo(() => {
 const CurrencyComponent = useMemo(() => {
   return (
     <Widget
-      src="${REPL_EVENTS}/widget/devhub.components.molecule.DropDown"
+      src="${REPL_DEVHUB}/widget/devhub.components.molecule.DropDown"
       props={{
         options: tokensOptions,
         selectedValue: requestedSponsorshipToken,

diff --git a/instances/events-committee.near/widget/devhub/entity/proposal/Proposal.jsx b/instances/events-committee.near/widget/devhub/entity/proposal/Proposal.jsx
@@ -1031,7 +1031,7 @@ return (
                       <div className="mt-2 d-flex flex-column gap-2">
                         <h6 className="mb-0">Proposal Status</h6>
                         <Widget
-                          src="${REPL_EVENTS}/widget/devhub.components.molecule.DropDown"
+                          src="${REPL_DEVHUB}/widget/devhub.components.molecule.DropDown"
                           props={{
                             options: proposalStatusOptions,
                             selectedValue: updatedProposalStatus,

diff --git a/instances/events-committee.near/widget/devhub/page/admin/moderatorsTab.jsx b/instances/events-committee.near/widget/devhub/page/admin/moderatorsTab.jsx
@@ -108,7 +108,7 @@ return (
                 moderators.map((child) => (
                   <Tile className="w-25 p-3 m-1" minHeight={10}>
                     <Widget
-                      src={`${REPL_EVENTS}/widget/devhub.components.molecule.ProfileLine`}
+                      src="${REPL_DEVHUB}/widget/devhub.components.molecule.ProfileLine"
                       props={{ accountId: child }}
                     />
                   </Tile>

diff --git a/instances/infrastructure-committee.near/aliases.mainnet.json b/instances/infrastructure-committee.near/aliases.mainnet.json
@@ -8,5 +8,6 @@
   "REPL_RFP_FEED_INDEXER_QUERY_NAME": "polyprogrammist_near_devhub_ic_v1_rfps_with_latest_snapshot",
   "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_PROPOSAL_QUERY_NAME": "polyprogrammist_near_devhub_ic_v1_proposal_snapshots",
+  "REPL_INDEXER_HASURA_ROLE": "polyprogrammist_near"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,7 +66,7 @@ const ProfileIcon = () => { @@
           })}
         >
           <Widget
-            src="${REPL_EVENTS}/widget/devhub.components.molecule.ProfileCard"
+            src="${REPL_DEVHUB}/widget/devhub.components.molecule.ProfileCard"
             props={{ iconOnly: true, accountId: context.accountId || null }}
           />
         </Link>
@@ Expand Down @@