🤖 Release PR

.all-contributorsrc

@@ -215,10 +215,20 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "NoHara42",
+      "name": "Ned O'Hara",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43496778?v=4",
+      "profile": "https://github.com/NoHara42",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "projectName": "community-platform",
   "projectOwner": "ONEARMY",
   "repoType": "github",
-  "repoHost": "https://github.com"
+  "repoHost": "https://github.com",
+  "commitConvention": "angular"
 }

.circleci/config.yml

@@ -17,6 +17,8 @@ orbs:
   browser-tools: circleci/browser-tools@1.1.3
   # used to enable slack integration (required api key set in environment)
   slack: circleci/slack@4.4.2
+  # used to track coverage
+  codecov: codecov/codecov@3.2.4
 
 ######################################################################################################
 #  Aliases - code snippets that can be included inline in any other markup
@@ -284,6 +286,12 @@ jobs:
       - run:
           # NOTE - run-in-band to try reduce memory leaks (https://github.com/facebook/jest/issues/7874)
           command: yarn run test:unit:ci && yarn run test:components
+      - store_artifacts:
+          path: coverage
+      - store_artifacts:
+          path: packages/components/coverage
+      - codecov/upload
+
   test_circular_dependency:
     docker: *docker
     steps:
@@ -295,6 +303,7 @@ jobs:
           command: yarn workspaces focus one-army-community-platform
       - run:
           command: yarn run test:madge
+
   build:
     <<: *docker_matrix
     environment:

README.md

@@ -85,6 +85,7 @@ Thanks go to these wonderful people ([emoji key](https://allcontributors.org/doc
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="http://devtato.com"><img src="https://avatars.githubusercontent.com/u/4504330?v=4?s=60" width="60px;" alt="Devtato"/><br /><sub><b>Devtato</b></sub></a><br /><a href="https://github.com/ONEARMY/community-platform/commits?author=cerkiewny" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/NoHara42"><img src="https://avatars.githubusercontent.com/u/43496778?v=4?s=60" width="60px;" alt="Ned O'Hara"/><br /><sub><b>Ned O'Hara</b></sub></a><br /><a href="https://github.com/ONEARMY/community-platform/commits?author=NoHara42" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

functions/src/emailNotifications/createEmail.ts

@@ -13,6 +13,7 @@ const getResourceLabelFromNotificationType = (type: NotificationType) => {
       return 'research'
     case 'howto_useful':
     case 'howto_mention':
+    case 'new_comment':
       return 'how-to'
   }
 }

functions/src/emailNotifications/index.ts

@@ -1,8 +1,41 @@
 import * as functions from 'firebase-functions'
 import { createNotificationEmails } from './createEmail'
+import { db } from '../Firebase/firestoreDB'
+import { DB_ENDPOINTS, IUserDB } from '../models'
 
 /** Trigger daily process to send any pending email notifications */
 exports.sendDaily = functions.pubsub
   // Trigger daily at 5pm (https://crontab.guru/#0_17_*_*_*)
   .schedule('0 17 * * *')
   .onRun(async () => createNotificationEmails())
+
+exports.sendOnce = functions.https.onCall(async (_, context) => {
+  if (!context.auth) {
+    throw new functions.https.HttpsError(
+      'failed-precondition',
+      'The function must be called while authenticated.',
+    )
+  }
+  // Validate user exists and has admin status before triggering function.
+  const { uid } = context.auth
+  const user = await db.collection(DB_ENDPOINTS.users).doc(uid).get()
+  if (user.exists) {
+    const { userRoles } = user.data() as IUserDB
+    if (userRoles?.some((role) => ['admin', 'super-admin'].includes(role))) {
+      try {
+        await createNotificationEmails()
+        return 'OK'
+      } catch (error) {
+        console.error(error)
+        throw new functions.https.HttpsError(
+          'internal',
+          'There was an error creating emails.',
+        )
+      }
+    }
+  }
+  throw new functions.https.HttpsError(
+    'permission-denied',
+    'Emails can be triggered by admins only.',
+  )
+})

package.json

@@ -41,7 +41,7 @@
     "test": "yarn workspace oa-cypress start",
     "test:components": "yarn workspace oa-components test",
     "test:unit": "env-cmd -e cra craco test --env=jsdom",
-    "test:unit:ci": "yarn build:themes && yarn build:components && env-cmd -e cra craco test --env=jsdom --runInBand --logHeapUsage",
+    "test:unit:ci": "yarn build:themes && yarn build:components && env-cmd -e cra craco test --env=jsdom --runInBand --logHeapUsage --coverage",
     "test:madge": "npx madge --circular --extensions ts,tsx ./ --exclude src/stores",
     "storybook": "yarn workspace oa-components start",
     "storybook:build": "yarn build:themes && yarn workspace oa-components build:sb",

packages/components/.gitignore

@@ -1,3 +1,4 @@
 node_modules
 storybook-static
-dist
+dist
+coverage

packages/components/package.json

@@ -14,7 +14,7 @@
     "dev": "tsc --watch",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx src --color",
     "new-component": "ts-node scripts/newComponent.ts",
-    "test": "vitest"
+    "test": "vitest --coverage"
   },
   "dependencies": {
     "@emotion/react": "^11.10.6",
@@ -36,7 +36,7 @@
     "storybook": "^7.0.4",
     "theme-ui": "^0.15.7",
     "use-debounce": "^8.0.4",
-    "webpack": "^5.75.0",
+    "webpack": "5.76.0",
     "yup": "^1.1.1"
   },
   "peerDependencies": {
@@ -56,6 +56,7 @@
     "@types/react-flag-icon-css": "^1.0.5",
     "@types/react-portal": "^4.0.4",
     "@vitejs/plugin-react": "^3.1.0",
+    "@vitest/coverage-c8": "^0.30.1",
     "babel-loader": "8.1.0",
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.25.4",
@@ -67,6 +68,6 @@
     "react-dom": "^17.0.2",
     "ts-node": "^10.7.0",
     "typescript": "^4.5.5",
-    "vitest": "^0.29.5"
+    "vitest": "^0.30.1"
   }
 }

packages/components/src/Button/Button.tsx

@@ -11,6 +11,7 @@ export interface IBtnProps extends React.ButtonHTMLAttributes<HTMLElement> {
   small?: boolean
   large?: boolean
   showIconOnly?: boolean
+  iconColor?: string
 }
 
 type ToArray<Type> = [Type] extends [any] ? Type[] : never
@@ -112,7 +113,7 @@ export const Button = (props: BtnProps) => {
             pointerEvents: 'none',
           }}
         >
-          <Icon glyph={props.icon} />
+          <Icon glyph={props.icon} color={props.iconColor} />
         </Flex>
       )}
       <Text

packages/components/src/Icon/Icon.tsx

@@ -115,15 +115,13 @@ const IconWrapper = styled.div<Props>`
   min-width: ${(props) => (props.size ? `${props.size}px` : '32px')};
   min-height: ${(props) => (props.size ? `${props.size}px` : '32px')};
   position: relative;
-  color: ${(props) => (props.color ? `${props.color}` : 'inherit')};
-  ${verticalAlign}
-  ${space}
-
-  ${(props) =>
+  color: ${(props) => props.color || 'inherit'};
+  ${verticalAlign} ${space}
+    ${(props) =>
     props.onClick &&
     `
     cursor: pointer;
-  `}
+  `};
 `
 
 const sizeMap = {

packages/components/src/UserStatistics/__snapshots__/UserStatistics.test.tsx.snap

@@ -12,7 +12,7 @@ exports[`UserStatistics > renders correctly 1`] = `
         class="css-i1ihic-Box"
       >
         <div
-          class="css-sqxgz6"
+          class="css-gz1tr0"
           size="22"
         >
           <img
@@ -35,7 +35,7 @@ exports[`UserStatistics > renders correctly 1`] = `
           class="css-i1ihic-Box"
         >
           <div
-            class="css-sqxgz6"
+            class="css-gz1tr0"
             size="22"
           >
             <svg
@@ -64,7 +64,7 @@ exports[`UserStatistics > renders correctly 1`] = `
         class="css-i1ihic-Box"
       >
         <div
-          class="css-sqxgz6"
+          class="css-gz1tr0"
           size="22"
         >
           <img

packages/components/vite.config.mts

@@ -8,5 +8,9 @@ export default defineConfig({
     environment: 'jsdom',
     globals: true,
     setupFiles: './src/tests/setup.ts',
+    coverage: {
+      provider: 'c8',
+      reporter: ['text', 'json', 'html'],
+    },
   },
 })

packages/themes/src/common/colors.ts

@@ -0,0 +1,21 @@
+export const commonColors = {
+  white: 'white',
+  offwhite: '#ececec',
+  black: '#1b1b1b',
+  softyellow: '#f5ede2',
+  blue: '#83ceeb',
+  red: '#eb1b1f',
+  red2: '#f58d8e',
+  softblue: '#e2edf7',
+  bluetag: '#5683b0',
+  grey: '#61646b',
+  green: '#00c3a9',
+  error: 'red',
+  background: '#f4f6f7',
+  silver: '#c0c0c0',
+  softgrey: '#c2d4e4',
+  lightgrey: '#ababac',
+  darkGrey: '#686868',
+  subscribed: 'orange',
+  notSubscribed: '#1b1b1b',
+}

packages/themes/src/fixing-fashion/styles.ts

@@ -1,3 +1,4 @@
+import { commonColors } from './../common/colors'
 import type { ThemeWithName } from '../types'
 import spaceBadge from '../../assets/images/themes/fixing-fashion/avatar_space_lg.svg'
 import memberBadgeLowDetail from '../../assets/images/themes/fixing-fashion/avatar_member_sm.svg'
@@ -12,25 +13,9 @@ const fonts = {
 
 // use enum to specify list of possible colors for typing
 export const colors = {
-  white: 'white',
-  offwhite: '#ececec',
-  black: '#1b1b1b',
+  ...commonColors,
   primary: 'green',
-  softyellow: '#f5ede2',
   yellow: { base: '#E95628', hover: 'hsl(14, 81%, 43%)' },
-  blue: '#83ceeb',
-  red: '#eb1b1f',
-  red2: '#f58d8e',
-  softblue: '#e2edf7',
-  bluetag: '#5683b0',
-  grey: '#61646b',
-  green: '#00c3a9',
-  error: 'red',
-  background: '#f4f6f7',
-  silver: '#c0c0c0',
-  softgrey: '#c2d4e4',
-  lightgrey: '#ababac',
-  darkGrey: '#686868',
 }
 
 export const zIndex = {

packages/themes/src/precious-plastic/styles.ts

@@ -1,3 +1,4 @@
+import { commonColors } from './../common/colors'
 import memberBadgeLowDetail from '../../assets/images/themes/precious-plastic/avatar_member_sm.svg'
 import memberBadgeHighDetail from '../../assets/images/themes/precious-plastic/avatar_member_lg.svg'
 import CollectionBadge from '../../assets/images/badges/pt-collection-point.svg'
@@ -20,25 +21,9 @@ const fonts = {
 
 // use enum to specify list of possible colors for typing
 export const colors = {
-  white: 'white',
-  offwhite: '#ececec',
-  black: '#1b1b1b',
+  ...commonColors,
   primary: 'red',
-  softyellow: '#f5ede2',
   yellow: { base: '#fee77b', hover: '#ffde45' },
-  blue: '#83ceeb',
-  red: '#eb1b1f',
-  red2: '#f58d8e',
-  softblue: '#e2edf7',
-  bluetag: '#5683b0',
-  grey: '#61646b',
-  green: '#00c3a9',
-  error: 'red',
-  background: '#f4f6f7',
-  silver: '#c0c0c0',
-  softgrey: '#c2d4e4',
-  lightgrey: '#ababac',
-  darkGrey: '#686868',
 }
 
 export const zIndex = {

packages/themes/src/project-kamp/styles.ts

@@ -3,29 +3,14 @@ import memberBadgeHighDetail from '../../assets/images/themes/project-kamp/avata
 import logo from '../../assets/images/themes/project-kamp/project-kamp-header.png'
 import type { ThemeWithName } from '../types'
 import { getButtons } from '../common/button'
+import { commonColors } from '../common/colors'
 export type { ButtonVariants } from '../common/button'
 
 // use enum to specify list of possible colors for typing
 export const colors = {
-  white: 'white',
-  offwhite: '#ececec',
-  black: '#1b1b1b',
+  ...commonColors,
   primary: 'green',
-  softyellow: '#f5ede2',
   yellow: { base: '#8ab57f', hover: 'hsl(108, 25%, 68%)' },
-  blue: '#83ceeb',
-  red: '#eb1b1f',
-  red2: '#f58d8e',
-  softblue: '#e2edf7',
-  bluetag: '#5683b0',
-  grey: '#61646b',
-  green: '#00c3a9',
-  error: 'red',
-  background: '#f4f6f7',
-  silver: '#c0c0c0',
-  softgrey: '#c2d4e4',
-  lightgrey: '#ababac',
-  darkGrey: '#686868',
 }
 
 export const zIndex = {

packages/themes/src/types/index.ts

@@ -97,6 +97,8 @@ export interface ThemeWithName {
     offwhite: string
     lightgrey: string
     darkGrey: string
+    subscribed: string
+    notSubscribed: string
   }
 
   fontSizes: number[]