Merge branch 'master' into fix/textExportPDF

Author: RodriSanchez1

package.json

@@ -51,10 +51,10 @@
     "keycode": "^2.2.1",
     "lodash": "^4.17.21",
     "mathjs": "7.6.0",
-    "microsoft-cognitiveservices-speech-sdk": "^1.31.0",
+    "microsoft-cognitiveservices-speech-sdk": "^1.32.0",
     "mime-types": "^2.1.35",
     "moment": "2.29.4",
-    "mongoose": "^6.11.4",
+    "mongoose": "^6.12.0",
     "ogv": "^1.8.9",
     "opencollective": "^1.0.3",
     "pdfmake": "^0.2.7",
@@ -69,7 +69,7 @@
     "react-dom": "^17.0.2",
     "react-grid-layout": "^0.16.6",
     "react-helmet": "^6.1.0",
-    "react-icons": "^4.10.1",
+    "react-icons": "^4.11.0",
     "react-intl": "^2.7.2",
     "react-joyride": "^2.5.4",
     "react-markdown": "^5.0.3",

src/api/api.js

@@ -16,6 +16,7 @@ import { isAndroid } from '../cordova-util';
 
 const BASE_URL = API_URL;
 const LOCAL_COMMUNICATOR_ID = 'cboard_default';
+export let improvePhraseAbortController;
 
 const getUserData = () => {
   const store = getStore();
@@ -626,6 +627,32 @@ class API {
       return data;
     }
   }
+
+  async improvePhrase({ phrase, language }) {
+    const authToken = getAuthToken();
+    if (!(authToken && authToken.length)) {
+      throw new Error('Need to be authenticated to perform this request');
+    }
+
+    try {
+      const headers = {
+        Authorization: `Bearer ${authToken}`
+      };
+      improvePhraseAbortController = new AbortController();
+      const { data } = await this.axiosInstance.post(
+        `/gpt/edit`,
+        { phrase, language },
+        {
+          headers,
+          signal: improvePhraseAbortController.signal
+        }
+      );
+      return data;
+    } catch (error) {
+      if (error.message !== 'canceled') console.error(error);
+      return { phrase: '' };
+    }
+  }
 }
 
 const API_INSTANCE = new API({});

src/components/Account/SignUp/SignUp.actions.js

@@ -5,8 +5,5 @@ import { API_URL } from '../../../constants';
 
 export function signUp(formValues) {
   const endpoint = `${API_URL}user`;
-  return axios
-    .post(endpoint, formValues)
-    .then(get('data'))
-    .catch(get('response.data'));
+  return axios.post(endpoint, formValues).then(get('data'));
 }

src/components/Account/SignUp/SignUp.component.js

@@ -52,7 +52,16 @@ export class SignUp extends Component {
 
     signUp(formValues)
       .then(signUpStatus => this.setState({ signUpStatus }))
-      .catch(signUpStatus => this.setState({ signUpStatus }))
+      .catch(error => {
+        const responseMessage = error?.response?.data?.message;
+        const message = responseMessage
+          ? responseMessage
+          : this.props.intl.formatMessage(messages.noConnection);
+
+        this.setState({
+          signUpStatus: { success: false, message: message }
+        });
+      })
       .finally(() => this.setState({ isSigningUp: false }));
   };
 

src/components/Account/SignUp/SignUp.messages.js

@@ -40,5 +40,9 @@ export default defineMessages({
   privacy: {
     id: 'cboard.components.SignUp.privacy',
     defaultMessage: 'Privacy Policy'
+  },
+  noConnection: {
+    id: 'cboard.components.SignUp.noConnection',
+    defaultMessage: 'Unable to connect to the server. Please try again later.'
   }
 });

src/components/App/App.reducer.js

@@ -50,7 +50,8 @@ const initialState = {
     quickUnlockActive: false,
     removeOutputActive: false,
     vocalizeFolders: false,
-    liveMode: false
+    liveMode: false,
+    improvePhraseActive: false
   },
   symbolsSettings: {
     arasaacActive: false

src/components/App/__tests__/App.reducer.test.js

@@ -6,7 +6,7 @@ import {
   FINISH_FIRST_VISIT,
   UPDATE_CONNECTIVITY,
   UPDATE_DISPLAY_SETTINGS,
-  UPDATE_NAVIGATION_SETTINGS,
+  UPDATE_NAVIGATION_SETTINGS
 } from '../App.constants';
 import appReducer from '../App.reducer';
 
@@ -24,9 +24,9 @@ describe('reducer', () => {
         communicatorTour: {
           isCommBoardsEnabled: true,
           isPublicBoardsEnabled: true,
-          isAllMyBoardsEnabled: true,
+          isAllMyBoardsEnabled: true
         },
-        isAnalyticsTourEnabled: true,
+        isAnalyticsTourEnabled: true
       },
       displaySettings: {
         uiSize: DISPLAY_SIZE_STANDARD,
@@ -35,7 +35,7 @@ describe('reducer', () => {
         hideOutputActive: false,
         increaseOutputButtons: false,
         labelPosition: 'Below',
-        darkThemeActive: false,
+        darkThemeActive: false
       },
       navigationSettings: {
         active: false,
@@ -47,11 +47,12 @@ describe('reducer', () => {
         quickUnlockActive: false,
         removeOutputActive: false,
         vocalizeFolders: false,
+        improvePhraseActive: false
       },
       symbolsSettings: {
-        arasaacActive: false,
+        arasaacActive: false
       },
-      userData: {},
+      userData: {}
     };
     uData = { name: 'martin bedouret', email: '[email protected]' };
     mockApp = {
@@ -62,7 +63,7 @@ describe('reducer', () => {
         labelPosition: 'Below',
         fontFamily: DEFAULT_FONT_FAMILY,
         fontSize: 'Standard',
-        darkThemeActive: false,
+        darkThemeActive: false
       },
       isConnected: true,
       isFirstVisit: false,
@@ -76,8 +77,9 @@ describe('reducer', () => {
         quickUnlockActive: false,
         removeOutputActive: false,
         vocalizeFolders: false,
+        improvePhraseActive: false
       },
-      userData: uData,
+      userData: uData
     };
   });
   it('should return the initial state', () => {
@@ -86,57 +88,57 @@ describe('reducer', () => {
   it('should handle login ', () => {
     const login = {
       type: LOGIN_SUCCESS,
-      payload: uData,
+      payload: uData
     };
     expect(appReducer(initialState, login)).toEqual({
       ...initialState,
       userData: uData,
-      isFirstVisit: false,
+      isFirstVisit: false
     });
   });
   it('should handle logout', () => {
     const logout = {
-      type: LOGOUT,
+      type: LOGOUT
     };
     expect(appReducer(initialState, logout)).toEqual(initialState);
   });
   it('should handle updateDisplaySettings', () => {
     const updateDisplaySettings = {
       type: UPDATE_DISPLAY_SETTINGS,
-      payload: mockApp.displaySettings,
+      payload: mockApp.displaySettings
     };
     expect(appReducer(initialState, updateDisplaySettings)).toEqual({
       ...initialState,
-      displaySettings: mockApp.displaySettings,
+      displaySettings: mockApp.displaySettings
     });
   });
   it('should handle updateNavigationSettings', () => {
     const updateNavigationSettings = {
       type: UPDATE_NAVIGATION_SETTINGS,
-      payload: mockApp.navigationSettings,
+      payload: mockApp.navigationSettings
     };
     expect(appReducer(initialState, updateNavigationSettings)).toEqual({
       ...initialState,
-      navigationSettings: mockApp.navigationSettings,
+      navigationSettings: mockApp.navigationSettings
     });
   });
   it('should handle finishFirstVisit ', () => {
     const finishFirstVisit = {
-      type: FINISH_FIRST_VISIT,
+      type: FINISH_FIRST_VISIT
     };
     expect(appReducer(initialState, finishFirstVisit)).toEqual({
       ...initialState,
-      isFirstVisit: false,
+      isFirstVisit: false
     });
   });
   it('should handle updateConnectivity', () => {
     const updateConnectivity = {
       type: UPDATE_CONNECTIVITY,
-      payload: false,
+      payload: false
     };
     expect(appReducer(initialState, updateConnectivity)).toEqual({
       ...initialState,
-      isConnected: false,
+      isConnected: false
     });
   });
 });

src/components/Board/Board.actions.js

@@ -17,6 +17,7 @@ import {
   CLICK_SYMBOL,
   CLICK_OUTPUT,
   CHANGE_OUTPUT,
+  CHANGE_IMPROVED_PHRASE,
   CHANGE_LIVE_MODE,
   REPLACE_BOARD,
   HISTORY_REMOVE_BOARD,
@@ -55,6 +56,7 @@ import {
 import { isAndroid, writeCvaFile } from '../../cordova-util';
 import { DEFAULT_BOARDS } from '../../helpers';
 import history from './../../history';
+import { improvePhraseAbortController } from '../../api/api';
 
 const BOARDS_PAGE_LIMIT = 100;
 
@@ -324,9 +326,42 @@ export function clickOutput(outputPhrase) {
 }
 
 export function changeOutput(output) {
-  return {
-    type: CHANGE_OUTPUT,
-    output
+  return async (dispatch, getState) => {
+    const {
+      app: {
+        navigationSettings: { improvePhraseActive }
+      }
+    } = getState();
+    if (improvePhraseActive) dispatch(improvePhrase(output));
+    dispatch({
+      type: CHANGE_OUTPUT,
+      output
+    });
+  };
+}
+
+export function improvePhrase(output) {
+  const fetchImprovePhrase = async language => {
+    const MIN_TILES_TO_IMPROVE = 1;
+    if (output.length <= MIN_TILES_TO_IMPROVE) return '';
+    const labels = output.map(symbol => symbol.label);
+    const phrase = labels.join(' '); //this.handlePhraseToShare();
+    const improvedPhrase = await API.improvePhrase({ phrase, language });
+    return improvedPhrase.phrase;
+  };
+  return async (dispatch, getState) => {
+    try {
+      const language = getState().language.lang;
+      if (improvePhraseAbortController?.abort)
+        improvePhraseAbortController.abort();
+      const improvedPhrase = await fetchImprovePhrase(language);
+      dispatch({
+        type: CHANGE_IMPROVED_PHRASE,
+        improvedPhrase
+      });
+    } catch (err) {
+      console.error('error', err);
+    }
   };
 }
 

src/components/Board/Board.component.js

@@ -34,6 +34,7 @@ import './Board.css';
 import BoardTour from './BoardTour/BoardTour';
 import ScrollButtons from '../ScrollButtons';
 import { NAVIGATION_BUTTONS_STYLE_SIDES } from '../Settings/Navigation/Navigation.constants';
+import ImprovePhraseOutput from './ImprovePhraseOutput';
 
 export class Board extends Component {
   static propTypes = {
@@ -315,7 +316,9 @@ export class Board extends Component {
       setIsScroll,
       isScroll,
       totalRows,
-      changeDefaultBoard
+      changeDefaultBoard,
+      improvedPhrase,
+      speak
     } = this.props;
 
     const tiles = this.renderTiles(board.tiles);
@@ -524,7 +527,12 @@ export class Board extends Component {
               />
             )}
           </div>
-
+          {navigationSettings.improvePhraseActive && (
+            <ImprovePhraseOutput
+              improvedPhrase={improvedPhrase}
+              speak={speak}
+            />
+          )}
           <Dialog
             open={this.state.openTitleDialog}
             aria-labelledby="board-dialog-title"

src/components/Board/Board.constants.js

@@ -15,6 +15,7 @@ export const FOCUS_TILE = 'cboard/Board/FOCUS_TILE';
 export const CLICK_SYMBOL = 'cboard/Board/CLICK_SYMBOL';
 export const CLICK_OUTPUT = 'cboard/Board/CLICK_OUTPUT';
 export const CHANGE_OUTPUT = 'cboard/Board/CHANGE_OUTPUT';
+export const CHANGE_IMPROVED_PHRASE = 'cboard/Board/CHANGE_IMPROVED_PHRASE';
 export const CHANGE_LIVE_MODE = 'cboard/Board/CHANGE_LIVE_MODE';
 export const HISTORY_REMOVE_BOARD = 'cboard/Board/HISTORY_REMOVE_BOARD';
 export const UNMARK_BOARD = 'cboard/Board/UNMARK_BOARD';

src/components/Board/Board.container.js

@@ -1540,7 +1540,9 @@ export class BoardContainer extends Component {
       navHistory,
       board,
       focusTile,
-      isPremiumRequiredModalOpen
+      isPremiumRequiredModalOpen,
+      improvedPhrase,
+      speak
     } = this.props;
 
     if (!this.state.translatedBoard) {
@@ -1614,6 +1616,8 @@ export class BoardContainer extends Component {
           totalRows={this.state.totalRows}
           ref={this.boardRef}
           changeDefaultBoard={this.props.changeDefaultBoard}
+          improvedPhrase={improvedPhrase}
+          speak={speak}
         />
         <Dialog
           open={!!this.state.copyPublicBoard && !isPremiumRequiredModalOpen}
@@ -1726,7 +1730,8 @@ const mapStateToProps = ({
     offlineVoiceAlert,
     isRootBoardTourEnabled: liveHelp.isRootBoardTourEnabled,
     isUnlockedTourEnabled: liveHelp.isUnlockedTourEnabled,
-    isPremiumRequiredModalOpen: premiumRequiredModalState?.open
+    isPremiumRequiredModalOpen: premiumRequiredModalState?.open,
+    improvedPhrase: board.improvedPhrase
   };
 };