Add preferences tab to user settings, add subscribe to own cards option

client/src/components/UserSettingsModal/PreferencesPane.jsx

@@ -0,0 +1,34 @@
+import React, { useCallback } from 'react';
+import PropTypes from 'prop-types';
+import { useTranslation } from 'react-i18next';
+import { Radio, Tab } from 'semantic-ui-react';
+
+import styles from './PreferencesPane.module.css';
+
+const PreferencesPane = React.memo(({ subscribeToOwnCards, onUpdate }) => {
+  const [t] = useTranslation();
+
+  const handleSubscribeToOwnCardsChange = useCallback(() => {
+    onUpdate({
+      subscribeToOwnCards: !subscribeToOwnCards,
+    });
+  }, [subscribeToOwnCards, onUpdate]);
+
+  return (
+    <Tab.Pane attached={false} className={styles.wrapper}>
+      <Radio
+        toggle
+        checked={subscribeToOwnCards}
+        label={t('common.subscribeToMyOwnCardsByDefault')}
+        onChange={handleSubscribeToOwnCardsChange}
+      />
+    </Tab.Pane>
+  );
+});
+
+PreferencesPane.propTypes = {
+  subscribeToOwnCards: PropTypes.bool.isRequired,
+  onUpdate: PropTypes.func.isRequired,
+};
+
+export default PreferencesPane;

client/src/components/UserSettingsModal/PreferencesPane.module.css

@@ -0,0 +1,4 @@
+.wrapper {
+  border: none !important;
+  box-shadow: none !important;
+}

client/src/components/UserSettingsModal/UserSettingsModal.jsx

@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { Modal, Tab } from 'semantic-ui-react';
 
 import AccountPane from './AccountPane';
+import PreferencesPane from './PreferencesPane';
 
 const UserSettingsModal = React.memo(
   ({
@@ -13,6 +14,7 @@ const UserSettingsModal = React.memo(
     avatar,
     phone,
     organization,
+    subscribeToOwnCards,
     isAvatarUploading,
     usernameUpdateForm,
     emailUpdateForm,
@@ -57,12 +59,26 @@ const UserSettingsModal = React.memo(
           />
         ),
       },
+      {
+        menuItem: t('common.preferences', {
+          context: 'title',
+        }),
+        render: () => (
+          <PreferencesPane subscribeToOwnCards={subscribeToOwnCards} onUpdate={onUpdate} />
+        ),
+      },
     ];
 
     return (
       <Modal open closeIcon size="small" centered={false} onClose={onClose}>
         <Modal.Content>
-          <Tab menu={{ secondary: true, pointing: true }} panes={panes} />
+          <Tab
+            menu={{
+              secondary: true,
+              pointing: true,
+            }}
+            panes={panes}
+          />
         </Modal.Content>
       </Modal>
     );
@@ -76,6 +92,7 @@ UserSettingsModal.propTypes = {
   avatar: PropTypes.string,
   phone: PropTypes.string,
   organization: PropTypes.string,
+  subscribeToOwnCards: PropTypes.bool.isRequired,
   isAvatarUploading: PropTypes.bool.isRequired,
   /* eslint-disable react/forbid-prop-types */
   usernameUpdateForm: PropTypes.object.isRequired,

client/src/containers/UserSettingsModalContainer.js

@@ -23,6 +23,7 @@ const mapStateToProps = (state) => {
     avatar,
     phone,
     organization,
+    subscribeToOwnCards,
     isAvatarUploading,
     emailUpdateForm,
     passwordUpdateForm,
@@ -36,6 +37,7 @@ const mapStateToProps = (state) => {
     avatar,
     phone,
     organization,
+    subscribeToOwnCards,
     isAvatarUploading,
     emailUpdateForm,
     passwordUpdateForm,

client/src/locales/en-US/app.js

@@ -86,12 +86,14 @@ export default {
       optional_inline: 'optional',
       organization: 'Organization',
       phone: 'Phone',
+      preferences: 'Preferences',
       projectNotFound_title: 'Project Not Found',
       refreshPageToLoadLastDataAndReceiveUpdates:
         '<0>Refresh the page</0> to load last data<br />and receive updates',
       removeMember_title: 'Remove Member',
       seconds: 'Seconds',
       settings: 'Settings',
+      subscribeToMyOwnCardsByDefault: 'Subscribe to my own cards by default',
       taskActions_title: 'Task Actions',
       tasks: 'Tasks',
       time: 'Time',

client/src/locales/ru-RU/app.js

@@ -90,12 +90,14 @@ export default {
       optional_inline: 'необязательно',
       organization: 'Организация',
       phone: 'Телефон',
+      preferences: 'Предпочтения',
       projectNotFound: 'Доска не найдена',
       refreshPageToLoadLastDataAndReceiveUpdates:
         '<0>Обновите страницу</0>, чтобы загрузить<br />актуальные данные и получать обновления',
       removeMember: 'Удаление участника',
       seconds: 'Секунды',
       settings: 'Настройки',
+      subscribeToMyOwnCardsByDefault: 'По умолчанию подписаться на мои собственные карточки',
       taskActions: 'Действия с задачей',
       tasks: 'Задачи',
       time: 'Время',

client/src/models/User.js

@@ -39,6 +39,7 @@ export default class extends Model {
     avatar: attr(),
     phone: attr(),
     organization: attr(),
+    subscribeToOwnCards: attr(),
     deletedAt: attr(),
     isAdmin: attr({
       getDefault: () => false,

server/api/controllers/users/create.js

@@ -40,6 +40,9 @@ module.exports = {
       isNotEmptyString: true,
       allowNull: true,
     },
+    subscribeToOwnCards: {
+      type: 'boolean',
+    },
   },
 
   exits: {
@@ -59,6 +62,7 @@ module.exports = {
       'username',
       'phone',
       'organization',
+      'subscribeToOwnCards',
     ]);
 
     const user = await sails.helpers

server/api/controllers/users/update.js

@@ -32,6 +32,9 @@ module.exports = {
       isNotEmptyString: true,
       allowNull: true,
     },
+    subscribeToOwnCards: {
+      type: 'boolean',
+    },
   },
 
   exits: {
@@ -57,7 +60,14 @@ module.exports = {
       throw Errors.USER_NOT_FOUND;
     }
 
-    const values = _.pick(inputs, ['isAdmin', 'name', 'avatar', 'phone', 'organization']);
+    const values = _.pick(inputs, [
+      'isAdmin',
+      'name',
+      'avatar',
+      'phone',
+      'organization',
+      'subscribeToOwnCards',
+    ]);
 
     user = await sails.helpers.updateUser(user, values, this.req);
 

server/api/helpers/create-card.js

@@ -49,6 +49,17 @@ module.exports = {
       boardId: inputs.list.boardId,
     }).fetch();
 
+    if (inputs.user.subscribeToOwnCards) {
+      await CardSubscription.create({
+        cardId: card.id,
+        userId: inputs.user.id,
+      }).tolerate('E_UNIQUE');
+
+      card.isSubscribed = true;
+    } else {
+      card.isSubscribed = false;
+    }
+
     sails.sockets.broadcast(
       `board:${card.boardId}`,
       'cardCreate',

server/api/models/User.js

@@ -52,6 +52,11 @@ module.exports = {
       isNotEmptyString: true,
       allowNull: true,
     },
+    subscribeToOwnCards: {
+      type: 'boolean',
+      defaultsTo: false,
+      columnName: 'subscribe_to_own_cards',
+    },
     deletedAt: {
       type: 'ref',
       columnName: 'deleted_at',

server/db/migrations/20180721220409_create_user_account_table.js

@@ -13,6 +13,7 @@ module.exports.up = (knex) =>
       table.text('avatar');
       table.text('phone');
       table.text('organization');
+      table.boolean('subscribe_to_own_cards').notNullable();
 
       table.timestamp('created_at', true);
       table.timestamp('updated_at', true);

server/db/seeds/default.js

@@ -9,6 +9,7 @@ exports.seed = (knex) => {
     isAdmin: true,
     name: 'Demo Demo',
     username: 'demo',
+    subscribeToOwnCards: false,
     createdAt: date,
     updatedAt: date,
   });