Fix #6653: subsims during write params

sirepo/lib.py

@@ -21,11 +21,12 @@
 class LibAdapterBase:
     """Common functionality between code specific LibAdapter implementations."""
 
-    def __init__(self, ignore_files=None):
+    def __init__(self, ignore_files=None, update_filenames=False):
         m = inspect.getmodule(self)
         self._sim_data, _, self._schema = sirepo.sim_data.template_globals(m.SIM_TYPE)
         self._code_var = m.code_var
         self._ignore_files = ignore_files if ignore_files else []
+        self._update_filenames = update_filenames
 
     def _convert(self, data):
         def _model(model, name):
@@ -77,7 +78,9 @@ def _write_input_files(self, data, source_path, dest_dir):
         for f in set(
             LatticeUtil(data, self._schema)
             .iterate_models(
-                lattice.InputFileIterator(self._sim_data, update_filenames=False),
+                lattice.InputFileIterator(
+                    self._sim_data, update_filenames=self._update_filenames
+                ),
             )
             .result,
         ):
@@ -112,11 +115,12 @@ class Importer:
         ignore_files (list): files ignored during verification and symlink routines [None]
     """
 
-    def __init__(self, sim_type, ignore_files=None):
+    def __init__(self, sim_type, ignore_files=None, update_filenames=False):
         import sirepo.template
 
         self.__adapter = sirepo.template.import_module(sim_type).LibAdapter(
-            ignore_files or []
+            ignore_files or [],
+            update_filenames,
         )
 
     def parse_file(self, path):

sirepo/package_data/static/css/omega.css

@@ -215,4 +215,9 @@
   .table-hover > tbody > tr:hover {
     background-color: var(--sr-item-bg-dark-mode);
   }
+
+  .sr-login-panel, .help-block {
+    color: var(--sr-panel-text-dark-mode);
+  }
+
 }

sirepo/package_data/static/js/elegant.js

@@ -485,6 +485,37 @@ SIREPO.app.controller('VisualizationController', function(appState, elegantServi
         return columns[1];
     }
 
+    const defaultColumns = {
+        twiss_output: {
+            "y1": "betax",
+            "y2": "betay",
+            "y3": "etax",
+        },
+        "run_setup.sigma": {
+            "y1": "Sx",
+            "y2": "Sy",
+            "y3": "Ss",
+        },
+        "run_setup.centroid": {
+            "y1": "Cx",
+            "y2": "Cy",
+        },
+    };
+
+    function setDefaultColumns(model, plottableColumns) {
+        model.x = plottableColumns[0];
+        for (const f in defaultColumns) {
+            if (model.xFile.includes(f)) {
+                for (const y in defaultColumns[f]) {
+                    if (plottableColumns.includes(defaultColumns[f][y])) {
+                        model[y] = defaultColumns[f][y];
+                    }
+                }
+                model.includeLattice = "1";
+            }
+        }
+    }
+
     self.simHandleStatus = function (data) {
         self.simulationAlerts = data.alert || '';
         if (data.frameCount) {
@@ -562,9 +593,9 @@ SIREPO.app.controller('VisualizationController', function(appState, elegantServi
                 m = appState.models[modelKey] = {
                     xFile: info.filename,
                     y1File: info.filename,
-                    x: info.plottableColumns[0],
                     xFileId: info.id,
                 };
+                setDefaultColumns(m, info.plottableColumns);
                 // Only display the first outputFile
                 if (i > 0 && ! panelState.isHidden(modelKey)) {
                     panelState.toggleHidden(modelKey);

sirepo/package_data/static/js/omega.js

@@ -164,6 +164,9 @@ SIREPO.app.directive('beamAndPhasePlots', function(appState, omegaService) {
             };
 
             $scope.$on('modelChanged', (e, name) => {
+                if (! $scope.reports) {
+                    return;
+                }
                 for (const sim of $scope.reports) {
                     if (name === sim[1][0].modelKey) {
                         const updated = [];
@@ -183,7 +186,7 @@ SIREPO.app.directive('beamAndPhasePlots', function(appState, omegaService) {
     };
 });
 
-SIREPO.app.directive('dynamicSimList', function(appState, requestSender) {
+SIREPO.app.directive('dynamicSimList', function(appState) {
     return {
         restrict: 'A',
         scope: {
@@ -196,20 +199,6 @@ SIREPO.app.directive('dynamicSimList', function(appState, requestSender) {
           </div>
         `,
         controller: function($scope) {
-            const requestSimListByType = (simType) => {
-                requestSender.sendRequest(
-                    'listSimulations',
-                    () => {},
-                    {
-                        simulationType: simType,
-                    }
-                );
-            };
-            if (SIREPO.APP_SCHEMA.relatedSimTypes) {
-                SIREPO.APP_SCHEMA.relatedSimTypes.forEach(simType => {
-                    requestSimListByType(simType);
-                });
-            }
             $scope.selectedCode = () => {
                 if ($scope.model) {
                     $scope.code = $scope.model.simulationType;

sirepo/package_data/static/js/sirepo-components.js

@@ -3465,6 +3465,7 @@ SIREPO.app.directive('completeRegistration', function() {
     return {
         restrict: 'A',
         template: `
+          <div class="sr-login-panel">
             <form class="form-horizontal" autocomplete="off" novalidate>
               <div class="form-group">
                 <div class="col-sm-offset-3 col-sm-10">
@@ -3484,6 +3485,7 @@ SIREPO.app.directive('completeRegistration', function() {
                 </div>
               </div>
             </form>
+          </div>
         `,
     };
 });
@@ -3493,6 +3495,7 @@ SIREPO.app.directive('emailLogin', function(requestSender, errorService) {
         restrict: 'A',
         scope: {},
         template: `
+          <div class="sr-login-panel">
             <div data-ng-show="isJupyterHub" class="alert alert-info col-sm-offset-2 col-sm-10" role="alert">
             We're improving your Jupyter experience by making both Jupyter and Sirepo accessible via a single email login. Simply follow the directions below to complete this process.
             </div>
@@ -3521,6 +3524,7 @@ SIREPO.app.directive('emailLogin', function(requestSender, errorService) {
             <div data-confirmation-modal="" data-is-required="true" data-id="sr-email-login-done" data-title="Check your inbox" data-ok-text="" data-cancel-text="">
               <p>We just emailed a confirmation link to {{ data.sentEmail }}. Click the link and you'll be signed in. You may close this window.</p>
             </div>
+          </div>
         `,
         controller: function($scope) {
             function handleResponse(data) {
@@ -3570,6 +3574,7 @@ SIREPO.app.directive('emailLoginConfirm', function() {
     return {
         restrict: 'A',
         template: `
+          <div class="sr-login-panel">
             <div class="row text-center">
               <p>Please click the button below to complete the login process.</p>
             </div>
@@ -3579,6 +3584,7 @@ SIREPO.app.directive('emailLoginConfirm', function() {
                  <button data-ng-click="loginConfirm.submit()" class="btn btn-primary">Confirm</button>
               </div>
             </form>
+          </div>
         `,
     };
 });
@@ -5246,23 +5252,38 @@ SIREPO.app.directive('simList', function(appState, requestSender) {
             route: '@',
         },
         template: `
-            <span data-loading-spinner data-sentinel="simList">
+            <span data-loading-spinner data-sentinel="items">
               <div style="white-space: nowrap">
-                <select style="display: inline-block" class="form-control" data-ng-model="model[field]" data-ng-options="item.simulationId as itemName(item) disable when item.invalidMsg for item in simList"></select>
+                <select style="display: inline-block" class="form-control" data-ng-model="model[field]" data-ng-options="item.simulationId as item.name disable when item.isInvalid for item in items"></select>
 
                 <button type="button" style="padding: 3px 10px 5px 10px; margin-top: -1px" title="View Simulation" class="btn btn-default" data-ng-click="openSimulation()"><span class="glyphicon glyphicon-eye-open"></span></button>
               </div>
             </span>
         `,
         controller: function($scope) {
-            $scope.simList = null;
 
-            // special processing of the item's name if necessary
-            $scope.itemName = function(item) {
-                return item.invalidMsg ? `${item.name} <${item.invalidMsg}>` : item.name;
-            };
+            function buildList(simList) {
+                $scope.items = [];
+                for (const s of simList) {
+                    $scope.items.push({
+                        simulationId: s.simulationId,
+                        isInvalid: s.invalidMsg ? true : false,
+                        name: itemName(s),
+                    });
+                }
+                $scope.items.sort((a, b) => a.name.localeCompare(b.name));
+            }
+
+            function itemName(sim) {
+                const n = sim.folder === '/'
+                        ? `/${sim.name}`
+                        : `${sim.folder}/${sim.name}`;
+                return sim.invalidMsg
+                     ? `${n} <${sim.invalidMsg}>`
+                     : n;
+            }
 
-            $scope.openSimulation = function() {
+            $scope.openSimulation = () => {
                 if ($scope.model && $scope.model[$scope.field]) {
                     requestSender.openSimulation(
                         $scope.code,
@@ -5271,14 +5292,13 @@ SIREPO.app.directive('simList', function(appState, requestSender) {
                     );
                 }
             };
-            appState.whenModelsLoaded($scope, function() {
+
+            appState.whenModelsLoaded($scope, () => {
                 requestSender.sendStatefulCompute(
                     appState,
-                    function(data) {
+                    (data) => {
                         if (appState.isLoaded() && data.simList) {
-                            $scope.simList = data.simList.sort(function(a, b) {
-                                return a.name.localeCompare(b.name);
-                            });
+                            buildList(data.simList);
                         }
                     },
                     {