Merge branch 'develop' into riteshwadhwani/issue2879

Author: raclim

client/modules/IDE/actions/assets.js

@@ -10,7 +10,13 @@ export function getAssets() {
     dispatch(startLoader());
     try {
       const response = await apiClient.get('/S3/objects');
-      dispatch(setAssets(response.data.assets, response.data.totalSize));
+
+      const assetData = {
+        assets: response.data.assets,
+        totalSize: response.data.totalSize
+      };
+
+      dispatch(setAssets(assetData));
       dispatch(stopLoader());
     } catch (error) {
       dispatch({

client/modules/IDE/reducers/assets.js

@@ -9,7 +9,10 @@ const assetsSlice = createSlice({
   name: 'assets',
   initialState,
   reducers: {
-    setAssets: (state, action) => action.payload,
+    setAssets: (state, action) => {
+      state.list = action.payload.assets;
+      state.totalSize = action.payload.totalSize;
+    },
     deleteAsset: (state, action) => {
       const key = action.payload;
       const index = state.list.findIndex((asset) => asset.key === key);

client/modules/User/components/SocialAuthButton.jsx

@@ -8,6 +8,7 @@ import { remSize } from '../../../theme';
 import { GithubIcon, GoogleIcon } from '../../../common/icons';
 import Button from '../../../common/Button';
 import { unlinkService } from '../actions';
+import { persistState } from '../../IDE/actions/project';
 
 const authUrls = {
   github: '/auth/github',
@@ -64,6 +65,7 @@ function SocialAuthButton({ service, linkStyle, isConnected }) {
       <StyledButton
         iconBefore={<ServiceIcon aria-label={ariaLabel} />}
         href={authUrls[service]}
+        onClick={() => dispatch(persistState())}
       >
         {connectLabel}
       </StyledButton>
@@ -73,6 +75,7 @@ function SocialAuthButton({ service, linkStyle, isConnected }) {
     <StyledButton
       iconBefore={<ServiceIcon aria-label={ariaLabel} />}
       href={authUrls[service]}
+      onClick={() => dispatch(persistState())}
     >
       {loginLabel}
     </StyledButton>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.10.2",
+  "version": "2.11.0",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",
@@ -154,6 +154,7 @@
   },
   "dependencies": {
     "@auth0/s3": "^1.0.0",
+    "@aws-sdk/client-s3": "^3.412.0",
     "@babel/core": "^7.14.6",
     "@babel/register": "^7.14.5",
     "@emmetio/codemirror-plugin": "^1.2.4",