From b7304a4eeaa365c5d76b5a1420696debac0ffc83 Mon Sep 17 00:00:00 2001
From: Rahul Gupta <rahul@MacBook-Air.local>
Date: Thu, 12 Sep 2024 21:21:41 -0700
Subject: [PATCH 1/6] WIP

---
 src/editor/components/scenegraph/Toolbar.js | 40 +++++++++++++++++++--
 src/editor/lib/history.js                   |  4 +--
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/editor/components/scenegraph/Toolbar.js b/src/editor/components/scenegraph/Toolbar.js
index da6326e5..a353a10e 100644
--- a/src/editor/components/scenegraph/Toolbar.js
+++ b/src/editor/components/scenegraph/Toolbar.js
@@ -15,12 +15,13 @@ import {
 import Events from '../../lib/Events';
 import { saveBlob } from '../../lib/utils';
 import { Button, ProfileButton } from '../components';
-import { SavingModal } from '../modals/SavingModal';
 import { uploadThumbnailImage } from '../modals/ScreenshotModal/ScreenshotModal.component.jsx';
 import { sendMetric } from '../../services/ga.js';
 import posthog from 'posthog-js';
 import { UndoRedo } from '../components/UndoRedo';
+import debounce from 'lodash-es/debounce';
 // const LOCALSTORAGE_MOCAP_UI = "aframeinspectormocapuienabled";
+import styles from '../modals/SavingModal/SavingModal.module.scss';
 
 function filterHelpers(scene, visible) {
   scene.traverse((o) => {
@@ -73,6 +74,13 @@ export default class Toolbar extends Component {
   componentDidMount() {
     document.addEventListener('click', this.handleClickOutsideSave);
     this.checkSignInStatus();
+    Events.on('historychanged', (cmd) => {
+      if (cmd) {
+        console.log('historychanged', cmd);
+        // Debounce the cloudSaveHandler call
+        this.debouncedCloudSaveHandler({ doSaveAs: false });
+      }
+    });
   }
 
   componentDidUpdate(prevProps) {
@@ -285,6 +293,8 @@ export default class Toolbar extends Component {
     }
   };
 
+  debouncedCloudSaveHandler = debounce(this.cloudSaveHandler, 1000);
+
   handleRemixClick = () => {
     posthog.capture('remix_scene_clicked');
     if (!this.props.currentUser) {
@@ -398,9 +408,33 @@ export default class Toolbar extends Component {
                 leadingIcon={<Save24Icon />}
                 onClick={this.toggleSaveActionState.bind(this)}
               >
-                <div className="hideInLowResolution">Save</div>
+                {this.state.isSavingScene ? (
+                  <div className={styles.preloaderBox}>
+                    <svg
+                      className={styles.preloader}
+                      width="60"
+                      height="60"
+                      viewBox="0 0 60 60"
+                      fill="none"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <g clipPath="url(#clip0_2302_26913)">
+                        <path
+                          d="M45.91 14.0902L42.375 17.6252C39.5123 14.7622 35.7454 12.9804 31.7162 12.5833C27.6871 12.1863 23.6448 13.1986 20.2783 15.4477C16.9118 17.6968 14.4294 21.0437 13.2538 24.918C12.0783 28.7923 12.2826 32.9543 13.8317 36.6949C15.3808 40.4355 18.1791 43.5233 21.7496 45.4321C25.3201 47.3408 29.442 47.9525 33.4129 47.1629C37.3839 46.3733 40.9582 44.2313 43.5269 41.1018C46.0956 37.9723 47.4997 34.0489 47.5 30.0002H52.5C52.5 35.2057 50.695 40.2502 47.3926 44.274C44.0903 48.2979 39.4948 51.0522 34.3894 52.0677C29.2839 53.0832 23.9842 52.2971 19.3934 49.8432C14.8026 47.3893 11.2047 43.4195 9.21265 38.6103C7.22063 33.801 6.95778 28.4498 8.46889 23.4685C9.98 18.4871 13.1716 14.1839 17.4998 11.2919C21.828 8.3999 27.0251 7.09813 32.2055 7.60839C37.386 8.11865 42.2292 10.4094 45.91 14.0902Z"
+                          fill="white"
+                        />
+                      </g>
+                      <defs>
+                        <clipPath id="clip0_2302_26913">
+                          <rect width="60" height="60" fill="white" />
+                        </clipPath>
+                      </defs>
+                    </svg>
+                  </div>
+                ) : (
+                  <div className="hideInLowResolution">Save</div>
+                )}
               </Button>
-              {this.state.isSavingScene && <SavingModal />}
               {this.state.isSaveActionActive && (
                 <div className="dropdownedButtons">
                   <Button
diff --git a/src/editor/lib/history.js b/src/editor/lib/history.js
index 6b40f285..5cd1eb12 100644
--- a/src/editor/lib/history.js
+++ b/src/editor/lib/history.js
@@ -95,7 +95,7 @@ export class History {
     this.undos = [];
     this.redos = [];
     this.idCounter = 0;
-
-    Events.emit('historychanged');
+    console.log('history cleared');
+    Events.emit('historychanged', null);
   }
 }

From a31a716bc033d7d5161c2ba6be396c5f960a8dfc Mon Sep 17 00:00:00 2001
From: Rahul Gupta <rahul@MacBook-Air.local>
Date: Fri, 13 Sep 2024 09:26:43 -0700
Subject: [PATCH 2/6] better notifications

---
 src/components/notify.js                    | 11 +++++++----
 src/editor/components/scenegraph/Toolbar.js | 12 +++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/notify.js b/src/components/notify.js
index ecd9a9cb..e7991f79 100644
--- a/src/components/notify.js
+++ b/src/components/notify.js
@@ -44,19 +44,22 @@ AFRAME.registerComponent('notify', {
     if (STREET) {
       STREET.notify = {};
       STREET.notify.successMessage = (messageText) => {
-        this.message(messageText, 'success');
+        return this.message(messageText, 'success');
       };
       STREET.notify.errorMessage = (messageText) => {
-        this.message(messageText, 'error');
+        return this.message(messageText, 'error');
       };
       STREET.notify.warningMessage = (messageText) => {
-        this.message(messageText, 'warning');
+        return this.message(messageText, 'warning');
+      };
+      STREET.notify.dismissNotification = (notification) => {
+        return this.notify.dismiss(notification);
       };
     }
   },
   message: function (messageText, messageType = 'info') {
     if (messageText && this.types.includes(messageType)) {
-      this.notify.open({
+      return this.notify.open({
         type: messageType,
         message: messageText
       });
diff --git a/src/editor/components/scenegraph/Toolbar.js b/src/editor/components/scenegraph/Toolbar.js
index a353a10e..8ff7440b 100644
--- a/src/editor/components/scenegraph/Toolbar.js
+++ b/src/editor/components/scenegraph/Toolbar.js
@@ -66,7 +66,8 @@ export default class Toolbar extends Component {
       isSavingScene: false,
       pendingSceneSave: false,
       signInSuccess: false,
-      isAuthor: props.isAuthor
+      isAuthor: props.isAuthor,
+      notification: null
     };
     this.saveButtonRef = React.createRef();
   }
@@ -180,6 +181,9 @@ export default class Toolbar extends Component {
 
   cloudSaveHandler = async ({ doSaveAs = false }) => {
     try {
+      if (this.state.notification) {
+        STREET.notify.dismissNotification(this.state.notification);
+      }
       // if there is no current user, show sign in modal
       let currentSceneId = STREET.utils.getCurrentSceneId();
       let currentSceneTitle = STREET.utils.getCurrentSceneTitle();
@@ -277,9 +281,11 @@ export default class Toolbar extends Component {
         );
         this.setState({ savedNewDocument: false }); // go back to default assumption of save overwrite
       } else {
-        STREET.notify.successMessage(
+        const notification = STREET.notify.successMessage(
           'Scene saved to 3DStreet Cloud in existing file.'
         );
+        this.setState({ notification });
+        console.log('message', notification);
       }
       this.setState({ isAuthor: true });
       sendMetric('SaveSceneAction', doSaveAs ? 'saveAs' : 'save');
@@ -293,7 +299,7 @@ export default class Toolbar extends Component {
     }
   };
 
-  debouncedCloudSaveHandler = debounce(this.cloudSaveHandler, 1000);
+  debouncedCloudSaveHandler = debounce(this.cloudSaveHandler, 500);
 
   handleRemixClick = () => {
     posthog.capture('remix_scene_clicked');

From fb5b0569e9f42c60a27e7e7026914acecc1a25e1 Mon Sep 17 00:00:00 2001
From: Rahul Gupta <rahul@MacBook-Air.local>
Date: Fri, 13 Sep 2024 11:58:22 -0700
Subject: [PATCH 3/6] dont run autosave if the user is not logged in

---
 src/editor/components/scenegraph/Toolbar.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/editor/components/scenegraph/Toolbar.js b/src/editor/components/scenegraph/Toolbar.js
index 8ff7440b..081e7b1d 100644
--- a/src/editor/components/scenegraph/Toolbar.js
+++ b/src/editor/components/scenegraph/Toolbar.js
@@ -79,7 +79,7 @@ export default class Toolbar extends Component {
       if (cmd) {
         console.log('historychanged', cmd);
         // Debounce the cloudSaveHandler call
-        this.debouncedCloudSaveHandler({ doSaveAs: false });
+        this.debouncedCloudSaveHandler();
       }
     });
   }
@@ -89,8 +89,6 @@ export default class Toolbar extends Component {
       this.setState({ isAuthor: this.props.isAuthor });
     }
     if (this.props.currentUser !== prevProps.currentUser) {
-      console.log('component updated');
-      console.log(this.props);
       this.setState({ currentUser: this.props.currentUser });
 
       if (this.state.pendingSceneSave && this.props.currentUser) {
@@ -196,6 +194,7 @@ export default class Toolbar extends Component {
       });
 
       if (!this.props.currentUser) {
+        console.log('no user');
         Events.emit('opensigninmodal');
         return;
       }
@@ -299,7 +298,11 @@ export default class Toolbar extends Component {
     }
   };
 
-  debouncedCloudSaveHandler = debounce(this.cloudSaveHandler, 500);
+  debouncedCloudSaveHandler = debounce(() => {
+    if (this.state.currentUser) {
+      this.cloudSaveHandler({ doSaveAs: false });
+    }
+  }, 500);
 
   handleRemixClick = () => {
     posthog.capture('remix_scene_clicked');

From e70027b5a4311375db101638cf9f1e69d7b53307 Mon Sep 17 00:00:00 2001
From: Rahul Gupta <rahul@MacBook-Air.local>
Date: Fri, 13 Sep 2024 12:03:51 -0700
Subject: [PATCH 4/6] prevent saving of geospatial scenes if user isn't pro

---
 src/editor/components/scenegraph/Toolbar.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/editor/components/scenegraph/Toolbar.js b/src/editor/components/scenegraph/Toolbar.js
index 081e7b1d..8cb789b8 100644
--- a/src/editor/components/scenegraph/Toolbar.js
+++ b/src/editor/components/scenegraph/Toolbar.js
@@ -300,6 +300,18 @@ export default class Toolbar extends Component {
 
   debouncedCloudSaveHandler = debounce(() => {
     if (this.state.currentUser) {
+      const streetGeo = document
+        .getElementById('reference-layers')
+        ?.getAttribute('street-geo');
+      if (
+        !this.props.currentUser.isPro &&
+        streetGeo &&
+        streetGeo['latitude'] &&
+        streetGeo['longitude']
+      ) {
+        Events.emit('openpaymentmodal');
+        return;
+      }
       this.cloudSaveHandler({ doSaveAs: false });
     }
   }, 500);

From bb360cc30369e66b18dd2aa64bd8327a60166446 Mon Sep 17 00:00:00 2001
From: Rahul Gupta <rahul@MacBook-Air-3.local>
Date: Mon, 23 Sep 2024 16:59:23 -0700
Subject: [PATCH 5/6] handle scenario where user goes offline w/ autosave

---
 src/editor/api/scene.js                     |  2 +-
 src/editor/components/scenegraph/Toolbar.js | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/editor/api/scene.js b/src/editor/api/scene.js
index 1a8fbfd5..fea4fcaf 100644
--- a/src/editor/api/scene.js
+++ b/src/editor/api/scene.js
@@ -106,7 +106,7 @@ const isSceneAuthor = async ({ sceneId, authorId }) => {
     }
   } catch (error) {
     console.error('Error fetching scene while running isSceneAuthor:', error);
-    return false;
+    throw new Error('Error checking scene authorship');
   }
 };
 
diff --git a/src/editor/components/scenegraph/Toolbar.js b/src/editor/components/scenegraph/Toolbar.js
index 8cb789b8..394147c8 100644
--- a/src/editor/components/scenegraph/Toolbar.js
+++ b/src/editor/components/scenegraph/Toolbar.js
@@ -212,12 +212,16 @@ export default class Toolbar extends Component {
         Events.emit('openpaymentmodal');
         return;
       }
-
+      let isCurrentUserTheSceneAuthor;
       // if owner != doc.id then doSaveAs = true;
-      const isCurrentUserTheSceneAuthor = await isSceneAuthor({
-        sceneId: currentSceneId,
-        authorId: this.props.currentUser.uid
-      });
+      try {
+        isCurrentUserTheSceneAuthor = await isSceneAuthor({
+          sceneId: currentSceneId,
+          authorId: this.props.currentUser.uid
+        });
+      } catch (error) {
+        return;
+      }
 
       if (!isCurrentUserTheSceneAuthor) {
         doSaveAs = true;

From e7de9a7ff1d894f60564da1b4eceac28a7623678 Mon Sep 17 00:00:00 2001
From: Rahul Gupta <rahul@MacBook-Air-3.local>
Date: Mon, 23 Sep 2024 17:16:02 -0700
Subject: [PATCH 6/6] set disabled property on save button

---
 src/editor/components/scenegraph/Toolbar.js | 29 ++-------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/editor/components/scenegraph/Toolbar.js b/src/editor/components/scenegraph/Toolbar.js
index 394147c8..01417a98 100644
--- a/src/editor/components/scenegraph/Toolbar.js
+++ b/src/editor/components/scenegraph/Toolbar.js
@@ -21,7 +21,6 @@ import posthog from 'posthog-js';
 import { UndoRedo } from '../components/UndoRedo';
 import debounce from 'lodash-es/debounce';
 // const LOCALSTORAGE_MOCAP_UI = "aframeinspectormocapuienabled";
-import styles from '../modals/SavingModal/SavingModal.module.scss';
 
 function filterHelpers(scene, visible) {
   scene.traverse((o) => {
@@ -432,33 +431,9 @@ export default class Toolbar extends Component {
               <Button
                 leadingIcon={<Save24Icon />}
                 onClick={this.toggleSaveActionState.bind(this)}
+                disabled={this.state.isSavingScene}
               >
-                {this.state.isSavingScene ? (
-                  <div className={styles.preloaderBox}>
-                    <svg
-                      className={styles.preloader}
-                      width="60"
-                      height="60"
-                      viewBox="0 0 60 60"
-                      fill="none"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <g clipPath="url(#clip0_2302_26913)">
-                        <path
-                          d="M45.91 14.0902L42.375 17.6252C39.5123 14.7622 35.7454 12.9804 31.7162 12.5833C27.6871 12.1863 23.6448 13.1986 20.2783 15.4477C16.9118 17.6968 14.4294 21.0437 13.2538 24.918C12.0783 28.7923 12.2826 32.9543 13.8317 36.6949C15.3808 40.4355 18.1791 43.5233 21.7496 45.4321C25.3201 47.3408 29.442 47.9525 33.4129 47.1629C37.3839 46.3733 40.9582 44.2313 43.5269 41.1018C46.0956 37.9723 47.4997 34.0489 47.5 30.0002H52.5C52.5 35.2057 50.695 40.2502 47.3926 44.274C44.0903 48.2979 39.4948 51.0522 34.3894 52.0677C29.2839 53.0832 23.9842 52.2971 19.3934 49.8432C14.8026 47.3893 11.2047 43.4195 9.21265 38.6103C7.22063 33.801 6.95778 28.4498 8.46889 23.4685C9.98 18.4871 13.1716 14.1839 17.4998 11.2919C21.828 8.3999 27.0251 7.09813 32.2055 7.60839C37.386 8.11865 42.2292 10.4094 45.91 14.0902Z"
-                          fill="white"
-                        />
-                      </g>
-                      <defs>
-                        <clipPath id="clip0_2302_26913">
-                          <rect width="60" height="60" fill="white" />
-                        </clipPath>
-                      </defs>
-                    </svg>
-                  </div>
-                ) : (
-                  <div className="hideInLowResolution">Save</div>
-                )}
+                <div className="hideInLowResolution">Save</div>
               </Button>
               {this.state.isSaveActionActive && (
                 <div className="dropdownedButtons">