Merge branch 'staging'

eoscostarica · Aug 25, 2022 · e0b0abd · e0b0abd
2 parents c04c558 + 5839c49
commit e0b0abd
Show file tree

Hide file tree

Showing 37 changed files with 396 additions and 400 deletions.
diff --git a/contracts/rateproducer/include/rateproducer.hpp b/contracts/rateproducer/include/rateproducer.hpp
@@ -516,9 +516,10 @@ namespace eoscostarica {
         *  
         * @param rating_id - Id of the rating,
         * @param comment - Commentary
+        * @param is_eden - is eden member true/false
         *
         */ 
-        void logcomment (uint64_t rating_id, std::string comment);
+        void logcomment (uint64_t rating_id, std::string comment, bool is_eden);
 
         /**
         *
@@ -614,7 +615,7 @@ namespace eoscostarica {
                  action(rminactive, ricardian_contract(rminactive_ricardian)),
                  action(rmrate, user, bp, ricardian_contract(rmrate_ricardian)),
                  action(migrate, ricardian_contract(migrate_ricardian)),
-                 action(logcomment, rating_id, comment, ricardian_contract(logcomment_ricardian)),
+                 action(logcomment, rating_id, comment, is_eden, ricardian_contract(logcomment_ricardian)),
                  action(loglike, rating_id, user, like, ricardian_contract(loglike_ricardian)))
 
 } // namespace eoscostarica
diff --git a/contracts/rateproducer/src/rateproducer.cpp b/contracts/rateproducer/src/rateproducer.cpp
@@ -32,17 +32,17 @@ namespace eoscostarica {
         check( (MINVAL <= development && development <= MAXVAL), "Error development value out of range" );
         check( (MINVAL <= community && community <= MAXVAL), "Error community value out of range" );
 
-        bool isEden = scope.value == eden_scope.value;
-        name stats_ram_payer = isEden ? _self : user;
+        bool is_eden = scope.value == eden_scope.value;
+        name stats_ram_payer = is_eden ? _self : user;
 
         check( is_blockproducer(bp), "votes are allowed only for registered block producers" );
 
         name proxy_name = get_proxy(user);
         if(proxy_name.length()) {
             check(is_active_proxy(proxy_name), "votes are allowed only for active proxies" );
-            if(!isEden) check( MIN_VOTERS <= get_voters(proxy_name), "delegated proxy does not have enough voters" );
+            if(!is_eden) check( MIN_VOTERS <= get_voters(proxy_name), "delegated proxy does not have enough voters" );
         } else {
-            if(!isEden) check( MIN_VOTERS <= get_voters(user), "account does not have enough voters" );
+            if(!is_eden) check( MIN_VOTERS <= get_voters(user), "account does not have enough voters" );
         }
 
         ratings_table_v2 _ratings(_self, scope.value);
@@ -75,7 +75,7 @@ namespace eoscostarica {
                         development);
 
             if(!comment.empty()) {
-                SEND_INLINE_ACTION(*this, logcomment, { {get_self(), name("active")} }, { rating_id, comment });
+                SEND_INLINE_ACTION(*this, logcomment, { {get_self(), name("active")} }, { rating_id, comment, is_eden });
             }
 
         } else {
@@ -115,7 +115,7 @@ namespace eoscostarica {
                             &bp_average);
 
             if(!comment.empty()) {
-                SEND_INLINE_ACTION(*this, logcomment, { {get_self(), name("active")} }, { existing_rating->id, comment });
+                SEND_INLINE_ACTION(*this, logcomment, { {get_self(), name("active")} }, { existing_rating->id, comment, is_eden });
             }
         }
     }
@@ -503,7 +503,7 @@ namespace eoscostarica {
         cfg.set(c, c.owner);
     }
 
-    void rateproducer::logcomment(uint64_t rating_id, std::string comment) {
+    void rateproducer::logcomment(uint64_t rating_id, std::string comment, bool is_eden) {
         require_auth(_self);
         check( comment.length() <= 500, "comment must be less or equal than 500 characters" );
     }

diff --git a/hapi/src/services/hyperion/updaters/rateproducer-logcomment.updater.js b/hapi/src/services/hyperion/updaters/rateproducer-logcomment.updater.js
@@ -1,4 +1,8 @@
-const { eosConfig } = require('../../../config')
+const {
+  eosConfig,
+  generalContractScope,
+  edenContractScope
+} = require('../../../config')
 const { save, updateUserRating } = require('../../comment.service')
 const EosApi = require('eosjs-api')
 
@@ -17,36 +21,22 @@ module.exports = {
     try {
       const {
         transaction_id,
-        data: {
-          data: { rating_id: ratingId, comment }
-        }
+        data: { rating_id: ratingId, comment, is_eden: isEden }
       } = action
-      let userRatings
 
-      userRatings = await eosApi.getTableRows({
+      if (isEden === null) return
+
+      const userRatings = await eosApi.getTableRows({
         json: true,
         code: eosConfig.baseAccount,
-        scope: 'eden',
+        scope: isEden ? edenContractScope : generalContractScope,
         table: 'rating',
         reverse: false,
         limit: 1,
         lower_bound: ratingId,
         upper_bound: ratingId
       })
 
-      if (!userRatings) {
-        userRatings = await eosApi.getTableRows({
-          json: true,
-          code: eosConfig.baseAccount,
-          scope: 'rateproducer',
-          table: 'rating',
-          reverse: false,
-          limit: 1,
-          lower_bound: ratingId,
-          upper_bound: ratingId
-        })
-      }
-
       const [blockProducer] = userRatings.rows.filter(
         ({ id }) => id == ratingId
       )

diff --git a/hapi/src/services/hyperion/updaters/rateproducer-loglike.updater.js b/hapi/src/services/hyperion/updaters/rateproducer-loglike.updater.js
@@ -9,9 +9,7 @@ module.exports = {
       const {
         transaction_id,
         actors,
-        data: {
-          data: { rating_id: ratingId, like }
-        }
+        data: { rating_id: ratingId, like }
       } = action
 
       await saveOrUpdate({

diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql
@@ -1,7 +1,5 @@
 type Mutation {
-  rateProducer(
-    ratingInput: RatingInput!
-  ): RatingOutput
+  rateProducer(ratingInput: RatingInput!): RatingOutput
 }
 
 input RatingInput {
@@ -27,4 +25,3 @@ type deleteUserRateOutput {
 type AddCommentOutput {
   success: Boolean!
 }
-
diff --git a/webapp/src/components/Card/index.js b/webapp/src/components/Card/index.js
@@ -6,7 +6,6 @@ import { useTheme } from '@mui/material/styles'
 import { useTranslation } from 'react-i18next'
 import useMediaQuery from '@mui/material/useMediaQuery'
 import Card from '@mui/material/Card'
-import Box from '@mui/material/Box'
 import CardHeader from '@mui/material/CardHeader'
 import Typography from '@mui/material/Typography'
 import CardActions from '@mui/material/CardActions'
@@ -97,31 +96,31 @@ const CardData = ({
             </Avatar>
           }
           title={
-            <Box className={classes.warningBox}>
-              <Box className={classes.boxTitle}>
+            <div className={classes.warningBox}>
+              <div className={classes.boxTitle}>
                 <Typography className={classes.noWrap} variant='h6'>
                   {title || owner}
                 </Typography>
-              </Box>
-            </Box>
+              </div>
+            </div>
           }
           subheader={
-            <Box className={classes.warningBox}>
+            <div className={classes.warningBox}>
               <Typography className={classes.subTitleHeader}>
                 {owner}
               </Typography>
-              <Box className={classes.moreWrapper}>
+              <div className={classes.moreWrapper}>
                 <Typography style={{ margin: 'auto' }} variant='subtitle2'>
                   {t('view')}
                 </Typography>
                 <KeyboardArrowRightIcon />
-              </Box>
-            </Box>
+              </div>
+            </div>
           }
         />
       </Link>
-      <Box className={classes.radar}>
-        <Box className={classes.blockIcons}>
+      <div className={classes.radar}>
+        <div className={classes.blockIcons}>
           {!title && (
             <TooltipWrapper
               open={open}
@@ -131,8 +130,8 @@ const CardData = ({
               classes={classes}
             />
           )}
-        </Box>
-        <Box className={classes.chartWrapper}>
+        </div>
+        <div className={classes.chartWrapper}>
           <PolarChart
             data={[
               {
@@ -149,11 +148,11 @@ const CardData = ({
               }
             ]}
           />
-        </Box>
+        </div>
         {showOptions && (
           <Grid container justifyContent='center'>
             <Grid item md={4} xs={4}>
-              <Box className={classes.boxValueRates}>
+              <div className={classes.boxValueRates}>
                 <Typography
                   variant='subtitle2'
                   className={clsx(classes.avgText, classes.marginRightElem)}
@@ -163,10 +162,10 @@ const CardData = ({
                 <Typography className={classes.avgValue} variant='body2'>
                   {rate || 0}
                 </Typography>
-              </Box>
+              </div>
             </Grid>
             <Grid item md={4} xs={5}>
-              <Box className={classes.boxValueRates}>
+              <div className={classes.boxValueRates}>
                 <Typography
                   variant='subtitle2'
                   className={clsx(classes.avgText, classes.marginRightElem)}
@@ -176,11 +175,11 @@ const CardData = ({
                 <Typography className={classes.avgValue} variant='body2'>
                   {average}
                 </Typography>
-              </Box>
+              </div>
             </Grid>
           </Grid>
         )}
-      </Box>
+      </div>
       <CardActions className={classes.actions}>
         {useRateButton && (
           <>

diff --git a/webapp/src/components/CommentCard/index.js b/webapp/src/components/CommentCard/index.js
@@ -151,8 +151,8 @@ const CommentCard = ({ producer = {} }) => {
   return (
     <Grid pt={6} container justifyContent='center' md={12}>
       <Grid className={classes.sectionContent} item md={12} xs={12}>
-        <Box className={classes.cardContainer}>
-          <Box display='flex' justifyContent='end' alignItems='center'>
+        <div className={classes.cardContainer}>
+          <div className={classes.container}>
             <Typography flex={1} mt='28px' mb='44px' variant='h6'>
               {t('userComments')} ({comments.length})
             </Typography>
@@ -191,11 +191,11 @@ const CommentCard = ({ producer = {} }) => {
                 </MenuItem>
               ))}
             </Menu>
-          </Box>
-          <Box pl={2}>
+          </div>
+          <div className={classes.commentContainer}>
             {comments.map((comment, index) => (
-              <Box pt='12px' pb='12px' key={index}>
-                <Box display='flex'>
+              <div className={classes.divComment} key={index}>
+                <div className={classes.divUser}>
                   <Typography variant='body2' display='flex' flex={1} mb={2}>
                     {comment.user}
                   </Typography>
@@ -208,14 +208,14 @@ const CommentCard = ({ producer = {} }) => {
                   >
                     <Moment fromNow>{comment.created_at}</Moment>
                   </Typography>
-                </Box>
+                </div>
                 <Typography>{comment.content}</Typography>
                 <Grid container>
                   <Grid item md={8} className={classes.center}>
                     <Box pt={1} display={isMobile ? 'block' : 'flex'}>
                       {Object.entries(comment.user_ratings[0].ratings).map(
                         (param, index) => (
-                          <Box key={index}>
+                          <div key={index}>
                             <Box
                               width={isMobile ? '90px' : 'auto'}
                               display='inline-block'
@@ -231,13 +231,13 @@ const CommentCard = ({ producer = {} }) => {
                             <Typography variant='body4' mr={2}>
                               {param[1]}
                             </Typography>
-                          </Box>
+                          </div>
                         )
                       )}
                     </Box>
                   </Grid>
                   <Grid item md={4} className={classes.box}>
-                    <Box pt={1}>
+                    <div className={classes.divLikes}>
                       <Typography
                         variant='body3'
                         textTransform='uppercase'
@@ -264,13 +264,13 @@ const CommentCard = ({ producer = {} }) => {
                           <ThumbDownIcon className={classes.thumb} />
                         </IconButton>
                       </Typography>
-                    </Box>
+                    </div>
                   </Grid>
                 </Grid>
-              </Box>
+              </div>
             ))}
-          </Box>
-        </Box>
+          </div>
+        </div>
       </Grid>
       <Snackbar
         anchorOrigin={{

diff --git a/webapp/src/components/CommentCard/styles.js b/webapp/src/components/CommentCard/styles.js
@@ -5,6 +5,24 @@ export default theme => ({
   cardContainer: {
     width: '95%'
   },
+  container: {
+    display: 'flex !important',
+    justifyContent: 'end !important',
+    alignItems: 'center !important'
+  },
+  commentContainer: {
+    paddingLeft: 20
+  },
+  divComment: {
+    paddingTop: '12px',
+    paddingBottom: '12px'
+  },
+  divUser: {
+    display: 'flex'
+  },
+  divLikes: {
+    paddingTop: '20px'
+  },
   box: {
     display: 'flex',
     alignItems: 'center',
@@ -26,7 +44,8 @@ export default theme => ({
   },
   btnFilter: {
     color: 'inherit !important',
-    borderRadius: '2px !important'
+    borderRadius: '2px !important',
+    content: ''
   },
   center: {
     margin: 'auto !important',