Merge branch 'master' into patch-1

Gemfile.lock

@@ -159,7 +159,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (3.0.5)
+    carrierwave (3.0.7)
       activemodel (>= 6.0.0)
       activesupport (>= 6.0.0)
       addressable (~> 2.6)
@@ -245,7 +245,6 @@ GEM
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
     ffi (1.16.3)
-    ffi (1.16.3-x64-mingw32)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -295,7 +294,7 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.2)
       i18n (>= 0.6.6)
@@ -390,7 +389,7 @@ GEM
       activerecord (>= 6.0)
       job-iteration (~> 1.3.6)
       railties (>= 6.0)
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
     meta-tags (2.16.0)
       actionpack (>= 3.2.0, < 7.1)
@@ -401,7 +400,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.22.2)
+    minitest (5.22.3)
     msgpack (1.6.0)
     multi_xml (0.6.0)
     nested_form (0.3.2)
@@ -707,7 +706,7 @@ GEM
     ruby-saml (1.14.0)
       nokogiri (>= 1.10.5)
       rexml
-    ruby-vips (2.2.0)
+    ruby-vips (2.2.1)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     ruby2ruby (2.4.4)

app/assets/stylesheets/components.scss

@@ -347,6 +347,9 @@
   color: $white;
   font-weight: 500;
   padding: 5px;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
 
   &:hover {
     color: $white;

app/views/layouts/_google_analytics.html.erb

@@ -1,11 +1,13 @@
-<script async src="https://www.googletagmanager.com/gtag/js?id=UA-112678513-1"></script>
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-X0YHVTDQVR"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
-  function gtag() { dataLayer.push(arguments); }
+  function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
 
-  gtag('config', 'UA-112678513-1');
+  gtag('config', 'G-X0YHVTDQVR');
+
   <% if (current_user) %>
-  gtag('set', { 'user_id': '<%= current_user.id %>' }); // Set the user ID using signed-in user_id.
+    gtag('set', { 'user_id': '<%= current_user.id %>' }); // Set the user ID using signed-in user_id.
   <% end %>
 </script>

simulator/src/data/backupCircuit.js

@@ -17,9 +17,6 @@ export function checkIfBackup(scope) {
 }
 
 export function backUp(scope = globalScope) {
-    // Disconnection of subcircuits are needed because these are the connections between nodes
-    // in current scope and those in the subcircuit's scope
-    for (let i = 0; i < scope.SubCircuit.length; i++) { scope.SubCircuit[i].removeConnections(); }
 
     var data = {};
 
@@ -51,9 +48,6 @@ export function backUp(scope = globalScope) {
     data.nodes = [];
     for (let i = 0; i < scope.nodes.length; i++) { data.nodes.push(scope.allNodes.indexOf(scope.nodes[i])); }
 
-    // Restoring the connections
-    for (let i = 0; i < scope.SubCircuit.length; i++) { scope.SubCircuit[i].makeConnections(); }
-
     return data;
 }
 

simulator/src/data/save.js

@@ -104,7 +104,12 @@ export function generateSaveData(name, setName = true) {
         }
 
         completed[id] = true;
-        update(scopeList[id]); // For any pending integrity checks on subcircuits
+
+        // Removed: no such check is required. saveScope should be strictly read only and
+        // should not change state
+        // update might change state.
+
+        // update(scopeList[id]); // For any pending integrity checks on subcircuits
         data.scopes.push(backUp(scopeList[id]));
     }
 

simulator/src/node.js

@@ -237,6 +237,9 @@ export default class Node {
             connections: [],
         };
         for (var i = 0; i < this.connections.length; i++) {
+            // For connections from scope.Subcircuit.node to localscope.input/output.node
+            // these connections should be ignored while saving.
+            if (this.connections[i].scope != this.scope) continue;
             data.connections.push(findNode(this.connections[i]));
         }
         return data;