chore: Update version

Closes #673

.github/workflows/build-and-push-release-package.yml

@@ -47,10 +47,10 @@ jobs:
       - name: Dist create .zip file
         run: |
           mv dist/ planka/
-          zip -r planka-prebuild-${{ github.event.release.tag_name }}.zip planka
+          zip -r planka-prebuild.zip planka
 
       - name: Dist upload assets
         run: |
-          gh release upload ${{ github.event.release.tag_name }} planka-prebuild-${{ github.event.release.tag_name }}.zip#planka-prebuild.zip
+          gh release upload ${{ github.event.release.tag_name }} planka-prebuild.zip
         env:
           GH_TOKEN: ${{ github.token }}

.github/workflows/build-and-test.yml

@@ -0,0 +1,73 @@
+name: Build and test
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+    env:
+      POSTGRES_DB: planka_db
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: password
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: 'npm'
+
+      - name: Setup PostgreSQL
+        uses: ikalnytskyi/action-setup-postgres@v5
+        with:
+          database: ${{ env.POSTGRES_DB }}
+          username: ${{ env.POSTGRES_USER }}
+          password: ${{ env.POSTGRES_PASSWORD }}
+
+      - name: Cache Node.js modules
+        uses: actions/cache@v3
+        with:
+          path: client/node_modules
+          key: ${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Install dependencies
+        run: |
+          npm install
+          cd client
+          npm run build
+
+      - name: Setup server
+        env:
+          DEFAULT_ADMIN_EMAIL: demo@demo.demo
+          DEFAULT_ADMIN_PASSWORD: demo
+          DEFAULT_ADMIN_NAME: Demo Demo
+          DEFAULT_ADMIN_USERNAME: demo
+        run: |
+          client/tests/setup-symlinks.sh
+          cd server
+          cp .env.sample .env
+          sed -i "s|^DATABASE_URL=.*|DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost/${POSTGRES_DB}|" .env
+          npm run db:init
+          npm start --prod &
+
+      - name: Wait for development server
+        run: |
+          sudo apt-get install wait-for-it -y
+          wait-for-it -h localhost -p 1337 -t 10
+
+      - name: Run UI tests
+        run: |
+          cd client
+          npm install
+          npx playwright install chromium
+          npm run test:acceptance tests

.github/workflows/lint.yml

@@ -0,0 +1,33 @@
+name: Lint
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: 'npm'
+
+      - name: Cache Node.js modules
+        uses: actions/cache@v3
+        with:
+          path: client/node_modules
+          key: ${{ runner.os }}-node-${{ hashFiles('client/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Run linter
+        run: npm run lint

README.md

@@ -31,6 +31,8 @@ Here is the [mobile app repository](https://github.com/LouisHDev/planka_app) mai
 
 Alternatively, you can download the [Android APK](https://github.com/LouisHDev/planka_app/releases/latest/download/app-release.apk) directly.
 
+If you have an iOS device and would like to test the app, you can join [TestFlight](https://testflight.apple.com/join/Uwn41eY4) (limited to 200 participants).
+
 ## Contact
 
 - If you want to get a hosted version of Planka, you can contact us via email contact@planka.cloud

charts/planka/Chart.yaml

@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.11
+version: 0.2.15
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.23.2"
+appVersion: "1.24.0"
 
 dependencies:
   - alias: postgresql

charts/planka/templates/deployment.yaml

@@ -82,7 +82,7 @@ spec:
             - name: DATABASE_URL
               valueFrom:
                 secretKeyRef:
-                  name: planka-postgresql-svcbind-custom-user
+                  name: {{ include "planka.fullname" . }}-postgresql-svcbind-custom-user
                   key: uri
           {{- end }}
             - name: BASE_URL

client/package.json

@@ -6,7 +6,8 @@
     "eject": "react-scripts eject",
     "lint": "eslint --ext js,jsx src config-overrides.js",
     "start": "react-app-rewired start",
-    "test": "react-app-rewired test"
+    "test": "react-app-rewired test",
+    "test:acceptance": "cucumber-js --require tests/acceptance/cucumber.conf.js --require tests/acceptance/stepDefinitions/**/*.js --format @cucumber/pretty-formatter"
   },
   "browserslist": {
     "production": [
@@ -108,9 +109,13 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@cucumber/cucumber": "^7.3.1",
+    "@cucumber/pretty-formatter": "^1.0.1",
+    "@playwright/test": "^1.46.1",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^15.0.7",
     "@testing-library/user-event": "^14.5.2",
+    "axios": "^1.6.2",
     "babel-preset-airbnb": "^5.0.0",
     "chai": "^4.5.0",
     "eslint": "^8.57.0",
@@ -119,6 +124,7 @@
     "eslint-plugin-jsx-a11y": "^6.10.0",
     "eslint-plugin-react": "^7.36.1",
     "eslint-plugin-react-hooks": "^4.6.2",
+    "playwright": "^1.46.1",
     "react-test-renderer": "18.2.0"
   }
 }

client/src/components/Card/Card.jsx

@@ -23,6 +23,7 @@ const Card = React.memo(
     id,
     index,
     name,
+    description,
     dueDate,
     isDueDateCompleted,
     stopwatch,
@@ -31,6 +32,7 @@ const Card = React.memo(
     listId,
     projectId,
     isPersisted,
+    attachmentsTotal,
     notificationsTotal,
     users,
     labels,
@@ -106,7 +108,11 @@ const Card = React.memo(
           )}
           <div className={styles.name}>{name}</div>
           {tasks.length > 0 && <Tasks items={tasks} />}
-          {(dueDate || stopwatch || notificationsTotal > 0) && (
+          {(description ||
+            dueDate ||
+            stopwatch ||
+            attachmentsTotal > 0 ||
+            notificationsTotal > 0) && (
             <span className={styles.attachments}>
               {notificationsTotal > 0 && (
                 <span
@@ -135,6 +141,21 @@ const Card = React.memo(
                   />
                 </span>
               )}
+              {description && (
+                <span className={classNames(styles.attachment, styles.attachmentLeft)}>
+                  <span className={styles.attachmentContent}>
+                    <Icon name="align left" />
+                  </span>
+                </span>
+              )}
+              {attachmentsTotal > 0 && (
+                <span className={classNames(styles.attachment, styles.attachmentLeft)}>
+                  <span className={styles.attachmentContent}>
+                    <Icon name="attach" />
+                    {attachmentsTotal}
+                  </span>
+                </span>
+              )}
             </span>
           )}
           {users.length > 0 && (
@@ -221,6 +242,7 @@ Card.propTypes = {
   id: PropTypes.string.isRequired,
   index: PropTypes.number.isRequired,
   name: PropTypes.string.isRequired,
+  description: PropTypes.string,
   dueDate: PropTypes.instanceOf(Date),
   isDueDateCompleted: PropTypes.bool,
   stopwatch: PropTypes.object, // eslint-disable-line react/forbid-prop-types
@@ -229,6 +251,7 @@ Card.propTypes = {
   listId: PropTypes.string.isRequired,
   projectId: PropTypes.string.isRequired,
   isPersisted: PropTypes.bool.isRequired,
+  attachmentsTotal: PropTypes.number.isRequired,
   notificationsTotal: PropTypes.number.isRequired,
   /* eslint-disable react/forbid-prop-types */
   users: PropTypes.array.isRequired,
@@ -256,6 +279,7 @@ Card.propTypes = {
 };
 
 Card.defaultProps = {
+  description: undefined,
   dueDate: undefined,
   isDueDateCompleted: undefined,
   stopwatch: undefined,

client/src/components/Card/Card.module.scss

@@ -39,6 +39,13 @@
     vertical-align: top;
   }
 
+  .attachmentContent {
+    color: #6a808b;
+    font-size: 12px;
+    line-height: 20px;
+    padding: 0px 3px;
+  }
+
   .attachmentLeft {
     margin-right: 4px;
   }

client/src/components/CardModal/Activities/CommentEdit.jsx

@@ -10,7 +10,7 @@ import { focusEnd } from '../../../utils/element-helpers';
 
 import styles from './CommentEdit.module.scss';
 
-const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref) => {
+const CommentEdit = React.forwardRef(({ defaultData, onUpdate, text, actions }, ref) => {
   const [t] = useTranslation();
   const [isOpened, setIsOpened] = useState(false);
   const [data, handleFieldChange, setData] = useForm(null);
@@ -76,7 +76,12 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
   }, [isOpened]);
 
   if (!isOpened) {
-    return children;
+    return (
+      <>
+        {actions}
+        {text}
+      </>
+    );
   }
 
   return (
@@ -101,9 +106,10 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
 });
 
 CommentEdit.propTypes = {
-  children: PropTypes.element.isRequired,
   defaultData: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
   onUpdate: PropTypes.func.isRequired,
+  text: PropTypes.element.isRequired,
+  actions: PropTypes.element.isRequired,
 };
 
 export default React.memo(CommentEdit);

client/src/components/CardModal/Activities/ItemComment.jsx

@@ -31,7 +31,18 @@ const ItemComment = React.memo(
           <User name={user.name} avatarUrl={user.avatarUrl} />
         </span>
         <div className={classNames(styles.content)}>
+          <CommentEdit
+            ref={commentEdit}
+            defaultData={data}
+            onUpdate={onUpdate}
+            text={
+              <div className={styles.text}>
+                <Markdown linkTarget="_blank">{data.text}</Markdown>
+              </div>
+            }
+            actions={
               <div className={styles.title}>
+                <span>
                   <span className={styles.author}>{user.name}</span>
                   <span className={styles.date}>
                     {t(`format:${getDateFormat(createdAt)}`, {
@@ -39,12 +50,7 @@ const ItemComment = React.memo(
                       value: createdAt,
                     })}
                   </span>
-          </div>
+                </span>
-          <CommentEdit ref={commentEdit} defaultData={data} onUpdate={onUpdate}>
-            <>
-              <div className={styles.text}>
-                <Markdown linkTarget="_blank">{data.text}</Markdown>
-              </div>
                 {canEdit && (
                   <Comment.Actions>
                     <Comment.Action
@@ -67,8 +73,9 @@ const ItemComment = React.memo(
                     </DeletePopup>
                   </Comment.Actions>
                 )}
-            </>
+              </div>
-          </CommentEdit>
+            }
+          />
         </div>
       </Comment>
     );

client/src/components/CardModal/Activities/ItemComment.module.scss

@@ -38,6 +38,12 @@
 
   .title {
     padding-bottom: 4px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    position: sticky;
+    top: -1em;
+    background: #f5f6f7;
   }
 
   .user {

client/src/components/CardModal/CardModal.jsx

@@ -369,7 +369,7 @@ const CardModal = React.memo(
             {(description || canEdit) && (
               <div className={styles.contentModule}>
                 <div className={styles.moduleWrapper}>
-                  <Icon name="align justify" className={styles.moduleIcon} />
+                  <Icon name="align left" className={styles.moduleIcon} />
                   <div className={styles.moduleHeader}>{t('common.description')}</div>
                   {canEdit ? (
                     <DescriptionEdit defaultValue={description} onUpdate={handleDescriptionUpdate}>

client/src/components/CardModal/DescriptionEdit.jsx

@@ -1,8 +1,11 @@
-import React, { useCallback, useImperativeHandle, useMemo, useState } from 'react';
+import React, { useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import { Button, Form } from 'semantic-ui-react';
 import SimpleMDE from 'react-simplemde-editor';
+import { useClickAwayListener } from '../../lib/hooks';
+
+import { useNestedRef } from '../../hooks';
 
 import styles from './DescriptionEdit.module.scss';
 
@@ -11,6 +14,10 @@ const DescriptionEdit = React.forwardRef(({ children, defaultValue, onUpdate },
   const [isOpened, setIsOpened] = useState(false);
   const [value, setValue] = useState(null);
 
+  const editorWrapperRef = useRef(null);
+  const codemirrorRef = useRef(null);
+  const [buttonRef, handleButtonRef] = useNestedRef();
+
   const open = useCallback(() => {
     setIsOpened(true);
     setValue(defaultValue || '');
@@ -55,6 +62,28 @@ const DescriptionEdit = React.forwardRef(({ children, defaultValue, onUpdate },
     close();
   }, [close]);
 
+  const handleAwayClick = useCallback(() => {
+    if (!isOpened) {
+      return;
+    }
+
+    close();
+  }, [isOpened, close]);
+
+  const handleClickAwayCancel = useCallback(() => {
+    codemirrorRef.current.focus();
+  }, []);
+
+  const clickAwayProps = useClickAwayListener(
+    [editorWrapperRef, buttonRef],
+    handleAwayClick,
+    handleClickAwayCancel,
+  );
+
+  const handleGetCodemirrorInstance = useCallback((codemirror) => {
+    codemirrorRef.current = codemirror;
+  }, []);
+
   const mdEditorOptions = useMemo(
     () => ({
       autoDownloadFontAwesome: false,
@@ -92,16 +121,20 @@ const DescriptionEdit = React.forwardRef(({ children, defaultValue, onUpdate },
 
   return (
     <Form onSubmit={handleSubmit}>
+      {/* eslint-disable-next-line react/jsx-props-no-spreading */}
+      <div {...clickAwayProps} ref={editorWrapperRef}>
         <SimpleMDE
           value={value}
           options={mdEditorOptions}
           placeholder={t('common.enterDescription')}
           className={styles.field}
+          getCodemirrorInstance={handleGetCodemirrorInstance}
           onKeyDown={handleFieldKeyDown}
           onChange={setValue}
         />
+      </div>
       <div className={styles.controls}>
-        <Button positive content={t('action.save')} />
+        <Button positive ref={handleButtonRef} content={t('action.save')} />
       </div>
     </Form>
   );

client/src/components/CardModal/Tasks/Add.jsx

@@ -13,6 +13,8 @@ const DEFAULT_DATA = {
   name: '',
 };
 
+const MULTIPLE_REGEX = /\s*\r?\n\s*/;
+
 const Add = React.forwardRef(({ children, onCreate }, ref) => {
   const [t] = useTranslation();
   const [isOpened, setIsOpened] = useState(false);
@@ -29,7 +31,8 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
     setIsOpened(false);
   }, []);
 
-  const submit = useCallback(() => {
+  const submit = useCallback(
+    (isMultiple = false) => {
       const cleanData = {
         ...data,
         name: data.name.trim(),
@@ -40,11 +43,22 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
         return;
       }
 
+      if (isMultiple) {
+        cleanData.name.split(MULTIPLE_REGEX).forEach((name) => {
+          onCreate({
+            ...cleanData,
+            name,
+          });
+        });
+      } else {
         onCreate(cleanData);
+      }
 
       setData(DEFAULT_DATA);
       focusNameField();
-  }, [onCreate, data, setData, focusNameField]);
+    },
+    [onCreate, data, setData, focusNameField],
+  );
 
   useImperativeHandle(
     ref,
@@ -63,8 +77,7 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
     (event) => {
       if (event.key === 'Enter') {
         event.preventDefault();
-
+        submit(event.ctrlKey);
-        submit();
       }
     },
     [submit],

client/src/components/DueDateEditStep/DueDateEditStep.jsx

@@ -7,6 +7,7 @@ import { useDidUpdate, useToggle } from '../../lib/hooks';
 import { Input, Popup } from '../../lib/custom-ui';
 
 import { useForm } from '../../hooks';
+import parseTime from '../../utils/parse-time';
 
 import styles from './DueDateEditStep.module.scss';
 
@@ -66,10 +67,7 @@ const DueDateEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose })
       return;
     }
 
-    const value = t('format:dateTime', {
+    const value = parseTime(data.time, nullableDate);
-      postProcess: 'parseDate',
-      value: `${data.date} ${data.time}`,
-    });
 
     if (Number.isNaN(value.getTime())) {
       timeField.current.select();
@@ -81,7 +79,7 @@ const DueDateEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose })
     }
 
     onClose();
-  }, [defaultValue, onUpdate, onClose, data, nullableDate, t]);
+  }, [defaultValue, onUpdate, onClose, data, nullableDate]);
 
   const handleClearClick = useCallback(() => {
     if (defaultValue) {

client/src/containers/CardContainer.js

@@ -20,12 +20,22 @@ const makeMapStateToProps = () => {
     const allLabels = selectors.selectLabelsForCurrentBoard(state);
     const currentUserMembership = selectors.selectCurrentUserMembershipForCurrentBoard(state);
 
-    const { name, dueDate, isDueDateCompleted, stopwatch, coverUrl, boardId, listId, isPersisted } =
+    const {
-      selectCardById(state, id);
+      name,
+      description,
+      dueDate,
+      isDueDateCompleted,
+      stopwatch,
+      coverUrl,
+      boardId,
+      listId,
+      isPersisted,
+    } = selectCardById(state, id);
 
     const users = selectUsersByCardId(state, id);
     const labels = selectLabelsByCardId(state, id);
     const tasks = selectTasksByCardId(state, id);
+    const attachmentsTotal = selectors.selectAttachmentsTotalByCardId(state, id);
     const notificationsTotal = selectNotificationsTotalByCardId(state, id);
 
     const isCurrentUserEditor =
@@ -35,6 +45,7 @@ const makeMapStateToProps = () => {
       id,
       index,
       name,
+      description,
       dueDate,
       isDueDateCompleted,
       stopwatch,
@@ -43,6 +54,7 @@ const makeMapStateToProps = () => {
       listId,
       projectId,
       isPersisted,
+      attachmentsTotal,
       notificationsTotal,
       users,
       labels,

client/src/hooks/index.js

@@ -1,7 +1,8 @@
+import useNestedRef from './use-nested-ref';
 import useField from './use-field';
 import useForm from './use-form';
 import useSteps from './use-steps';
 import useModal from './use-modal';
 import useClosableForm from './use-closable-form';
 
-export { useField, useForm, useSteps, useModal, useClosableForm };
+export { useNestedRef, useField, useForm, useSteps, useModal, useClosableForm };

client/src/hooks/use-nested-ref.js

@@ -0,0 +1,14 @@
+import { useCallback, useRef } from 'react';
+
+export default (nestedRefName = 'ref') => {
+  const ref = useRef(null);
+
+  const handleRef = useCallback(
+    (element) => {
+      ref.current = element?.[nestedRefName].current;
+    },
+    [nestedRefName],
+  );
+
+  return [ref, handleRef];
+};

client/src/lib/hooks/index.js

@@ -2,5 +2,6 @@ import usePrevious from './use-previous';
 import useToggle from './use-toggle';
 import useForceUpdate from './use-force-update';
 import useDidUpdate from './use-did-update';
+import useClickAwayListener from './use-click-away-listener';
 
-export { usePrevious, useToggle, useForceUpdate, useDidUpdate };
+export { usePrevious, useToggle, useForceUpdate, useDidUpdate, useClickAwayListener };

client/src/lib/hooks/use-click-away-listener.js

@@ -0,0 +1,45 @@
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+
+export default (elementRefs, onAwayClick, onCancel) => {
+  const pressedElement = useRef(null);
+
+  const handlePress = useCallback((event) => {
+    pressedElement.current = event.target;
+  }, []);
+
+  useEffect(() => {
+    const handleEvent = (event) => {
+      const element = elementRefs.find(({ current }) => current?.contains(event.target))?.current;
+
+      if (element) {
+        if (!pressedElement.current || pressedElement.current !== element) {
+          onCancel();
+        }
+      } else if (pressedElement.current) {
+        onCancel();
+      } else {
+        onAwayClick();
+      }
+
+      pressedElement.current = null;
+    };
+
+    document.addEventListener('mouseup', handleEvent, true);
+    document.addEventListener('touchend', handleEvent, true);
+
+    return () => {
+      document.removeEventListener('mouseup', handleEvent, true);
+      document.removeEventListener('touchend', handleEvent, true);
+    };
+  }, [onAwayClick, onCancel]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  const props = useMemo(
+    () => ({
+      onMouseDown: handlePress,
+      onTouchStart: handlePress,
+    }),
+    [handlePress],
+  );
+
+  return props;
+};

client/src/locales/cs-CZ/core.js

@@ -184,6 +184,7 @@ export default {
       addTask: 'Přidat úkol',
       addToCard: 'Přidat na kartu',
       addUser: 'Přidat uživatele',
+      copyLink_title: 'Zkopírovat odkaz',
       createBoard: 'Vytvořit tabuli',
       createFile: 'Vytvořit soubor',
       createLabel: 'Vytvořit štítek',

client/src/locales/cs-CZ/login.js

@@ -3,6 +3,7 @@ export default {
     common: {
       emailOrUsername: 'E-mail nebo uživatelské jméno',
       invalidEmailOrUsername: 'Nesprávný e-mail nebo uživatelské jméno',
+      invalidCredentials: 'Neplatné přihlašovací údaje',
       invalidPassword: 'Nesprávné heslo',
       logInToPlanka: 'Přihlásit se do Planka',
       noInternetConnection: 'Bez připojení k internetu',
@@ -11,6 +12,7 @@ export default {
       projectManagement: 'Správa projektu',
       serverConnectionFailed: 'Připojení k serveru selhalo',
       unknownError: 'Neznámá chyba, zkuste to později',
+      useSingleSignOn: 'Použít jednorázové přihlášení',
     },
 
     action: {

client/src/selectors/cards.js

@@ -115,6 +115,23 @@ export const makeSelectTasksByCardId = () =>
 
 export const selectTasksByCardId = makeSelectTasksByCardId();
 
+export const makeSelectAttachmentsTotalByCardId = () =>
+  createSelector(
+    orm,
+    (_, id) => id,
+    ({ Card }, id) => {
+      const cardModel = Card.withId(id);
+
+      if (!cardModel) {
+        return cardModel;
+      }
+
+      return cardModel.attachments.count();
+    },
+  );
+
+export const selectAttachmentsTotalByCardId = makeSelectAttachmentsTotalByCardId();
+
 export const makeSelectLastActivityIdByCardId = () =>
   createSelector(
     orm,
@@ -334,6 +351,8 @@ export default {
   selectTaskIdsByCardId,
   makeSelectTasksByCardId,
   selectTasksByCardId,
+  makeSelectAttachmentsTotalByCardId,
+  selectAttachmentsTotalByCardId,
   makeSelectLastActivityIdByCardId,
   selectLastActivityIdByCardId,
   makeSelectNotificationsByCardId,

client/src/utils/parse-time.js

@@ -0,0 +1,102 @@
+import parseDate from 'date-fns/parse';
+
+const TIME_REGEX =
+  /^((\d{1,2})((:|\.)?(\d{1,2}))?)(a|p|(am|a\.m\.|midnight|mi|pm|p\.m\.|noon|n))?$/;
+
+const ALTERNATIVE_AM_MERIDIEMS_SET = new Set(['am', 'a.m.', 'midnight', 'mi']);
+const ALTERNATIVE_PM_MERIDIEMS_SET = new Set(['pm', 'p.m.', 'noon', 'n']);
+
+const TimeFormats = {
+  TWENTY_FOUR_HOUR: 'twentyFourHour',
+  TWELVE_HOUR: 'twelveHour',
+};
+
+const PATTERNS_GROUPS_BY_TIME_FORMAT = {
+  [TimeFormats.TWENTY_FOUR_HOUR]: {
+    byNumbersTotal: {
+      1: ['H'],
+      2: ['HH'],
+      3: ['Hmm'],
+      4: ['HHmm'],
+    },
+    withDelimiter: ['H:m', 'H:mm', 'HH:m', 'HH:mm'],
+  },
+  [TimeFormats.TWELVE_HOUR]: {
+    byNumbersTotal: {
+      1: ['haaaaa'],
+      2: ['hhaaaaa'],
+      3: ['hmmaaaaa'],
+      4: ['hhmmaaaaa'],
+    },
+    withDelimiter: ['h:maaaaa', 'h:mmaaaaa', 'hh:maaaaa', 'hh:mmaaaaa'],
+  },
+};
+
+const INVALID_DATE = new Date('invalid-date');
+
+const normalizeDelimeter = (delimeter) => (delimeter === '.' ? ':' : delimeter);
+
+const normalizeMeridiem = (meridiem, alternativeMeridiem) => {
+  if (meridiem && alternativeMeridiem) {
+    if (ALTERNATIVE_AM_MERIDIEMS_SET.has(alternativeMeridiem)) {
+      return 'a';
+    }
+
+    if (ALTERNATIVE_PM_MERIDIEMS_SET.has(alternativeMeridiem)) {
+      return 'p';
+    }
+  }
+
+  return meridiem;
+};
+
+const makeTimeString = (hours, minutes, delimeter, meridiem) => {
+  let timeString = hours;
+  if (delimeter) {
+    timeString += delimeter;
+  }
+  if (minutes) {
+    timeString += minutes;
+  }
+  if (meridiem) {
+    timeString += meridiem;
+  }
+
+  return timeString;
+};
+
+export default (string, referenceDate) => {
+  const match = string.replace(/\s/g, '').toLowerCase().match(TIME_REGEX);
+
+  if (!match) {
+    return INVALID_DATE;
+  }
+
+  const [, hoursAndMinutes, hours, , delimeter, minutes, meridiem, alternativeMeridiem] = match;
+
+  const normalizedDelimeter = normalizeDelimeter(delimeter);
+  const normalizedMeridiem = normalizeMeridiem(meridiem, alternativeMeridiem);
+
+  const timeString = makeTimeString(hours, minutes, normalizedDelimeter, normalizedMeridiem);
+
+  const timeFormat = meridiem ? TimeFormats.TWELVE_HOUR : TimeFormats.TWENTY_FOUR_HOUR;
+  const patternsGroups = PATTERNS_GROUPS_BY_TIME_FORMAT[timeFormat];
+
+  const patterns = delimeter
+    ? patternsGroups.withDelimiter
+    : patternsGroups.byNumbersTotal[hoursAndMinutes.length];
+
+  if (!referenceDate) {
+    referenceDate = new Date(); // eslint-disable-line no-param-reassign
+  }
+
+  for (let i = 0; i < patterns.length; i += 1) {
+    const parsedDate = parseDate(timeString, patterns[i], referenceDate);
+
+    if (!Number.isNaN(parsedDate.getTime())) {
+      return parsedDate;
+    }
+  }
+
+  return INVALID_DATE;
+};

client/src/version.js

@@ -1 +1 @@
-export default '1.23.2';
+export default '1.24.0';

client/tests/acceptance/config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  // environment
+  adminUser: {
+    email: 'demo@demo.demo',
+    password: 'demo',
+  },
+  baseUrl: process.env.BASE_URL ?? 'http://localhost:1337/',
+  // playwright
+  slowMo: parseInt(process.env.SLOW_MO, 10) || 1000,
+  timeout: parseInt(process.env.TIMEOUT, 10) || 6000,
+  headless: process.env.HEADLESS !== 'true',
+};

client/tests/acceptance/cucumber.conf.js

@@ -0,0 +1,35 @@
+// cucumber.conf.js file
+
+const { Before, BeforeAll, AfterAll, After, setDefaultTimeout } = require('@cucumber/cucumber');
+const { chromium } = require('playwright');
+const { deleteProject } = require('./testHelpers/apiHelpers');
+const config = require('./config');
+
+setDefaultTimeout(config.timeout);
+
+// launch the browser
+BeforeAll(async function () {
+  global.browser = await chromium.launch({
+    // makes true for CI
+    headless: config.headless,
+    slowMo: config.slowMo,
+  });
+});
+
+// close the browser
+AfterAll(async function () {
+  await global.browser.close();
+});
+
+// Create a new browser context and page per scenario
+Before(async function () {
+  global.context = await global.browser.newContext();
+  global.page = await global.context.newPage();
+});
+
+// Cleanup after each scenario
+After(async function () {
+  await deleteProject();
+  await global.page.close();
+  await global.context.close();
+});

client/tests/acceptance/features/webUIDashboard/dashboard.feature

@@ -0,0 +1,10 @@
+Feature: dashboard
+    As a admin
+    I want to create a project
+    So that I can manage project
+
+    Scenario: create a new project
+        Given user has browsed to the login page
+        And user has logged in with email "demo@demo.demo" and password "demo"
+        When the user creates a project with name "testproject" using the webUI
+        Then the created project "testproject" should be opened

client/tests/acceptance/features/webUILogin/login.feature

@@ -0,0 +1,27 @@
+Feature: login
+    As a admin
+    I want to log in
+    So that I can manage project
+
+
+  Scenario: User logs in with valid credentials
+    Given user has browsed to the login page
+    When user logs in with username "demo@demo.demo" and password "demo" using the webUI
+    Then the user should be in dashboard page
+
+
+  Scenario Outline: login with invalid username and invalid password
+    Given user has browsed to the login page
+    When user logs in with username "<username>" and password "<password>" using the webUI
+    Then user should see the error message "<message>"
+    Examples:
+      | username  | password | message             |
+      | spiderman | spidy123 | Invalid credentials |
+      | ironman   | iron123  | Invalid credentials |
+      | aquaman   | aqua123  | Invalid credentials |
+
+
+  Scenario: User can log out
+    Given user has logged in with email "demo@demo.demo" and password "demo"
+    When user logs out using the webUI
+    Then the user should be in the login page

client/tests/acceptance/pageObjects/DashboardPage.js

@@ -0,0 +1,16 @@
+class DashboardPage {
+  constructor() {
+    this.createProjectIconSelector = `.Projects_addTitle__tXhB4`;
+    this.projectTitleInputSelector = `input[name="name"]`;
+    this.createProjectButtonSelector = `//button[text()="Create project"]`;
+    this.projectTitleSelector = `//div[@class="item Header_item__OOEY7 Header_title__l+wMf"][text()="%s"]`;
+  }
+
+  async createProject(project) {
+    await page.click(this.createProjectIconSelector);
+    await page.fill(this.projectTitleInputSelector, project);
+    await page.click(this.createProjectButtonSelector);
+  }
+}
+
+module.exports = DashboardPage;

client/tests/acceptance/pageObjects/LoginPage.js

@@ -0,0 +1,38 @@
+const config = require(`../config`);
+
+class LoginPage {
+  constructor() {
+    // url
+    this.homeUrl = config.baseUrl;
+    this.loginUrl = `${this.homeUrl}login`;
+
+    // selectors
+    this.loginButtonSelector = `//i[@class="right arrow icon"]`;
+    this.usernameSelector = `//input[@name='emailOrUsername']`;
+    this.passwordSelector = `//input[@name='password']`;
+    this.errorMessageSelector = `//div[@class='ui error visible message']`;
+    this.userActionSelector = `//span[@class="User_initials__9Wp90"]`;
+    this.logOutSelector = `//a[@class="item UserStep_menuItem__5pvtT"][contains(text(),'Log Out')]`;
+  }
+
+  async goToLoginUrl() {
+    await page.goto(this.loginUrl);
+  }
+
+  async logOut() {
+    await page.click(this.userActionSelector);
+    await page.click(this.logOutSelector);
+  }
+
+  async login(username, password) {
+    await page.fill(this.usernameSelector, username);
+    await page.fill(this.passwordSelector, password);
+    await page.click(this.loginButtonSelector);
+  }
+
+  async getErrorMessage() {
+    return page.innerText(this.errorMessageSelector);
+  }
+}
+
+module.exports = LoginPage;

client/tests/acceptance/stepDefinitions/dashBoardContext.js

@@ -0,0 +1,17 @@
+const { When, Then } = require('@cucumber/cucumber');
+const util = require('util');
+const { expect } = require('playwright/test');
+
+const DashboardPage = require('../pageObjects/DashboardPage');
+
+const dashboardPage = new DashboardPage();
+
+When('the user creates a project with name {string} using the webUI', async function (project) {
+  await dashboardPage.createProject(project);
+});
+
+Then('the created project {string} should be opened', async function (project) {
+  expect(
+    await page.locator(util.format(dashboardPage.projectTitleSelector, project)),
+  ).toBeVisible();
+});

client/tests/acceptance/stepDefinitions/loginContext.js

@@ -0,0 +1,53 @@
+const { Given, When, Then } = require('@cucumber/cucumber');
+
+// import expect for assertion
+const { expect } = require('@playwright/test');
+
+// import assert
+const assert = require('assert');
+
+const LoginPage = require('../pageObjects/LoginPage');
+
+const loginPage = new LoginPage();
+
+Given('user has browsed to the login page', async function () {
+  await loginPage.goToLoginUrl();
+  await expect(page).toHaveURL(loginPage.loginUrl);
+});
+
+Given(
+  'user has logged in with email {string} and password {string}',
+  async function (username, password) {
+    await loginPage.goToLoginUrl();
+    await loginPage.login(username, password);
+    await expect(page).toHaveURL(loginPage.homeUrl);
+  },
+);
+
+When(
+  'user logs in with username {string} and password {string} using the webUI',
+  async function (username, password) {
+    await loginPage.login(username, password);
+  },
+);
+
+Then('the user should be in dashboard page', async function () {
+  await expect(page).toHaveURL(loginPage.homeUrl);
+});
+
+Then('user should see the error message {string}', async function (errorMessage) {
+  const actualErrorMessage = await loginPage.getErrorMessage();
+  assert.equal(
+    actualErrorMessage,
+    errorMessage,
+    `Expected message to be "${errorMessage}" but receive "${actualErrorMessage}"`,
+  );
+});
+
+When('user logs out using the webUI', async function () {
+  await loginPage.logOut();
+});
+
+Then('the user should be in the login page', async function () {
+  await expect(page).toHaveURL(loginPage.loginUrl);
+});

client/tests/acceptance/testHelpers/apiHelpers.js

@@ -0,0 +1,57 @@
+const axios = require('axios');
+const config = require('../config');
+
+async function getXauthToken() {
+  try {
+    const res = await axios.post(
+      `${config.baseUrl}api/access-tokens`,
+      {
+        emailOrUsername: config.adminUser.email,
+        password: config.adminUser.password,
+      },
+      {
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      },
+    );
+    return res.data.item;
+  } catch (error) {
+    return `Error requesting access token: ${error.message}`;
+  }
+}
+
+async function getProjectIDs() {
+  try {
+    const res = await axios.get(`${config.baseUrl}api/projects`, {
+      headers: {
+        Authorization: `Bearer ${await getXauthToken()}`,
+      },
+    });
+    return res.data.items.map((project) => project.id);
+  } catch (error) {
+    return `Error requesting projectIDs: ${error.message}`;
+  }
+}
+
+async function deleteProject() {
+  try {
+    const projectIDs = await getProjectIDs();
+    await Promise.all(
+      projectIDs.map(async (project) => {
+        await axios.delete(`${config.baseUrl}api/projects/${project}`, {
+          headers: {
+            Authorization: `Bearer ${await getXauthToken()}`,
+          },
+        });
+      }),
+    );
+    return true;
+  } catch (error) {
+    return `Error deleting project: ${error.message}`;
+  }
+}
+
+module.exports = {
+  deleteProject,
+};

client/tests/setup-symlinks.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# This script sets up symbolic links between the client build files and the server directories,
+
+# Navigate to the root directory of the git repository
+cd "$(git rev-parse --show-toplevel)" || { echo "Failed to navigate to the git repository root"; exit 1; }
+
+# Store paths for the client build, server public directory, and server views directory
+CLIENT_PATH=$(pwd)/client/build
+SERVER_PUBLIC_PATH=$(pwd)/server/public
+SERVER_VIEWS_PATH=$(pwd)/server/views
+
+# Create symbolic links for the necessary client assets in the server's public and views directories
+ln -s ${CLIENT_PATH}/asset-manifest.json ${SERVER_PUBLIC_PATH}/asset-manifest.json && echo "Linked asset-manifest.json successfully"
+ln -s ${CLIENT_PATH}/favicon.ico ${SERVER_PUBLIC_PATH}/favicon.ico && echo "Linked favicon.ico successfully"
+ln -s ${CLIENT_PATH}/logo192.png ${SERVER_PUBLIC_PATH}/logo192.png && echo "Linked logo192.png successfully"
+ln -s ${CLIENT_PATH}/logo512.png ${SERVER_PUBLIC_PATH}/logo512.png && echo "Linked logo512.png successfully"
+ln -s ${CLIENT_PATH}/manifest.json ${SERVER_PUBLIC_PATH}/manifest.json && echo "Linked manifest.json successfully"
+ln -s ${CLIENT_PATH}/robots.txt ${SERVER_PUBLIC_PATH}/robots.txt && echo "Linked robots.txt successfully"
+ln -s ${CLIENT_PATH}/static ${SERVER_PUBLIC_PATH}/static && echo "Linked static folder successfully"
+ln -s ${CLIENT_PATH}/index.html ${SERVER_VIEWS_PATH}/index.ejs && echo "Linked index.html to index.ejs successfully"
+
+echo "Setup symbolic links completed successfully."

docker-compose-db.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   postgres:
-    image: postgres:alpine
+    image: postgres:16-alpine
     restart: unless-stopped
     volumes:
       - db-data:/var/lib/postgresql/data

docker-compose-dev.yml

@@ -25,9 +25,15 @@ services:
       # - KNEX_REJECT_UNAUTHORIZED_SSL_CERTIFICATE=false
 
       # - SHOW_DETAILED_AUTH_ERRORS=false # Set to true to show more detailed authentication error messages. It should not be enabled without a rate limiter for security reasons.
-
       # - ALLOW_ALL_TO_CREATE_PROJECTS=true
 
+      # - S3_ENDPOINT=
+      # - S3_REGION=
+      # - S3_ACCESS_KEY_ID=
+      # - S3_SECRET_ACCESS_KEY=
+      # - S3_BUCKET=
+      # - S3_FORCE_PATH_STYLE=true
+
       # - OIDC_ISSUER=
       # - OIDC_CLIENT_ID=
       # - OIDC_CLIENT_SECRET=
@@ -67,6 +73,12 @@ services:
 
       # - SLACK_BOT_TOKEN=
       # - SLACK_CHANNEL_ID=
+
+      # - GOOGLE_CHAT_WEBHOOK_URL=
+
+      # - TELEGRAM_BOT_TOKEN=
+      # - TELEGRAM_CHAT_ID=
+      # - TELEGRAM_THREAD_ID=
     working_dir: /app
     command: ["sh", "-c", "npm run start"]
     depends_on:
@@ -110,7 +122,7 @@ services:
         condition: service_healthy
 
   postgres:
-    image: postgres:latest
+    image: postgres:16-alpine
     volumes:
       - db-data:/var/lib/postgresql/data
     environment:

docker-compose.yml

@@ -32,9 +32,15 @@ services:
       # - DEFAULT_ADMIN_USERNAME=demo
 
       # - SHOW_DETAILED_AUTH_ERRORS=false # Set to true to show more detailed authentication error messages. It should not be enabled without a rate limiter for security reasons.
-
       # - ALLOW_ALL_TO_CREATE_PROJECTS=true
 
+      # - S3_ENDPOINT=
+      # - S3_REGION=
+      # - S3_ACCESS_KEY_ID=
+      # - S3_SECRET_ACCESS_KEY=
+      # - S3_BUCKET=
+      # - S3_FORCE_PATH_STYLE=true
+
       # - OIDC_ISSUER=
       # - OIDC_CLIENT_ID=
       # - OIDC_CLIENT_SECRET=
@@ -74,13 +80,18 @@ services:
 
       # - SLACK_BOT_TOKEN=
       # - SLACK_CHANNEL_ID=
+
       # - GOOGLE_CHAT_WEBHOOK_URL=
+
+      # - TELEGRAM_BOT_TOKEN=
+      # - TELEGRAM_CHAT_ID=
+      # - TELEGRAM_THREAD_ID=
     depends_on:
       postgres:
         condition: service_healthy
 
   postgres:
-    image: postgres:14-alpine
+    image: postgres:16-alpine
     restart: on-failure
     volumes:
       - db-data:/var/lib/postgresql/data

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "planka",
-  "version": "1.23.2",
+  "version": "1.24.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "planka",
-      "version": "1.23.2",
+      "version": "1.24.0",
       "hasInstallScript": true,
       "license": "AGPL-3.0",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "planka",
-  "version": "1.23.2",
+  "version": "1.24.0",
   "private": true,
   "homepage": "https://plankanban.github.io/planka",
   "repository": {
@@ -16,7 +16,7 @@
     "client:test": "npm test --prefix client",
     "docker:build": "docker build -t ghcr.io/plankanban/planka:local -f Dockerfile .",
     "docker:build:base": "docker build -t ghcr.io/plankanban/planka:base-local -f Dockerfile.base .",
-    "gv": "genversion --source ./ --template client/version-template.ejs client/src/version.js",
+    "gv": "npm i --package-lock-only --ignore-scripts && genversion --source ./ --template client/version-template.ejs client/src/version.js",
     "postinstall": "(cd server && npm i && cd ../client && npm i)",
     "lint": "npm run server:lint && npm run client:lint",
     "prepare": "husky",
@@ -32,7 +32,7 @@
     "test": "npm run server:test && npm run client:test"
   },
   "lint-staged": {
-    "client/**/*.{js,jsx}": [
+    "client/src/**/*.{js,jsx}": [
       "npm run client:lint"
     ],
     "server/**/*.js": [

server/.env.sample

@@ -25,9 +25,15 @@ SECRET_KEY=notsecretkey
 # DEFAULT_ADMIN_USERNAME=demo
 
 # SHOW_DETAILED_AUTH_ERRORS=false # Set to true to show more detailed authentication error messages. It should not be enabled without a rate limiter for security reasons.
-
 # ALLOW_ALL_TO_CREATE_PROJECTS=true
 
+# S3_ENDPOINT=
+# S3_REGION=
+# S3_ACCESS_KEY_ID=
+# S3_SECRET_ACCESS_KEY=
+# S3_BUCKET=
+# S3_FORCE_PATH_STYLE=true
+
 # OIDC_ISSUER=
 # OIDC_CLIENT_ID=
 # OIDC_CLIENT_SECRET=
@@ -65,8 +71,13 @@ SECRET_KEY=notsecretkey
 
 # SLACK_BOT_TOKEN=
 # SLACK_CHANNEL_ID=
+
 # GOOGLE_CHAT_WEBHOOK_URL=
 
+# TELEGRAM_BOT_TOKEN=
+# TELEGRAM_CHAT_ID=
+# TELEGRAM_THREAD_ID=
+
 ## Do not edit this
 
 TZ=UTC

server/api/controllers/attachments/download-thumbnail.js

@@ -1,6 +1,3 @@
-const fs = require('fs');
-const path = require('path');
-
 const Errors = {
   ATTACHMENT_NOT_FOUND: {
     attachmentNotFound: 'Attachment not found',
@@ -46,20 +43,20 @@ module.exports = {
       throw Errors.ATTACHMENT_NOT_FOUND;
     }
 
-    const filePath = path.join(
+    const fileManager = sails.hooks['file-manager'].getInstance();
-      sails.config.custom.attachmentsPath,
-      attachment.dirname,
-      'thumbnails',
-      `cover-256.${attachment.image.thumbnailsExtension}`,
-    );
 
-    if (!fs.existsSync(filePath)) {
+    let readStream;
+    try {
+      readStream = await fileManager.read(
+        `${sails.config.custom.attachmentsPathSegment}/${attachment.dirname}/thumbnails/cover-256.${attachment.image.thumbnailsExtension}`,
+      );
+    } catch (error) {
       throw Errors.ATTACHMENT_NOT_FOUND;
     }
 
     this.res.type('image/jpeg');
     this.res.set('Cache-Control', 'private, max-age=900'); // TODO: move to config
 
-    return exits.success(fs.createReadStream(filePath));
+    return exits.success(readStream);
   },
 };

server/api/controllers/attachments/download.js

@@ -1,4 +1,3 @@
-const fs = require('fs');
 const path = require('path');
 
 const Errors = {
@@ -42,13 +41,14 @@ module.exports = {
       }
     }
 
-    const filePath = path.join(
+    const fileManager = sails.hooks['file-manager'].getInstance();
-      sails.config.custom.attachmentsPath,
-      attachment.dirname,
-      attachment.filename,
-    );
 
-    if (!fs.existsSync(filePath)) {
+    let readStream;
+    try {
+      readStream = await fileManager.read(
+        `${sails.config.custom.attachmentsPathSegment}/${attachment.dirname}/${attachment.filename}`,
+      );
+    } catch (error) {
       throw Errors.ATTACHMENT_NOT_FOUND;
     }
 
@@ -58,6 +58,6 @@ module.exports = {
     }
     this.res.set('Cache-Control', 'private, max-age=900'); // TODO: move to config
 
-    return exits.success(fs.createReadStream(filePath));
+    return exits.success(readStream);
   },
 };

server/api/helpers/actions/create-one.js

@@ -14,7 +14,10 @@ const valuesValidator = (value) => {
   return true;
 };
 
-const buildAndSendMessage = async (card, action, actorUser, send) => {
+const truncateString = (string, maxLength = 30) =>
+  string.length > maxLength ? `${string.substring(0, 30)}...` : string;
+
+const buildAndSendMarkdownMessage = async (card, action, actorUser, send) => {
   const cardLink = `<${sails.config.custom.baseUrl}/cards/${card.id}|${card.name}>`;
 
   let markdown;
@@ -28,6 +31,7 @@ const buildAndSendMessage = async (card, action, actorUser, send) => {
 
       break;
     case Action.Types.COMMENT_CARD:
+      // TODO: truncate text?
       markdown = `*${actorUser.name}* commented on ${cardLink}:\n>${action.data.text}`;
 
       break;
@@ -38,6 +42,31 @@ const buildAndSendMessage = async (card, action, actorUser, send) => {
   await send(markdown);
 };
 
+const buildAndSendHtmlMessage = async (card, action, actorUser, send) => {
+  const cardLink = `<a href="${sails.config.custom.baseUrl}/cards/${card.id}">${card.name}</a>`;
+
+  let html;
+  switch (action.type) {
+    case Action.Types.CREATE_CARD:
+      html = `${cardLink} was created by ${actorUser.name} in <b>${action.data.list.name}</b>`;
+
+      break;
+    case Action.Types.MOVE_CARD:
+      html = `${cardLink} was moved by ${actorUser.name} to <b>${action.data.toList.name}</b>`;
+
+      break;
+    case Action.Types.COMMENT_CARD: {
+      html = `<b>${actorUser.name}</b> commented on ${cardLink}:\n<i>${truncateString(action.data.text)}</i>`;
+
+      break;
+    }
+    default:
+      return;
+  }
+
+  await send(html);
+};
+
 module.exports = {
   inputs: {
     values: {
@@ -116,17 +145,32 @@ module.exports = {
     );
 
     if (sails.config.custom.slackBotToken) {
-      buildAndSendMessage(values.card, action, values.user, sails.helpers.utils.sendSlackMessage);
+      buildAndSendMarkdownMessage(
+        values.card,
+        action,
+        values.user,
+        sails.helpers.utils.sendSlackMessage,
+      );
     }
 
     if (sails.config.custom.googleChatWebhookUrl) {
-      buildAndSendMessage(
+      buildAndSendMarkdownMessage(
         values.card,
         action,
         values.user,
         sails.helpers.utils.sendGoogleChatMessage,
       );
     }
+
+    if (sails.config.custom.telegramBotToken) {
+      buildAndSendHtmlMessage(
+        values.card,
+        action,
+        values.user,
+        sails.helpers.utils.sendTelegramMessage,
+      );
+    }
+
     return action;
   },
 };

server/api/helpers/actions/update-one.js

@@ -59,6 +59,9 @@ module.exports = {
             cards: [inputs.card],
           },
         },
+        prevData: {
+          item: inputs.record,
+        },
         user: inputs.actorUser,
       });
     }

server/api/helpers/attachments/delete-one.js

@@ -1,6 +1,3 @@
-const path = require('path');
-const rimraf = require('rimraf');
-
 module.exports = {
   inputs: {
     record: {
@@ -50,8 +47,12 @@ module.exports = {
     const attachment = await Attachment.archiveOne(inputs.record.id);
 
     if (attachment) {
+      const fileManager = sails.hooks['file-manager'].getInstance();
+
       try {
-        rimraf.sync(path.join(sails.config.custom.attachmentsPath, attachment.dirname));
+        await fileManager.deleteDir(
+          `${sails.config.custom.attachmentsPathSegment}/${attachment.dirname}`,
+        );
       } catch (error) {
         console.warn(error.stack); // eslint-disable-line no-console
       }

server/api/helpers/attachments/process-uploaded-file.js

@@ -1,7 +1,4 @@
-const fs = require('fs');
+const { rimraf } = require('rimraf');
-const path = require('path');
-const rimraf = require('rimraf');
-const moveFile = require('move-file');
 const { v4: uuid } = require('uuid');
 const sharp = require('sharp');
 
@@ -16,17 +13,19 @@ module.exports = {
   },
 
   async fn(inputs) {
-    const dirname = uuid();
+    const fileManager = sails.hooks['file-manager'].getInstance();
 
+    const dirname = uuid();
+    const dirPathSegment = `${sails.config.custom.attachmentsPathSegment}/${dirname}`;
     const filename = filenamify(inputs.file.filename);
 
-    const rootPath = path.join(sails.config.custom.attachmentsPath, dirname);
+    const filePath = await fileManager.move(
-    const filePath = path.join(rootPath, filename);
+      inputs.file.fd,
+      `${dirPathSegment}/${filename}`,
+      inputs.file.type,
+    );
 
-    fs.mkdirSync(rootPath);
+    let image = sharp(filePath || inputs.file.fd, {
-    await moveFile(inputs.file.fd, filePath);
-
-    let image = sharp(filePath, {
       animated: true,
     });
 
@@ -43,9 +42,6 @@ module.exports = {
     };
 
     if (metadata && !['svg', 'pdf'].includes(metadata.format)) {
-      const thumbnailsPath = path.join(rootPath, 'thumbnails');
-      fs.mkdirSync(thumbnailsPath);
-
       let { width, pageHeight: height = metadata.height } = metadata;
       if (metadata.orientation && metadata.orientation > 4) {
         [image, width, height] = [image.rotate(), height, width];
@@ -55,7 +51,7 @@ module.exports = {
       const thumbnailsExtension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;
 
       try {
-        await image
+        const resizeBuffer = await image
           .resize(
             256,
             isPortrait ? 320 : undefined,
@@ -65,20 +61,30 @@ module.exports = {
                 }
               : undefined,
           )
-          .toFile(path.join(thumbnailsPath, `cover-256.${thumbnailsExtension}`));
+          .toBuffer();
+
+        await fileManager.save(
+          `${dirPathSegment}/thumbnails/cover-256.${thumbnailsExtension}`,
+          resizeBuffer,
+          inputs.file.type,
+        );
 
         fileData.image = {
           width,
           height,
           thumbnailsExtension,
         };
-      } catch (error1) {
+      } catch (error) {
-        try {
+        console.warn(error.stack); // eslint-disable-line no-console
-          rimraf.sync(thumbnailsPath);
-        } catch (error2) {
-          console.warn(error2.stack); // eslint-disable-line no-console
       }
     }
+
+    if (!filePath) {
+      try {
+        await rimraf(inputs.file.fd);
+      } catch (error) {
+        console.warn(error.stack); // eslint-disable-line no-console
+      }
     }
 
     return fileData;

server/api/helpers/attachments/update-one.js

@@ -59,6 +59,9 @@ module.exports = {
             cards: [inputs.card],
           },
         },
+        prevData: {
+          item: inputs.record,
+        },
         user: inputs.actorUser,
       });
     }

server/api/helpers/board-memberships/update-one.js

@@ -62,6 +62,9 @@ module.exports = {
             boards: [inputs.board],
           },
         },
+        prevData: {
+          item: inputs.record,
+        },
         user: inputs.actorUser,
       });
     }

server/api/helpers/boards/process-uploaded-trello-import-file.js

@@ -1,5 +1,5 @@
-const fs = require('fs').promises;
+const fs = require('fs');
-const rimraf = require('rimraf');
+const { rimraf } = require('rimraf');
 
 module.exports = {
   inputs: {
@@ -14,7 +14,7 @@ module.exports = {
   },
 
   async fn(inputs) {
-    const content = await fs.readFile(inputs.file.fd);
+    const content = await fs.promises.readFile(inputs.file.fd);
     const trelloBoard = JSON.parse(content);
 
     if (
@@ -28,7 +28,7 @@ module.exports = {
     }
 
     try {
-      rimraf.sync(inputs.file.fd);
+      await rimraf(inputs.file.fd);
     } catch (error) {
       console.warn(error.stack); // eslint-disable-line no-console
     }

server/api/helpers/boards/update-one.js

@@ -100,6 +100,9 @@ module.exports = {
             projects: [inputs.project],
           },
         },
+        prevData: {
+          item: inputs.record,
+        },
         user: inputs.actorUser,
       });
     }

server/api/helpers/cards/delete-one.js

@@ -1,7 +1,11 @@
-const buildAndSendMessage = async (card, actorUser, send) => {
+const buildAndSendMarkdownMessage = async (card, actorUser, send) => {
   await send(`*${card.name}* was deleted by ${actorUser.name}`);
 };
 
+const buildAndSendHtmlMessage = async (card, actorUser, send) => {
+  await send(`<b>${card.name}</b> was deleted by ${actorUser.name}`);
+};
+
 module.exports = {
   inputs: {
     record: {
@@ -56,11 +60,19 @@ module.exports = {
       });
 
       if (sails.config.custom.slackBotToken) {
-        buildAndSendMessage(card, inputs.actorUser, sails.helpers.utils.sendSlackMessage);
+        buildAndSendMarkdownMessage(card, inputs.actorUser, sails.helpers.utils.sendSlackMessage);
       }
 
       if (sails.config.custom.googleChatWebhookUrl) {
-        buildAndSendMessage(card, inputs.actorUser, sails.helpers.utils.sendGoogleChatMessage);
+        buildAndSendMarkdownMessage(
+          card,
+          inputs.actorUser,
+          sails.helpers.utils.sendGoogleChatMessage,
+        );
+      }
+
+      if (sails.config.custom.telegramBotToken) {
+        buildAndSendHtmlMessage(card, inputs.actorUser, sails.helpers.utils.sendTelegramMessage);
       }
     }
 

server/api/helpers/cards/update-one.js

@@ -264,6 +264,9 @@ module.exports = {
             lists: [list],
           },
         },
+        prevData: {
+          item: inputs.record,
+        },
         user: inputs.actorUser,
       });
 

server/api/helpers/labels/update-one.js

@@ -91,6 +91,9 @@ module.exports = {
             boards: [inputs.board],
           },
         },
+        prevData: {
+          item: inputs.record,
+        },
         user: inputs.actorUser,
       });
     }

server/api/helpers/lists/update-one.js

@@ -91,6 +91,9 @@ module.exports = {
             boards: [inputs.board],
           },
         },
+        prevData: {
+          item: inputs.record,
+        },
         user: inputs.actorUser,
       });
     }

server/api/helpers/notifications/update-many.js

@@ -48,6 +48,7 @@ module.exports = {
         inputs.request,
       );
 
+      // TODO: with prevData?
       sails.helpers.utils.sendWebhooks.with({
         event: 'notificationUpdate',
         data: {

server/api/helpers/projects/process-uploaded-background-image-file.js

@@ -1,6 +1,4 @@
-const fs = require('fs');
+const { rimraf } = require('rimraf');
-const path = require('path');
-const rimraf = require('rimraf');
 const { v4: uuid } = require('uuid');
 const sharp = require('sharp');
 
@@ -32,10 +30,10 @@ module.exports = {
       throw 'fileIsNotImage';
     }
 
-    const dirname = uuid();
+    const fileManager = sails.hooks['file-manager'].getInstance();
-    const rootPath = path.join(sails.config.custom.projectBackgroundImagesPath, dirname);
 
-    fs.mkdirSync(rootPath);
+    const dirname = uuid();
+    const dirPathSegment = `${sails.config.custom.projectBackgroundImagesPathSegment}/${dirname}`;
 
     let { width, pageHeight: height = metadata.height } = metadata;
     if (metadata.orientation && metadata.orientation > 4) {
@@ -45,9 +43,15 @@ module.exports = {
     const extension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;
 
     try {
-      await image.toFile(path.join(rootPath, `original.${extension}`));
+      const originalBuffer = await image.toBuffer();
 
-      await image
+      await fileManager.save(
+        `${dirPathSegment}/original.${extension}`,
+        originalBuffer,
+        inputs.file.type,
+      );
+
+      const cover336Buffer = await image
         .resize(
           336,
           200,
@@ -57,10 +61,18 @@ module.exports = {
               }
             : undefined,
         )
-        .toFile(path.join(rootPath, `cover-336.${extension}`));
+        .toBuffer();
+
+      await fileManager.save(
+        `${dirPathSegment}/cover-336.${extension}`,
+        cover336Buffer,
+        inputs.file.type,
+      );
     } catch (error1) {
+      console.warn(error1.stack); // eslint-disable-line no-console
+
       try {
-        rimraf.sync(rootPath);
+        fileManager.deleteDir(dirPathSegment);
       } catch (error2) {
         console.warn(error2.stack); // eslint-disable-line no-console
       }
@@ -69,7 +81,7 @@ module.exports = {
     }
 
     try {
-      rimraf.sync(inputs.file.fd);
+      await rimraf(inputs.file.fd);
     } catch (error) {
       console.warn(error.stack); // eslint-disable-line no-console
     }

server/api/helpers/projects/update-one.js

@@ -1,6 +1,3 @@
-const path = require('path');
-const rimraf = require('rimraf');
-
 const valuesValidator = (value) => {
   if (!_.isPlainObject(value)) {
     return false;
@@ -86,12 +83,11 @@ module.exports = {
         (!project.backgroundImage ||
           project.backgroundImage.dirname !== inputs.record.backgroundImage.dirname)
       ) {
+        const fileManager = sails.hooks['file-manager'].getInstance();
+
         try {
-          rimraf.sync(
+          await fileManager.deleteDir(
-            path.join(
+            `${sails.config.custom.projectBackgroundImagesPathSegment}/${inputs.record.backgroundImage.dirname}`,
-              sails.config.custom.projectBackgroundImagesPath,
-              inputs.record.backgroundImage.dirname,
-            ),
           );
         } catch (error) {
           console.warn(error.stack); // eslint-disable-line no-console
@@ -118,6 +114,9 @@ module.exports = {
         data: {
           item: project,
         },
+        prevData: {
+          item: inputs.record,
+        },
         user: inputs.actorUser,
       });
     }

server/api/helpers/tasks/update-one.js

@@ -101,6 +101,9 @@ module.exports = {
             cards: [inputs.card],
           },
         },
+        prevData: {
+          item: inputs.record,
+        },
         user: inputs.actorUser,
       });
     }

server/api/helpers/users/process-uploaded-avatar-file.js

@@ -1,6 +1,4 @@
-const fs = require('fs');
+const { rimraf } = require('rimraf');
-const path = require('path');
-const rimraf = require('rimraf');
 const { v4: uuid } = require('uuid');
 const sharp = require('sharp');
 
@@ -32,10 +30,10 @@ module.exports = {
       throw 'fileIsNotImage';
     }
 
-    const dirname = uuid();
+    const fileManager = sails.hooks['file-manager'].getInstance();
-    const rootPath = path.join(sails.config.custom.userAvatarsPath, dirname);
 
-    fs.mkdirSync(rootPath);
+    const dirname = uuid();
+    const dirPathSegment = `${sails.config.custom.userAvatarsPathSegment}/${dirname}`;
 
     let { width, pageHeight: height = metadata.height } = metadata;
     if (metadata.orientation && metadata.orientation > 4) {
@@ -45,9 +43,15 @@ module.exports = {
     const extension = metadata.format === 'jpeg' ? 'jpg' : metadata.format;
 
     try {
-      await image.toFile(path.join(rootPath, `original.${extension}`));
+      const originalBuffer = await image.toBuffer();
 
-      await image
+      await fileManager.save(
+        `${dirPathSegment}/original.${extension}`,
+        originalBuffer,
+        inputs.file.type,
+      );
+
+      const square100Buffer = await image
         .resize(
           100,
           100,
@@ -57,10 +61,18 @@ module.exports = {
               }
             : undefined,
         )
-        .toFile(path.join(rootPath, `square-100.${extension}`));
+        .toBuffer();
+
+      await fileManager.save(
+        `${dirPathSegment}/square-100.${extension}`,
+        square100Buffer,
+        inputs.file.type,
+      );
     } catch (error1) {
+      console.warn(error1.stack); // eslint-disable-line no-console
+
       try {
-        rimraf.sync(rootPath);
+        fileManager.deleteDir(dirPathSegment);
       } catch (error2) {
         console.warn(error2.stack); // eslint-disable-line no-console
       }
@@ -69,7 +81,7 @@ module.exports = {
     }
 
     try {
-      rimraf.sync(inputs.file.fd);
+      await rimraf(inputs.file.fd);
     } catch (error) {
       console.warn(error.stack); // eslint-disable-line no-console
     }

server/api/helpers/users/update-one.js

@@ -1,6 +1,4 @@
-const path = require('path');
 const bcrypt = require('bcrypt');
-const rimraf = require('rimraf');
 const { v4: uuid } = require('uuid');
 
 const valuesValidator = (value) => {
@@ -101,8 +99,12 @@ module.exports = {
         inputs.record.avatar &&
         (!user.avatar || user.avatar.dirname !== inputs.record.avatar.dirname)
       ) {
+        const fileManager = sails.hooks['file-manager'].getInstance();
+
         try {
-          rimraf.sync(path.join(sails.config.custom.userAvatarsPath, inputs.record.avatar.dirname));
+          await fileManager.deleteDir(
+            `${sails.config.custom.userAvatarsPathSegment}/${inputs.record.avatar.dirname}`,
+          );
         } catch (error) {
           console.warn(error.stack); // eslint-disable-line no-console
         }
@@ -159,6 +161,9 @@ module.exports = {
           data: {
             item: user,
           },
+          prevData: {
+            item: inputs.record,
+          },
           user: inputs.actorUser,
         });
       }

server/api/helpers/utils/receive-file.js

@@ -4,7 +4,7 @@ const { v4: uuid } = require('uuid');
 async function doUpload(paramName, req, options) {
   const uploadOptions = {
     ...options,
-    dirname: options.dirname || sails.config.custom.fileUploadTmpDir,
+    dirname: options.dirname || sails.config.custom.uploadsTempPath,
   };
   const upload = util.promisify((opts, callback) => {
     return req.file(paramName).upload(opts, (error, files) => callback(error, files));
@@ -33,7 +33,7 @@ module.exports = {
     exits.success(
       await doUpload(inputs.paramName, inputs.req, {
         saveAs: uuid(),
-        dirname: sails.config.custom.fileUploadTmpDir,
+        dirname: sails.config.custom.uploadsTempPath,
         maxBytes: null,
       }),
     );

server/api/helpers/utils/send-telegram-message.js

@@ -0,0 +1,44 @@
+const buildSendMessageApiUrl = (telegramBotToken) =>
+  `https://api.telegram.org/bot${telegramBotToken}/sendMessage`;
+
+module.exports = {
+  inputs: {
+    html: {
+      type: 'string',
+      required: true,
+    },
+  },
+
+  async fn(inputs) {
+    const headers = {
+      'Content-Type': 'application/json; charset=utf-8',
+    };
+
+    const body = {
+      chat_id: sails.config.custom.telegramChatId,
+      text: inputs.html,
+      parse_mode: 'HTML',
+    };
+
+    if (sails.config.custom.telegramThreadId) {
+      body.message_thread_id = sails.config.custom.telegramThreadId;
+    }
+
+    let response;
+    try {
+      response = await fetch(buildSendMessageApiUrl(sails.config.custom.telegramBotToken), {
+        headers,
+        method: 'POST',
+        body: JSON.stringify(body),
+      });
+    } catch (error) {
+      sails.log.error(`Error sending to Telegram: ${error}`);
+      return;
+    }
+
+    if (!response.ok) {
+      const responseJson = await response.json();
+      sails.log.error(`Error sending to Telegram: ${responseJson.description}`);
+    }
+  },
+};

server/api/helpers/utils/send-webhooks.js

@@ -97,10 +97,11 @@ const jsonifyData = (data) => {
  * @param {*} webhook - Webhook configuration.
  * @param {string} event - The event (see {@link EVENT_TYPES}).
  * @param {Data} data - The data object containing event data and optionally included data.
+ * @param {Data} [prevData] - The data object containing previous state of data (optional).
  * @param {ref} user - User object associated with the event.
  * @returns {Promise<void>}
  */
-async function sendWebhook(webhook, event, data, user) {
+async function sendWebhook(webhook, event, data, prevData, user) {
   const headers = {
     'Content-Type': 'application/json',
     'User-Agent': `planka (+${sails.config.custom.baseUrl})`,
@@ -113,6 +114,7 @@ async function sendWebhook(webhook, event, data, user) {
   const body = JSON.stringify({
     event,
     data: jsonifyData(data),
+    prevData: prevData && jsonifyData(prevData),
     user: sails.helpers.utils.jsonifyRecord(user),
   });
 
@@ -148,6 +150,9 @@ module.exports = {
       type: 'ref',
       required: true,
     },
+    prevData: {
+      type: 'ref',
+    },
     user: {
       type: 'ref',
       required: true,
@@ -172,7 +177,7 @@ module.exports = {
         return;
       }
 
-      sendWebhook(webhook, inputs.event, inputs.data, inputs.user);
+      sendWebhook(webhook, inputs.event, inputs.data, inputs.prevData, inputs.user);
     });
   },
 };

server/api/hooks/file-manager/LocalFileManager.js

@@ -0,0 +1,51 @@
+const fs = require('fs');
+const fse = require('fs-extra');
+const path = require('path');
+const { rimraf } = require('rimraf');
+
+const PATH_SEGMENT_TO_URL_REPLACE_REGEX = /(public|private)\//;
+
+const buildPath = (pathSegment) => path.join(sails.config.custom.uploadsBasePath, pathSegment);
+
+class LocalFileManager {
+  // eslint-disable-next-line class-methods-use-this
+  async move(sourceFilePath, filePathSegment) {
+    const { dir, base } = path.parse(filePathSegment);
+
+    const dirPath = buildPath(dir);
+    const filePath = path.join(dirPath, base);
+
+    await fs.promises.mkdir(dirPath);
+    await fse.move(sourceFilePath, filePath);
+
+    return filePath;
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  async save(filePathSegment, buffer) {
+    await fse.outputFile(buildPath(filePathSegment), buffer);
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  read(filePathSegment) {
+    const filePath = buildPath(filePathSegment);
+
+    if (!fs.existsSync(filePath)) {
+      throw new Error('File does not exist');
+    }
+
+    return fs.createReadStream(filePath);
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  async deleteDir(dirPathSegment) {
+    await rimraf(buildPath(dirPathSegment));
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  buildUrl(filePathSegment) {
+    return `${sails.config.custom.baseUrl}/${filePathSegment.replace(PATH_SEGMENT_TO_URL_REPLACE_REGEX, '')}`;
+  }
+}
+
+module.exports = LocalFileManager;

server/api/hooks/file-manager/S3FileManager.js

@@ -0,0 +1,76 @@
+const fs = require('fs');
+const {
+  DeleteObjectsCommand,
+  GetObjectCommand,
+  ListObjectsV2Command,
+  PutObjectCommand,
+} = require('@aws-sdk/client-s3');
+
+class S3FileManager {
+  constructor(client) {
+    this.client = client;
+  }
+
+  async move(sourceFilePath, filePathSegment, contentType) {
+    const command = new PutObjectCommand({
+      Bucket: sails.config.custom.s3Bucket,
+      Key: filePathSegment,
+      Body: fs.createReadStream(sourceFilePath),
+      ContentType: contentType,
+    });
+
+    await this.client.send(command);
+
+    return null;
+  }
+
+  async save(filePathSegment, buffer, contentType) {
+    const command = new PutObjectCommand({
+      Bucket: sails.config.custom.s3Bucket,
+      Key: filePathSegment,
+      Body: buffer,
+      ContentType: contentType,
+    });
+
+    await this.client.send(command);
+  }
+
+  async read(filePathSegment) {
+    const command = new GetObjectCommand({
+      Bucket: sails.config.custom.s3Bucket,
+      Key: filePathSegment,
+    });
+
+    const result = await this.client.send(command);
+    return result.Body;
+  }
+
+  async deleteDir(dirPathSegment) {
+    const listObjectsCommand = new ListObjectsV2Command({
+      Bucket: sails.config.custom.s3Bucket,
+      Prefix: dirPathSegment,
+    });
+
+    const result = await this.client.send(listObjectsCommand);
+
+    if (!result.Contents || result.Contents.length === 0) {
+      return;
+    }
+
+    const deleteObjectsCommand = new DeleteObjectsCommand({
+      Bucket: sails.config.custom.s3Bucket,
+      Delete: {
+        Objects: result.Contents.map(({ Key }) => ({ Key })),
+      },
+    });
+
+    await this.client.send(deleteObjectsCommand);
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  buildUrl(filePathSegment) {
+    return `${sails.hooks.s3.getBaseUrl()}/${filePathSegment}`;
+  }
+}
+
+module.exports = S3FileManager;

server/api/hooks/file-manager/index.js

@@ -0,0 +1,41 @@
+const LocalFileManager = require('./LocalFileManager');
+const S3FileManager = require('./S3FileManager');
+
+/**
+ * file-manager hook
+ *
+ * @description :: A hook definition. Extends Sails by adding shadow routes, implicit actions,
+ *                 and/or initialization logic.
+ * @docs        :: https://sailsjs.com/docs/concepts/extending-sails/hooks
+ */
+
+module.exports = function defineFileManagerHook(sails) {
+  let instance = null;
+
+  const createInstance = () => {
+    instance = sails.hooks.s3.isActive()
+      ? new S3FileManager(sails.hooks.s3.getClient())
+      : new LocalFileManager();
+  };
+
+  return {
+    /**
+     * Runs when this Sails app loads/lifts.
+     */
+
+    async initialize() {
+      sails.log.info('Initializing custom hook (`file-manager`)');
+
+      return new Promise((resolve) => {
+        sails.after('hook:s3:loaded', () => {
+          createInstance();
+          resolve();
+        });
+      });
+    },
+
+    getInstance() {
+      return instance;
+    },
+  };
+};

server/api/hooks/s3/index.js

@@ -0,0 +1,64 @@
+const { URL } = require('url');
+const { S3Client } = require('@aws-sdk/client-s3');
+
+/**
+ * s3 hook
+ *
+ * @description :: A hook definition. Extends Sails by adding shadow routes, implicit actions,
+ *                 and/or initialization logic.
+ * @docs        :: https://sailsjs.com/docs/concepts/extending-sails/hooks
+ */
+
+module.exports = function defineS3Hook(sails) {
+  let client = null;
+
+  return {
+    /**
+     * Runs when this Sails app loads/lifts.
+     */
+
+    async initialize() {
+      if (!sails.config.custom.s3Endpoint && !sails.config.custom.s3Region) {
+        return;
+      }
+
+      sails.log.info('Initializing custom hook (`s3`)');
+
+      client = new S3Client({
+        endpoint: sails.config.custom.s3Endpoint,
+        region: sails.config.custom.s3Region || '-',
+        credentials: {
+          accessKeyId: sails.config.custom.s3AccessKeyId,
+          secretAccessKey: sails.config.custom.s3SecretAccessKey,
+        },
+        forcePathStyle: sails.config.custom.s3ForcePathStyle,
+      });
+    },
+
+    getClient() {
+      return client;
+    },
+
+    getBaseUrl() {
+      if (sails.config.custom.s3Endpoint) {
+        const { protocol, host } = new URL(sails.config.custom.s3Endpoint);
+
+        if (sails.config.custom.s3ForcePathStyle) {
+          return `${protocol}//${host}/${sails.config.custom.s3Bucket}`;
+        }
+
+        return `${protocol}//${sails.config.custom.s3Bucket}.${host}`;
+      }
+
+      if (sails.config.custom.s3ForcePathStyle) {
+        return `https://s3.${sails.config.custom.s3Region}.amazonaws.com/${sails.config.custom.s3Bucket}`;
+      }
+
+      return `https://${sails.config.custom.s3Bucket}.s3.${sails.config.custom.s3Region}.amazonaws.com`;
+    },
+
+    isActive() {
+      return client !== null;
+    },
+  };
+};

server/api/models/Attachment.js

@@ -50,9 +50,9 @@ module.exports = {
   customToJSON() {
     return {
       ..._.omit(this, ['dirname', 'filename', 'image.thumbnailsExtension']),
-      url: `${sails.config.custom.attachmentsUrl}/${this.id}/download/${this.filename}`,
+      url: `${sails.config.custom.baseUrl}/attachments/${this.id}/download/${this.filename}`,
       coverUrl: this.image
-        ? `${sails.config.custom.attachmentsUrl}/${this.id}/download/thumbnails/cover-256.${this.image.thumbnailsExtension}`
+        ? `${sails.config.custom.baseUrl}/attachments/${this.id}/download/thumbnails/cover-256.${this.image.thumbnailsExtension}`
         : null,
     };
   },

server/api/models/Project.js

@@ -79,11 +79,13 @@ module.exports = {
   },
 
   customToJSON() {
+    const fileManager = sails.hooks['file-manager'].getInstance();
+
     return {
       ..._.omit(this, ['backgroundImage']),
       backgroundImage: this.backgroundImage && {
-        url: `${sails.config.custom.projectBackgroundImagesUrl}/${this.backgroundImage.dirname}/original.${this.backgroundImage.extension}`,
+        url: `${fileManager.buildUrl(`${sails.config.custom.projectBackgroundImagesPathSegment}/${this.backgroundImage.dirname}/original.${this.backgroundImage.extension}`)}`,
-        coverUrl: `${sails.config.custom.projectBackgroundImagesUrl}/${this.backgroundImage.dirname}/cover-336.${this.backgroundImage.extension}`,
+        coverUrl: `${fileManager.buildUrl(`${sails.config.custom.projectBackgroundImagesPathSegment}/${this.backgroundImage.dirname}/cover-336.${this.backgroundImage.extension}`)}`,
       },
     };
   },

server/api/models/User.js

@@ -147,6 +147,7 @@ module.exports = {
   tableName: 'user_account',
 
   customToJSON() {
+    const fileManager = sails.hooks['file-manager'].getInstance();
     const isDefaultAdmin = this.email === sails.config.custom.defaultAdminEmail;
 
     return {
@@ -157,7 +158,7 @@ module.exports = {
       isDeletionLocked: isDefaultAdmin,
       avatarUrl:
         this.avatar &&
-        `${sails.config.custom.userAvatarsUrl}/${this.avatar.dirname}/square-100.${this.avatar.extension}`,
+        `${fileManager.buildUrl(`${sails.config.custom.userAvatarsPathSegment}/${this.avatar.dirname}/square-100.${this.avatar.extension}`)}`,
     };
   },
 };

server/config/custom.js

@@ -8,11 +8,10 @@
  * https://sailsjs.com/config/custom
  */
 
-const url = require('url');
+const { URL } = require('url');
-const path = require('path');
 const sails = require('sails');
 
-const parsedBasedUrl = new url.URL(process.env.BASE_URL);
+const parsedBasedUrl = new URL(process.env.BASE_URL);
 
 module.exports.custom = {
   /**
@@ -28,24 +27,26 @@ module.exports.custom = {
   tokenExpiresIn: parseInt(process.env.TOKEN_EXPIRES_IN, 10) || 365,
 
   // Location to receive uploaded files in. Default (non-string value) is a Sails-specific location.
-  fileUploadTmpDir: null,
+  uploadsTempPath: null,
+  uploadsBasePath: sails.config.appPath,
 
-  userAvatarsPath: path.join(sails.config.paths.public, 'user-avatars'),
+  userAvatarsPathSegment: 'public/user-avatars',
-  userAvatarsUrl: `${process.env.BASE_URL}/user-avatars`,
+  projectBackgroundImagesPathSegment: 'public/project-background-images',
-
+  attachmentsPathSegment: 'private/attachments',
-  projectBackgroundImagesPath: path.join(sails.config.paths.public, 'project-background-images'),
-  projectBackgroundImagesUrl: `${process.env.BASE_URL}/project-background-images`,
-
-  attachmentsPath: path.join(sails.config.appPath, 'private', 'attachments'),
-  attachmentsUrl: `${process.env.BASE_URL}/attachments`,
 
   defaultAdminEmail:
     process.env.DEFAULT_ADMIN_EMAIL && process.env.DEFAULT_ADMIN_EMAIL.toLowerCase(),
 
   showDetailedAuthErrors: process.env.SHOW_DETAILED_AUTH_ERRORS === 'true',
-
   allowAllToCreateProjects: process.env.ALLOW_ALL_TO_CREATE_PROJECTS === 'true',
 
+  s3Endpoint: process.env.S3_ENDPOINT,
+  s3Region: process.env.S3_REGION,
+  s3AccessKeyId: process.env.S3_ACCESS_KEY_ID,
+  s3SecretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
+  s3Bucket: process.env.S3_BUCKET,
+  s3ForcePathStyle: process.env.S3_FORCE_PATH_STYLE === 'true',
+
   oidcIssuer: process.env.OIDC_ISSUER,
   oidcClientId: process.env.OIDC_CLIENT_ID,
   oidcClientSecret: process.env.OIDC_CLIENT_SECRET,
@@ -82,5 +83,10 @@ module.exports.custom = {
 
   slackBotToken: process.env.SLACK_BOT_TOKEN,
   slackChannelId: process.env.SLACK_CHANNEL_ID,
+
   googleChatWebhookUrl: process.env.GOOGLE_CHAT_WEBHOOK_URL,
+
+  telegramBotToken: process.env.TELEGRAM_BOT_TOKEN,
+  telegramChatId: process.env.TELEGRAM_CHAT_ID,
+  telegramThreadId: process.env.TELEGRAM_THREAD_ID,
 };

server/config/env/production.js

@@ -19,11 +19,11 @@
  * https://sailsjs.com/docs/concepts/deployment
  */
 
-const url = require('url');
+const { URL } = require('url');
 
 const { customLogger } = require('../../utils/logger');
 
-const parsedBasedUrl = new url.URL(process.env.BASE_URL);
+const parsedBasedUrl = new URL(process.env.BASE_URL);
 
 module.exports = {
   /**

server/config/routes.js

@@ -135,13 +135,21 @@ module.exports.routes = {
   'PATCH /api/notifications/:ids': 'notifications/update',
 
   'GET /user-avatars/*': {
-    fn: staticDirServer('/user-avatars', () => path.resolve(sails.config.custom.userAvatarsPath)),
+    fn: staticDirServer('/user-avatars', () =>
+      path.join(
+        path.resolve(sails.config.custom.uploadsBasePath),
+        sails.config.custom.userAvatarsPathSegment,
+      ),
+    ),
     skipAssets: false,
   },
 
   'GET /project-background-images/*': {
     fn: staticDirServer('/project-background-images', () =>
-      path.resolve(sails.config.custom.projectBackgroundImagesPath),
+      path.join(
+        path.resolve(sails.config.custom.uploadsBasePath),
+        sails.config.custom.projectBackgroundImagesPathSegment,
+      ),
     ),
     skipAssets: false,
   },

server/package.json

@@ -8,7 +8,6 @@
     "db:migrate": "knex migrate:latest --cwd db",
     "db:seed": "knex seed:run --cwd db",
     "lint": "eslint . --max-warnings=0 --report-unused-disable-directives && echo '✔  Your .js files look good.'",
-    "preinstall": "npx npm-force-resolutions",
     "start": "nodemon",
     "start:prod": "node app.js --prod",
     "test": "mocha test/lifecycle.test.js test/integration/**/*.test.js test/utils/**/*.test.js"
@@ -28,18 +27,19 @@
     }
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.688.0",
     "bcrypt": "^5.1.1",
     "dotenv": "^16.4.5",
     "dotenv-cli": "^7.4.2",
+    "fs-extra": "^11.2.0",
     "jsonwebtoken": "^9.0.2",
     "knex": "^3.1.0",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
-    "move-file": "^2.1.0",
     "nodemailer": "^6.9.15",
     "openid-client": "^5.7.0",
     "rimraf": "^5.0.10",
-    "sails": "^1.5.11",
+    "sails": "^1.5.12",
     "sails-hook-orm": "^4.0.3",
     "sails-hook-sockets": "^3.0.1",
     "sails-postgresql": "^5.0.1",
@@ -59,11 +59,6 @@
     "mocha": "^10.7.3",
     "nodemon": "^3.1.4"
   },
-  "resolutions": {
-    "body-parser": "1.20.3",
-    "express": "4.21.0",
-    "send": "0.19.0"
-  },
   "engines": {
     "node": ">=18"
   }