finish normalizing proposals and proposalsVotes state; create short t…

…oken helper for increased consistency

src/components/ProposalForm/ProposalForm.jsx

@@ -26,6 +26,7 @@ import DraftSaver from "./DraftSaver";
 import { useProposalForm } from "./hooks";
 import usePolicy from "src/hooks/api/usePolicy";
 import {
+  shortRecordToken,
   replaceBlobsByDigestsAndGetFiles,
   replaceImgDigestByBlob
 } from "src/helpers";
@@ -372,7 +373,7 @@ const ProposalFormWrapper = ({
               : proposalState === PROPOSAL_STATE_VETTED
               ? ""
               : "/unvetted"
-          }/${proposalToken.substring(0, 7)}`
+          }/${shortRecordToken(proposalToken)}`
         );
         resetForm();
       } catch (e) {

src/components/ProposalsList/ProposalsList.jsx

@@ -2,6 +2,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import { Text, classNames, useTheme, getThemeProperty } from "pi-ui";
 import styles from "./ProposalsList.module.css";
+import { shortRecordToken } from "src/helpers";
 import ProposalItem from "./ProposalItem";
 import LoadingPlaceholders from "src/components/LoadingPlaceholders";
 import ContentLoader from "react-content-loader";
@@ -41,7 +42,7 @@ const ProposalsList = ({ data: { proposals, voteSummaries } }) => {
               proposal={proposal}
               voteSummary={
                 voteSummaries[
-                  proposals[index]?.censorshiprecord.token.substring(0, 7)
+                  shortRecordToken(proposals[index]?.censorshiprecord.token)
                 ]
               }
             />

src/components/RecordsView/RecordsView.jsx

@@ -4,6 +4,7 @@ import LazyList from "src/components/LazyList";
 import { getRecordsByTabOption } from "./helpers";
 import HelpMessage from "src/components/HelpMessage";
 import { useConfig } from "src/containers/Config";
+import { shortRecordToken } from "src/helpers";
 import { NOJS_ROUTE_PREFIX, PROPOSAL_STATUS_CENSORED } from "src/constants";
 
 const LoadingPlaceholders = ({ numberOfItems, placeholder }) => {
@@ -16,13 +17,7 @@ const LoadingPlaceholders = ({ numberOfItems, placeholder }) => {
 };
 
 const getFilteredRecordsAndToken = (records, tokens, tab, filterCensored) => {
-  console.log("getFilteredRecordsAndToken")
-  // const tokens = fullTokens.map((token) => token.substring(0, 7));
-  console.log(tokens)
-  console.log(records)
-  const filteredTokens = tokens[tab].map((token) => token.substring(0, 7));
-  console.log("filteredTokens")
-  console.log(filteredTokens)
+  const filteredTokens = tokens[tab].map((token) => shortRecordToken(token));
   let filteredRecords =
     (records &&
       filteredTokens &&

src/containers/Invoice/Detail/InvoiceDetails.jsx

@@ -1,6 +1,7 @@
 import React, { useState, memo } from "react";
 import { Spinner, Text, H4, Table, Link as UiLink, classNames } from "pi-ui";
 import Link from "src/components/Link";
+import { shortRecordToken } from "src/helpers";
 import { useInvoices } from "./hooks";
 import { formatCentsToUSD } from "src/utils";
 import useAdminInvoices from "src/hooks/api/useAdminInvoices";
@@ -16,7 +17,7 @@ const printInvoiceInfo = ({
   Date: `${month}/${year}`,
   Invoice: (
     <Link to={`/invoices/${token}`} className={styles.invoiceLinkWrapper}>
-      <Text color="primary">{token.substring(0, 7)}</Text>
+      <Text color="primary">{shortRecordToken(token)}</Text>
     </Link>
   ),
   "Total (USD)": formatCentsToUSD(total)

src/containers/Proposal/Detail/hooks.js

@@ -8,6 +8,7 @@ import {
   getTokensForProposalsPagination
 } from "../helpers";
 import { getDetailsFile } from "./helpers";
+import { shortRecordToken } from "src/helpers";
 import { PROPOSAL_STATE_VETTED } from "src/constants";
 import useFetchMachine from "src/hooks/utils/useFetchMachine";
 import isEmpty from "lodash/fp/isEmpty";
@@ -23,11 +24,11 @@ const getUnfetchedVoteSummaries = (proposal, voteSummaries) => {
   const rfpLinks = getProposalRfpLinksTokens(proposal);
   const proposalToken = getProposalToken(proposal);
   const tokens = concat(rfpLinks || [])(proposalToken);
-  // compare tokens by substring
+  // compare tokens by short form
   return tokens.filter(
     (t) =>
       !keys(voteSummaries).some(
-        (vs) => vs.substring(0, 7) === t.substring(0, 7)
+        (vs) => shortRecordToken(vs) === shortRecordToken(t)
       )
   );
 };
@@ -42,7 +43,7 @@ const getProposalRfpLinksTokens = (proposal) => {
 };
 
 export function useProposal(token, proposalState, threadParentID) {
-  const tokenShort = token.substring(0, 7);
+  const tokenShort = shortRecordToken(token);
   const onFetchProposalDetails = useAction(act.onFetchProposalDetails);
   const onFetchProposalsBatch = useAction(act.onFetchProposalsBatch);
   const onFetchProposalsVoteSummary = useAction(
@@ -69,7 +70,7 @@ export function useProposal(token, proposalState, threadParentID) {
       proposals: values(pick(proposals, rfpLinks)),
       voteSummaries: pick(
         voteSummaries,
-        rfpLinks.map((l) => l.substring(0, 7))
+        rfpLinks.map((l) => shortRecordToken(l))
       )
     };
 

src/containers/Proposal/Vetted/Vetted.jsx

@@ -40,9 +40,6 @@ const VettedProposals = ({ TopBanner, PageDetails, Sidebar, Main }) => {
     proposalPageSize: 4
   });
 
-  console.log("proposals")
-  console.log(proposals)
-
   // TODO: remove legacy
   const { legacyProposals, legacyProposalsTokens } = useLegacyVettedProposals(
     !hasMoreProposals,

src/containers/Proposal/helpers.js

@@ -27,7 +27,7 @@ import {
   INELIGIBLE,
   PROPOSAL_PAGE_SIZE
 } from "../../constants";
-import { getTextFromIndexMd } from "src/helpers";
+import { getTextFromIndexMd, shortRecordToken } from "src/helpers";
 import set from "lodash/fp/set";
 import values from "lodash/fp/values";
 import pick from "lodash/pick";
@@ -284,7 +284,7 @@ export const getProposalToken = (proposal) =>
 export const getProposalUrl = (token, isJsEnabled, state) => {
   const stateStr = state === PROPOSAL_STATE_VETTED ? "" : "/unvetted";
   return isJsEnabled
-    ? `/record${stateStr}/${token.substring(0, 7)}`
+    ? `/record${stateStr}/${shortRecordToken(token)}`
     : `${NOJS_ROUTE_PREFIX}/record${stateStr}/${token}`;
 };
 
@@ -298,7 +298,7 @@ export const getProposalUrl = (token, isJsEnabled, state) => {
 export const getCommentsUrl = (token, isJsEnabled, state) => {
   const stateStr = state === PROPOSAL_STATE_VETTED ? "" : "/unvetted";
   return isJsEnabled
-    ? `/record${stateStr}/${token.substring(0, 7)}?scrollToComments=true`
+    ? `/record${stateStr}/${shortRecordToken(token)}?scrollToComments=true`
     : `${NOJS_ROUTE_PREFIX}/record${stateStr}/${token}?scrollToComments=true`;
 };
 

src/containers/Proposal/hooks/useProposalURLs.js

@@ -4,6 +4,7 @@ import { getProposalUrl, getCommentsUrl, getAuthorUrl } from "../helpers";
 import { ARCHIVE_URL } from "src/constants";
 import * as sel from "src/selectors";
 import { useSelector } from "src/redux";
+import { shortRecordToken } from "src/helpers";
 import { PROPOSAL_STATE_VETTED } from "src/constants";
 
 export default function useProposalURLs(
@@ -19,15 +20,14 @@ export default function useProposalURLs(
   const isLegacy = legacyProposals.includes(proposalToken);
   const proposalURL = !isLegacy
     ? getProposalUrl(proposalToken, javascriptEnabled, state, isLegacy)
-    : `${ARCHIVE_URL}proposals/${proposalToken.substring(0, 7)}`;
+    : `${ARCHIVE_URL}proposals/${shortRecordToken(proposalToken)}`;
   const commentsURL = useMemo(
     () =>
       !isLegacy
         ? getCommentsUrl(proposalToken, javascriptEnabled, state)
-        : `${ARCHIVE_URL}proposals/${proposalToken.substring(
-            0,
-            7
-          )}?scrollToComments=true`,
+        : `${ARCHIVE_URL}proposals/${
+          shortRecordToken(proposalToken)
+        }?scrollToComments=true`,
     [isLegacy, javascriptEnabled, proposalToken, state]
   );
   const authorURL = useMemo(() => getAuthorUrl(userid, javascriptEnabled), [

src/helpers.js

@@ -57,12 +57,16 @@ export const digest = (payload) => sha3_256(payload);
 export const utoa = (str) => window.btoa(unescape(encodeURIComponent(str)));
 export const atou = (str) => decodeURIComponent(escape(window.atob(str)));
 
+// shortToken receives a full lengthed record token and parses to its short
+// form
+export const shortRecordToken = (token) => token.substring(0, 7);
+
 // parseReceivedProposalsMap iterates over BE returned proposals map[token] => proposal, parses the
 // metadata file & the proposal statuses
 export const parseReceivedProposalsMap = (proposals) => {
   const parsedProps = {};
   for (const [token, prop] of Object.entries(proposals)) {
-    parsedProps[token.substring(0, 7)] = parseRawProposal(prop);
+    parsedProps[shortRecordToken(token)] = parseRawProposal(prop);
   }
   return parsedProps;
 };

src/hooks/api/useLegacyVettedProposals.js

@@ -5,6 +5,7 @@ import {
   PROPOSAL_VOTING_REJECTED,
   PROPOSAL_VOTING_INELIGIBLE
 } from "src/constants";
+import { shortRecordToken } from "src/helpers";
 import legacyProposalsInfo from "src/legacyproposals.json";
 import tokenInventory from "src/legacytokeninventory.json";
 
@@ -30,38 +31,34 @@ export default function useLegacyVettedProposals(shouldReturn = false, status) {
   const [legacyProposals, setLegacyProposals] = useState([]);
   const [legacyProposalsTokens, setLegacyProposalsTokens] = useState({});
   useEffect(() => {
-    console.log("----- useLegacyVettedProposals -------")
     // shouldReturn is a boolean to control when the proposals are done fetching so we can return the legacy props.
     if (shouldReturn) {
-      const proposalsTokensList = 
+      const proposalsTokensList =
         tokenInventory[mapStatusToString[status]] &&
         tokenInventory[mapStatusToString[status]]
-        .map((token) => token.substring(0, 7));
-      console.log("proposalsTokensList")
-      console.log(proposalsTokensList)
+        .map((token) => shortRecordToken(token));
       // filter propsals by tab and transform from Array to Object where the key is the proposal token and the value is the proposal info
       const finalList = newLegacyProposalsInfo
         .filter(
           (p) =>
             proposalsTokensList &&
             proposalsTokensList.includes(
-              p.censorshiprecord.token.substring(0, 7)
+              shortRecordToken(p.censorshiprecord.token)
             )
         )
         .reduce(
-          (acc, cur) => ({ ...acc, [cur.censorshiprecord.token.substring(0, 7)]: cur }),
+          (acc, cur) => ({
+            ...acc,
+            [shortRecordToken(cur.censorshiprecord.token)]: cur
+          }),
           {}
         );
-      console.log("final list")
-      console.log(finalList)
       setLegacyProposals(finalList);
       setLegacyProposalsTokens(tokenInventory);
     } else {
       setLegacyProposals([]);
       setLegacyProposalsTokens({});
     }
-    console.log("----- ------------------------ -------")
-
   }, [legacyProposals.proposals, shouldReturn, status]);
   return { legacyProposals, legacyProposalsTokens };
 }

src/hooks/api/useProposalsBatch.js

@@ -20,6 +20,7 @@ import flow from "lodash/fp/flow";
 import isEmpty from "lodash/fp/isEmpty";
 import keys from "lodash/fp/keys";
 import difference from "lodash/fp/difference";
+import { shortRecordToken } from "src/helpers";
 import {
   PROPOSAL_STATE_VETTED,
   PROPOSAL_STATE_UNVETTED,
@@ -50,8 +51,7 @@ const getRfpSubmissions = (proposals) =>
 
 const getUnfetchedTokens = (proposals, tokens) =>
   difference(
-    tokens.map((token) => token.substring(0, 7))
-    // tokens
+    tokens.map((token) => shortRecordToken(token))
   )(keys(proposals));
 
 const getCurrentPage = (tokens) => {

src/reducers/models/proposalVotes.js

@@ -7,6 +7,7 @@ import {
   PROPOSAL_VOTING_NOT_AUTHORIZED,
   PROPOSAL_VOTING_ACTIVE
 } from "../../constants";
+import { shortRecordToken } from "src/helpers";
 import votesstatus from "src/legacyvotestatuses";
 
 const DEFAULT_STATE = {
@@ -26,15 +27,15 @@ const DEFAULT_STATE = {
     .reduce(
       (acc, cur) => ({
         ...acc,
-        [cur.token]: cur
+        [shortRecordToken(cur.token)]: cur
       }),
       {}
     ),
   bestBlock: null
 };
 
 const receiveVoteStatusChange = (state, token, newStatus) =>
-  update(["byToken", token.substring(0, 7)], (voteSummary) => ({
+  update(["byToken", shortRecordToken(token)], (voteSummary) => ({
     ...voteSummary,
     status: newStatus
   }))(state);
@@ -54,8 +55,8 @@ const proposalVotes = (state = DEFAULT_STATE, action) =>
             const normalizedSummaries = keys.reduce(
               (acc, key) => ({
                 ...acc,
-                [key.substring(0, 7)]: {
-                  ...state.byToken[key.substring(0, 7)],
+                [shortRecordToken(key)]: {
+                  ...state.byToken[shortRecordToken(key)],
                   ...action.payload.summaries[key]
                 }
               }),
@@ -71,7 +72,7 @@ const proposalVotes = (state = DEFAULT_STATE, action) =>
           },
           [act.RECEIVE_VOTES_DETAILS]: () => {
             return update(
-              ["byToken", action.payload.token.substring(0, 7)],
+              ["byToken", shortRecordToken(action.payload.token)],
               (voteSummary) => ({
                 ...voteSummary,
                 details: {
@@ -83,7 +84,7 @@ const proposalVotes = (state = DEFAULT_STATE, action) =>
           },
           [act.RECEIVE_PROPOSAL_VOTE_RESULTS]: () => {
             return update(
-              ["byToken", action.payload.token.substring(0, 7)],
+              ["byToken", shortRecordToken(action.payload.token)],
               (voteSummary) => ({
                 ...voteSummary,
                 votes: action.payload.votes

src/reducers/models/proposals.js

@@ -20,6 +20,7 @@ import {
   PROPOSAL_STATE_UNVETTED
 } from "../../constants";
 import {
+  shortRecordToken,
   getIndexMdFromText,
   parseReceivedProposalsMap,
   parseRawProposal
@@ -52,7 +53,7 @@ const DEFAULT_STATE = {
   numOfProposalsByUserId: {},
   // TODO: remove legacy
   legacyProposals: legacyProposals.proposals.map(
-    (p) => p.censorshiprecord.token
+    (p) => shortRecordToken(p.censorshiprecord.token)
   ),
   newProposalToken: null
 };
@@ -79,9 +80,6 @@ const mapReviewStatusToTokenInventoryStatus = (status, state) => {
 
 const proposalToken = (proposal) => proposal.censorshiprecord.token;
 
-const shortProposalToken = (proposal) =>
-  proposalToken(proposal).substring(0, 7);
-
 const proposalIndexFile = (name = "", description = "") =>
   getIndexMdFromText([name, description].join("\n\n"));
 
@@ -146,7 +144,12 @@ const proposals = (state = DEFAULT_STATE, action) =>
             update("allByRecordStatus", updateInventory(action.payload))(state),
           [act.RECEIVE_EDIT_PROPOSAL]: () =>
             set(
-              ["byToken", shortProposalToken(action.payload.proposal)],
+              [
+                "byToken",
+                shortRecordToken(
+                  action.payload.proposal.censorshiprecord.token
+                )
+              ],
               parseRawProposal(action.payload.proposal)
             )(state),
           [act.RECEIVE_NEW_PROPOSAL]: () => {

src/selectors/models/comments.js

@@ -1,5 +1,6 @@
 import { createSelector } from "reselect";
 import get from "lodash/fp/get";
+import { shortRecordToken } from "src/helpers";
 
 export const commentsByToken = get(["comments", "comments", "byToken"]);
 export const accessTimeByToken = get([
@@ -19,7 +20,7 @@ const getCommentsByToken = (token) => (commentsByToken) => {
   const commentsTokens = Object.keys(commentsByToken);
   // check if the provided token is prefix of original token
   const matchedTokenByPrefix = commentsTokens.find(
-    (key) => key.substring(0, 7) === token
+    (key) => shortRecordToken(key) === token
   );
   return commentsByToken[matchedTokenByPrefix];
 };

src/selectors/models/proposalVotes.js

@@ -1,6 +1,7 @@
 import { createSelector } from "reselect";
 import get from "lodash/fp/get";
 import keys from "lodash/keys";
+import { shortRecordToken } from "src/helpers";
 
 export const summaryByToken = get(["proposalVotes", "byToken"]);
 
@@ -9,7 +10,7 @@ export const bestBlock = get(["proposalVotes", "bestBlock"]);
 export const makeGetProposalVoteSummary = (token) =>
   createSelector(summaryByToken, (summary) => {
     const tokenFromSummary = keys(summary).find(
-      (s) => s.substring(0, 7) === token.substring(0, 7)
+      (s) => shortRecordToken(s) === shortRecordToken(token)
     );
     return summary[tokenFromSummary];
   });