Fix #974 Extra infromation on Profile

.eslintrc

@@ -30,6 +30,6 @@
     "@typescript-eslint/no-empty-interface": "warn",
     "react/prop-types": "off",
     "react/no-unknown-property": "warn",
-    "@typescript-eslint/no-var-requires":"off"
+    "@typescript-eslint/no-var-requires": "off"
   }
 }

cypress/support/custom-assertions.ts

@@ -40,7 +40,6 @@ const eqHowto = (chaiObj, utils) => {
       expected.cover_image.name,
     )
 
-
     expected.steps.forEach((step, index) => {
       expect(subject.steps[index], `Have step ${index}`).to.eqHowtoStep(
         step,

functions/package.json

@@ -21,7 +21,7 @@
     "cors": "^2.8.5",
     "dateformat": "^3.0.3",
     "express": "^4.16.4",
-    "firebase-admin": "8.3.0",
+    "firebase-admin": "^8.3.0",
     "firebase-functions": "^3.2.0",
     "fs-extra": "^7.0.1",
     "google-auth-library": "^2.0.1",

functions/src/Integrations/firebase-discord.ts

@@ -30,7 +30,10 @@ export const notifyHowToAccepted = functions.firestore
   .document('v3_howtos/{id}')
   .onWrite(async (change, context) => {
     const info = change.after.exists ? change.after.data() : null
-    if (info === null || info.moderation !== 'accepted') {
+    const prevInfo = change.before.exists ? change.before.data() : null
+    const beenAccepted =
+      prevInfo !== null ? prevInfo.moderation === 'accepted' : null
+    if (info === null || info.moderation !== 'accepted' || beenAccepted) {
       return
     }
     const { _createdBy, title, slug } = info

functions/src/Integrations/firebase-slack.ts

@@ -16,6 +16,9 @@ export const notifyNewPin = functions.firestore
     if (info === null || info.moderation !== 'awaiting-moderation' || prevModeration === 'awaiting-moderation') {
       return
     }
+    if (prevModeration === 'accepted' && info.moderation !== 'awaiting-moderation'){ // If edited after being accepted keep it accepted and avoid message #1008
+      return change.after.ref.parent.child('moderation').set('accepted');
+    }
 
     const id = info._id
     const type = info.type
@@ -42,9 +45,14 @@ export const notifyNewHowTo = functions.firestore
   .document('v3_howtos/{id}')
   .onWrite((change, context) => {
     const info = change.after.exists ? change.after.data() : null
+    const prevInfo = change.before.exists ? change.before.data() : null
+    const prevModeration = (prevInfo !== null) ? prevInfo.moderation : null;
     if (info === null || info.moderation !== 'awaiting-moderation') {
       return
     }
+    if (prevModeration === 'accepted' && info.moderation !== 'awaiting-moderation'){ // If edited after being accepted keep it accepted and avoid message #1008
+      return change.after.ref.parent.child('moderation').set('accepted');
+    }
 
     const user = info._createdBy
     const title = info.title

functions/src/Integrations/user-stats.ts

@@ -0,0 +1,81 @@
+import * as functions from 'firebase-functions'
+import { db } from '../Firebase/firestoreDB'
+
+
+export const countHowTos = functions.firestore
+  .document('v3_howtos/{id}')
+  .onWrite(async (change, context) => {
+
+    updateStats(change, 'v3_howtos', 'howToCount')
+
+  })
+
+export const countEvents = functions.firestore
+  .document('v3_events/{id}')
+  .onWrite(async (change, context) => {
+
+    updateStats(change, 'v3_events', 'eventCount')
+
+  })
+
+function updateStats(change, collection, target){
+
+  const info = change.after.exists ? change.after.data() : null
+  const prevInfo = change.before.exists ? change.before.data() : null
+  const userStatsRef = db.collection('v3_users/');
+
+  let delta = 0
+
+  if (info !== null && info.moderation === 'accepted' && prevInfo !== null && prevInfo.Moderation !== 'accepted') { // Increment if now accepted and previously different
+    delta = 1
+  } else if (prevInfo !== null && prevInfo.moderation === 'accepted' && (info === null || info.moderation !== 'accepted')) { // Decrement if previously accepted and now erased or moderation changed
+    delta = -1
+  } else {
+    return null
+  }
+
+  console.log('Update ', collection, ' delta: ', delta )
+
+  return userStatsRef.doc(info._createdBy).update({'_stats':{
+    [target]: admin.firestore.FieldValue.increment(delta)
+  }}).catch(e => {
+    console.log(e);
+    // In case stats for user are inexistent we compute from all his records, Only triggers if no user exist (new Collection)
+    // computeUserStats(info._createdBy)
+  })
+}
+
+// Compute one user stats
+function computeUserStats(owner){
+
+  const userStatsRef = db.collection('v3_users/')
+
+  db.collection('v3_howtos').where("_createdBy", "==", owner).where("moderation", "==", "accepted")
+  .get()
+  .then(querySnapshot => {
+    let count = 0;
+    querySnapshot.forEach(doc => {
+      count++;
+    });
+    console.log('Accepted howtos for', owner ,',count: ', count);
+    userStatsRef.doc(owner).set({'_stats':{
+      howToCount: count
+    }}, {merge: true});
+    return null
+  }).catch(() => null);
+
+  db.collection('v3_events').where("_createdBy", "==", owner).where("moderation", "==", "accepted")
+  .get()
+  .then(querySnapshot => {
+    let count = 0;
+    querySnapshot.forEach(doc => {
+      count++;
+    });
+    console.log('Accepted events for', owner ,',count: ', count);
+    userStatsRef.doc(owner).set({'_stats':{
+      eventCount: count
+    }}, {merge: true});
+    return null
+  }).catch(() => null);
+}
+

functions/src/index.ts

@@ -5,6 +5,7 @@ import * as IntegrationsSlack from './Integrations/firebase-slack'
 import * as IntegrationsDiscord from './Integrations/firebase-discord'
 import { FirebaseUserBackup } from './Integrations/firebase-userBackup'
 import * as IntegrationsEmail from './Integrations/firebase-email'
+import * as UserStats from './Integrations/user-stats'
 import * as Admin from './admin'
 
 // the following endpoints are exposed for use by various triggers
@@ -23,6 +24,8 @@ exports.notifyHowToAccepted = IntegrationsDiscord.notifyHowToAccepted
 exports.notifyEventAccepted = IntegrationsDiscord.notifyEventAccepted
 exports.firebaseUserBackup = FirebaseUserBackup
 exports.emailNotificationDemo = IntegrationsEmail.notifyEmailDemo
+exports.countEvents = UserStats.countEvents
+exports.countHowTos = UserStats.countHowTos
 // CC Note, 2020-04-40
 // folder-based naming conventions should be encourage from now on
 exports.adminGetUserEmail = Admin.getUserEmail

functions/yarn.lock

@@ -837,9 +837,9 @@ diff@^3.2.0:
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 dot-prop@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.1.0.tgz#bdd8c986a77b83e3fca524e53786df916cabbd8a"
-  integrity sha512-n1oC6NBF+KM9oVXtjmen4Yo7HyAVWV2UUl50dCYJdw2924K6dX9bf9TTTWaKtYlRn0FEtxG27KS80ayVLixxJA==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
+  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
   dependencies:
     is-obj "^2.0.0"
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "precious-plastic-community-platform",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "scripts": {
     "start": "react-app-rewired start",

scripts/build.js

@@ -0,0 +1,190 @@
+'use strict'
+
+// Do this as the first thing so that any code reading it knows the right env.
+process.env.BABEL_ENV = 'production'
+process.env.NODE_ENV = 'production'
+
+// Makes the script crash on unhandled rejections instead of silently
+// ignoring them. In the future, promise rejections that are not handled will
+// terminate the Node.js process with a non-zero exit code.
+process.on('unhandledRejection', err => {
+  throw err
+})
+
+// Ensure environment variables are read.
+require('../config/env')
+
+const path = require('path')
+const chalk = require('react-dev-utils/chalk')
+const fs = require('fs-extra')
+const webpack = require('webpack')
+const bfj = require('bfj')
+const configFactory = require('../config/webpack.config')
+const paths = require('../config/paths')
+const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles')
+const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages')
+const printHostingInstructions = require('react-dev-utils/printHostingInstructions')
+const FileSizeReporter = require('react-dev-utils/FileSizeReporter')
+const printBuildError = require('react-dev-utils/printBuildError')
+
+const measureFileSizesBeforeBuild = FileSizeReporter.measureFileSizesBeforeBuild
+const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild
+const useYarn = fs.existsSync(paths.yarnLockFile)
+
+// These sizes are pretty large. We'll warn for bundles exceeding them.
+const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024
+const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024
+
+const isInteractive = process.stdout.isTTY
+
+// Warn and crash if required files are missing
+if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
+  process.exit(1)
+}
+
+// Process CLI arguments
+const argv = process.argv.slice(2)
+const writeStatsJson = argv.indexOf('--stats') !== -1
+
+// Generate configuration
+const config = configFactory('production')
+
+// We require that you explicitly set browsers and do not fall back to
+// browserslist defaults.
+const { checkBrowsers } = require('react-dev-utils/browsersHelper')
+checkBrowsers(paths.appPath, isInteractive)
+  .then(() => {
+    // First, read the current file sizes in build directory.
+    // This lets us display how much they changed later.
+    return measureFileSizesBeforeBuild(paths.appBuild)
+  })
+  .then(previousFileSizes => {
+    // Remove all content but keep the directory so that
+    // if you're in it, you don't end up in Trash
+    fs.emptyDirSync(paths.appBuild)
+    // Merge with the public folder
+    copyPublicFolder()
+    // Start the webpack build
+    return build(previousFileSizes)
+  })
+  .then(
+    ({ stats, previousFileSizes, warnings }) => {
+      if (warnings.length) {
+        console.log(chalk.yellow('Compiled with warnings.\n'))
+        console.log(warnings.join('\n\n'))
+        console.log(
+          '\nSearch for the ' +
+            chalk.underline(chalk.yellow('keywords')) +
+            ' to learn more about each warning.',
+        )
+        console.log(
+          'To ignore, add ' +
+            chalk.cyan('// eslint-disable-next-line') +
+            ' to the line before.\n',
+        )
+      } else {
+        console.log(chalk.green('Compiled successfully.\n'))
+      }
+
+      console.log('File sizes after gzip:\n')
+      printFileSizesAfterBuild(
+        stats,
+        previousFileSizes,
+        paths.appBuild,
+        WARN_AFTER_BUNDLE_GZIP_SIZE,
+        WARN_AFTER_CHUNK_GZIP_SIZE,
+      )
+      console.log()
+
+      const appPackage = require(paths.appPackageJson)
+      const publicUrl = paths.publicUrl
+      const publicPath = config.output.publicPath
+      const buildFolder = path.relative(process.cwd(), paths.appBuild)
+      printHostingInstructions(
+        appPackage,
+        publicUrl,
+        publicPath,
+        buildFolder,
+        useYarn,
+      )
+    },
+    err => {
+      console.log(chalk.red('Failed to compile.\n'))
+      printBuildError(err)
+      process.exit(1)
+    },
+  )
+  .catch(err => {
+    if (err && err.message) {
+      console.log(err.message)
+    }
+    process.exit(1)
+  })
+
+// Create the production build and print the deployment instructions.
+function build(previousFileSizes) {
+  console.log('Creating an optimized production build...')
+
+  const compiler = webpack(config)
+  return new Promise((resolve, reject) => {
+    compiler.run((err, stats) => {
+      let messages
+      if (err) {
+        if (!err.message) {
+          return reject(err)
+        }
+        messages = formatWebpackMessages({
+          errors: [err.message],
+          warnings: [],
+        })
+      } else {
+        messages = formatWebpackMessages(
+          stats.toJson({ all: false, warnings: true, errors: true }),
+        )
+      }
+      if (messages.errors.length) {
+        // Only keep the first error. Others are often indicative
+        // of the same problem, but confuse the reader with noise.
+        if (messages.errors.length > 1) {
+          messages.errors.length = 1
+        }
+        return reject(new Error(messages.errors.join('\n\n')))
+      }
+      if (
+        process.env.CI &&
+        (typeof process.env.CI !== 'string' ||
+          process.env.CI.toLowerCase() !== 'false') &&
+        messages.warnings.length
+      ) {
+        console.log(
+          chalk.yellow(
+            '\nTreating warnings as errors because process.env.CI = true.\n' +
+              'Most CI servers set it automatically.\n',
+          ),
+        )
+        return reject(new Error(messages.warnings.join('\n\n')))
+      }
+
+      const resolveArgs = {
+        stats,
+        previousFileSizes,
+        warnings: messages.warnings,
+      }
+      if (writeStatsJson) {
+        return bfj
+          .write(paths.appBuild + '/bundle-stats.json', stats.toJson())
+          .then(() => resolve(resolveArgs))
+          .catch(error => reject(new Error(error)))
+      }
+
+      return resolve(resolveArgs)
+    })
+  })
+}
+
+function copyPublicFolder() {
+  fs.copySync(paths.appPublic, paths.appBuild, {
+    dereference: true,
+    filter: file => file !== paths.appHtml,
+  })
+}