Release v4.10.0

README.md

@@ -85,7 +85,7 @@ This will run a demo version, which you can turn into a fully licenced version b
 
 ## Versions History
 
-### Version 4.9.1 (unreleased)
+### Version 4.10.0
 
 - Add better GDPR compliance, with the right to be forgotten: allows a user to delete all of their data
 - Add the ability for users to signal if they are done with their posts, to help the moderator

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retrospected/backend",
-  "version": "4.9.1",
+  "version": "4.10.0",
   "license": "GNU GPLv3",
   "private": true,
   "scripts": {

backend/src/db/actions/delete.ts

@@ -44,10 +44,10 @@ async function deleteVisits(
   if (hardDelete) {
     await manager.query('delete from visitors where "usersId" = $1', [user.id]);
   } else {
-    await manager.query('update visitors set usersId = $1 where usersId = $2', [
-      anon.user.id,
-      user.id,
-    ]);
+    await manager.query(
+      'update visitors set "usersId" = $1 where "usersId" = $2',
+      [anon.user.id, user.id]
+    );
   }
 }
 

common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retrospected/common",
-  "version": "4.9.1",
+  "version": "4.10.0",
   "license": "GNU GPLv3",
   "private": true,
   "main": "dist/src/index.js",

common/src/types.ts

@@ -183,9 +183,11 @@ export type TrackingEvent =
   | 'game/session/reset'
   | 'game/session/disconnect'
   | 'game/session/unexpected-disconnection'
+  | 'game/session/user-ready'
   | 'game/post/giphy/open'
   | 'game/post/giphy/choose'
   | 'game/post/giphy/toggle'
+  | 'account/gdpr/delete-account'
   | 'game/post/extra-menu/open'
   | 'trial/start'
   | 'trial/modal/cancel'

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "4.9.1",
+  "version": "4.10.0",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retrospected/frontend",
-  "version": "4.9.1",
+  "version": "4.10.0",
   "license": "GNU GPLv3",
   "private": true,
   "dependencies": {

frontend/src/api/index.ts

@@ -210,7 +210,11 @@ export async function deleteSession(sessionId: string): Promise<boolean> {
 export async function deleteAccount(
   options: DeleteAccountPayload
 ): Promise<boolean> {
-  return await fetchDelete(`/api/me`, options);
+  try {
+    return await fetchDelete(`/api/me`, options);
+  } catch (err) {
+    return false;
+  }
 }
 
 export async function getGiphyUrl(giphyId: string): Promise<string | null> {

frontend/src/views/account/delete/DeleteModal.tsx

@@ -23,7 +23,9 @@ import { deleteAccount, logout } from '../../../api';
 import UserContext from '../../../auth/Context';
 import { useHistory } from 'react-router';
 import { useConfirm } from 'material-ui-confirm';
+import { useSnackbar } from 'notistack';
 import useTranslations from '../../../translations';
+import { trackEvent } from '../../../track';
 
 type DeleteModalProps = {
   onClose: () => void;
@@ -35,6 +37,7 @@ export function DeleteModal({ onClose }: DeleteModalProps) {
   const [deletePosts, setDeletePosts] = useState(false);
   const [deleteVotes, setDeleteVotes] = useState(false);
   const { setUser } = useContext(UserContext);
+  const { enqueueSnackbar } = useSnackbar();
   const user = useUser();
   const { push } = useHistory();
   const confirm = useConfirm();
@@ -61,10 +64,19 @@ export function DeleteModal({ onClose }: DeleteModalProps) {
       confirmationButtonProps: { color: 'error', variant: 'contained' },
     })
       .then(async () => {
-        await deleteAccount(payload);
-        logout();
-        setUser(null);
-        push('/');
+        trackEvent('account/gdpr/delete-account');
+        const success = await deleteAccount(payload);
+        if (success) {
+          logout();
+          setUser(null);
+          push('/');
+        } else {
+          enqueueSnackbar(
+            'Deleting your account failed. Please contact support: [email protected]',
+            { variant: 'error' }
+          );
+          onClose();
+        }
       })
       .catch(() => {
         onClose();
@@ -79,6 +91,7 @@ export function DeleteModal({ onClose }: DeleteModalProps) {
     confirm,
     onClose,
     translations,
+    enqueueSnackbar,
   ]);
 
   if (!user) {

frontend/src/views/game/Participants.tsx

@@ -13,6 +13,8 @@ import useSession from './useSession';
 import styled from '@emotion/styled';
 import useUser from '../../auth/useUser';
 import useTranslation from '../../translations/useTranslations';
+import { useCallback } from 'react';
+import { trackEvent } from '../../track';
 
 type ParticipantsProps = {
   onReady: () => void;
@@ -25,6 +27,10 @@ function Participants({ onReady }: ParticipantsProps) {
   const { PostBoard: translations } = useTranslation();
   const isUserReady = !!user && !!session && session.ready.includes(user.id);
   const fullScreen = useMediaQuery('(min-width:600px)');
+  const handleReady = useCallback(() => {
+    trackEvent('game/session/user-ready');
+    onReady();
+  }, [onReady]);
   return (
     <Container>
       <AvatarGroup
@@ -55,7 +61,7 @@ function Participants({ onReady }: ParticipantsProps) {
           })}
       </AvatarGroup>
       {user && !fullScreen ? (
-        <IconButton onClick={onReady}>
+        <IconButton onClick={handleReady}>
           {isUserReady ? (
             <Create htmlColor={colors.orange[500]} />
           ) : (
@@ -65,7 +71,7 @@ function Participants({ onReady }: ParticipantsProps) {
       ) : null}
       {user && fullScreen ? (
         <Button
-          onClick={onReady}
+          onClick={handleReady}
           variant="outlined"
           endIcon={
             isUserReady ? (

package.json

@@ -1,6 +1,6 @@
 {
   "name": "retrospected",
-  "version": "4.9.1",
+  "version": "4.10.0",
   "description": "An agile retrospective board - Powering www.retrospected.com",
   "private": true,
   "workspaces": [