scratch project remix support

Author: Titanium2099

src/lib/project-fetcher-hoc.jsx

@@ -50,6 +50,7 @@ const ProjectFetcherHOC = function (WrappedComponent) {
                 'fetchProject'
             ]);
             storage.setProjectHost(props.projectHost);
+            storage.setCTProjectHost(props.projectHost);
             storage.setProjectToken(props.projectToken);
             storage.setAssetHost(props.assetHost);
             storage.setAssetLoadHost(props.assetLoadHost);

src/lib/project-saver-hoc.jsx

@@ -196,11 +196,24 @@ const ProjectSaverHOC = function (WrappedComponent) {
         }
         createRemixToStorage () {
             this.props.onShowCreatingRemixAlert();
-            return this.storeProject(null, {
+            const requestParams = {
                 originalId: this.props.reduxProjectId,
                 isRemix: 1,
                 title: this.props.reduxProjectTitle
-            })
+            };
+            if (this.props.isScratchProject) {
+                requestParams.source = 'scratch';
+                
+                // Mark all assets as dirty so storeProject() will upload them
+                // to the CodeTorch S3/Backend instead of relying on Scratch CDNs
+                // originally we were going to optimize and load from Scratch CDN until user modifies
+                // but with how bad Scratch has been this is safer
+                this.props.vm.assets.forEach(asset => {
+                    asset.clean = false;
+                });
+            }
+
+            return this.storeProject(null, requestParams)
                 .then(response => {
                     this.props.onCreatedProject(response.id.toString(), this.props.loadingState);
                     this.props.onShowRemixSuccessAlert();
@@ -367,6 +380,7 @@ const ProjectSaverHOC = function (WrappedComponent) {
         isRemixing: PropTypes.bool,
         isShared: PropTypes.bool,
         isShowingSaveable: PropTypes.bool,
+        isScratchProject: PropTypes.bool,
         isShowingWithId: PropTypes.bool,
         isShowingWithoutId: PropTypes.bool,
         isUpdating: PropTypes.bool,
@@ -424,7 +438,8 @@ const ProjectSaverHOC = function (WrappedComponent) {
             projectChanged: state.scratchGui.projectChanged,
             reduxProjectId: state.scratchGui.projectState.projectId,
             reduxProjectTitle: state.scratchGui.projectTitle,
-            vm: state.scratchGui.vm
+            vm: state.scratchGui.vm,
+            isScratchProject: state.scratchGui.projectState.isScratchProject
         };
     };
     const mapDispatchToProps = dispatch => ({

src/lib/save-project-to-server.js

@@ -29,6 +29,8 @@ export default function (projectId, vmState, params) {
     if (Object.prototype.hasOwnProperty.call(params, 'isCopy')) queryParams.is_copy = params.isCopy;
     if (Object.prototype.hasOwnProperty.call(params, 'isRemix')) queryParams.is_remix = params.isRemix;
     if (Object.prototype.hasOwnProperty.call(params, 'title')) queryParams.title = params.title;
+    if (Object.prototype.hasOwnProperty.call(params, 'source')) queryParams.source = params.source;
+
     let qs = queryString.stringify(queryParams);
     if (qs) qs = `?${qs}`;
 
@@ -42,12 +44,12 @@ export default function (projectId, vmState, params) {
         if (creatingProject) {
             Object.assign(opts, {
                 method: 'post',
-                url: `${storage.projectHost}/${qs}`
+                url: `${storage.CTprojectHost}/${qs}`
             });
         } else {
             Object.assign(opts, {
                 method: 'put',
-                url: `${storage.projectHost}/${projectId}${qs}`
+                url: `${storage.CTprojectHost}/${projectId}${qs}`
             });
         }
 

src/lib/storage.js

@@ -40,6 +40,9 @@ class Storage extends ScratchStorage {
     setProjectHost (projectHost) {
         this.projectHost = projectHost;
     }
+    setCTProjectHost (projectHost) { // this is the same regardless of wether scratch project or not
+        this.CTprojectHost = projectHost;
+    }
     setProjectToken (projectToken) {
         this.projectToken = projectToken;
     }

src/lib/tw-project-meta-fetcher-hoc.jsx

@@ -43,6 +43,8 @@ export const fetchProjectMeta = async (projectId, isScratch) => {
             if (res.ok) {
                 if (isScratch){
                     storage.setScratchProjectToken(data.project_token); // so we can load actual project JSON file
+
+                    const canRemix = (authToken && authToken !== 'anonymous') ? 'true' : 'false';
                     return {
                         title: data.title,
                         author: {
@@ -52,7 +54,7 @@ export const fetchProjectMeta = async (projectId, isScratch) => {
                         instructions: data.instructions,
                         description: data.description,
                         canSave: 'false',
-                        canRemix: 'false'
+                        canRemix: canRemix
                     };
                 }
                 return data;