add extra button

Author: pmandrik

runregistry_backend/controllers/run.js

@@ -16,7 +16,7 @@ const {
 const { update_or_create_dataset } = require('./dataset');
 const { create_new_version } = require('./version');
 const { fill_dataset_triplet_cache } = require('./dataset_triplet_cache');
-const { manually_update_a_run } = require('../cron/2.save_or_update_runs');
+const { manually_update_a_run , manually_update_a_run_reset_rr_attributes } = require('../cron/2.save_or_update_runs');
 const {
   create_offline_waiting_datasets,
 } = require('../cron_datasets/1.create_datasets');
@@ -578,6 +578,32 @@ exports.refreshRunClassAndComponents = async (req, res) => {
   res.json(saved_run);
 };
 
+exports.resetAndRefreshRunRRatributes = async (req, res) => {
+  const { run_number } = req.params;
+  const email = req.get('email');
+  const previously_saved_run = await Run.findByPk(run_number);
+  if (previously_saved_run === null) {
+    throw 'Run not found';
+  }
+  if (previously_saved_run.rr_attributes.state !== 'OPEN') {
+    throw 'Run must be in state OPEN to be refreshed';
+  }
+
+  await manually_update_a_run_reset_rr_attributes(run_number, {
+    email,
+    comment: `${email} requested reset and refresh from OMS`,
+  });
+  const saved_run = await Run.findByPk(run_number, {
+    include: [
+      {
+        model: DatasetTripletCache,
+        attributes: ['triplet_summary'],
+      },
+    ],
+  });
+  res.json(saved_run);
+};
+
 exports.moveRun = async (req, res) => {
   const { to_state } = req.params;
   const { run_number } = req.body;

runregistry_backend/cron/2.save_or_update_runs.js

@@ -270,6 +270,33 @@ exports.manually_update_a_run = async (
   });
 };
 
+exports.manually_update_a_run_reset_rr_attributes = (
+  run_number,
+  { email, comment, manually_significant, atomic_version }
+) => {
+  // get rr_attributes:
+  const { data: saved_run } = await axios.get(`${API_URL}/runs/${run_number}`);
+  const previous_rr_attributes = None;
 
-
+  if (previous_rr_attributes.state !== 'OPEN') {
+    throw 'Run must be in state OPEN to be refreshed';
+  }
+  // get oms_attributes:
+  const endpoint = `${OMS_URL}/${OMS_SPECIFIC_RUN(run_number)}`;
+  const {
+    data: { data: fetched_run },
+  } = await instance.get(endpoint, {
+    headers: {
+      Authorization: `Bearer ${await getToken()}`,
+    },
+  });
+  const run_oms_attributes = fetched_run[0].attributes;
+  await exports.update_runs([run_oms_attributes], 0, {
+    previous_rr_attributes,
+    email,
+    comment,
+    manually_significant,
+    atomic_version,
+  });
+};
 

runregistry_backend/routes/run.js

@@ -25,8 +25,6 @@ module.exports = app => {
   // Shifter actions:
   app.post('/runs/mark_significant', auth, catchAPI(Run.markSignificant));
   app.post('/runs/move_run/:from_state/:to_state', auth, catchAPI(Run.moveRun));
-  app.post(
-    '/runs/refresh_run/:run_number',
-    catchAPI(Run.refreshRunClassAndComponents)
-  );
+  app.post('/runs/refresh_run/:run_number',           catchAPI(Run.refreshRunClassAndComponents));
+  app.post('/runs/reset_and_refresh_run/:run_number', catchAPI(Run.resetAndRefreshRunRRatributes));
 };

runregistry_frontend/components/online/manage_run/manageRun/editRunLumisections/EditRunLumisections.js

@@ -71,9 +71,7 @@ class EditRunLumisections extends Component {
                     reverseButtons: true,
                   });
                   if (value) {
-                    const updated_run = await this.props.refreshRun(
-                      run.run_number
-                    );
+                    const updated_run = await this.props.refreshRun( run.run_number );
                     await Swal(`Run updated`, '', 'success');
                     await this.props.showManageRunModal(updated_run);
                     this.fetchLumisections();
@@ -83,6 +81,28 @@ class EditRunLumisections extends Component {
               >
                 Manually refresh component's statuses
               </Button>
+
+              <Button
+                onClick={async (evt) => {
+                  const { value } = await Swal({
+                    type: 'warning',
+                    title: `If a status was previously edited by a shifter, it will not be updated, it will only change those untouched.`,
+                    text: '',
+                    showCancelButton: true,
+                    confirmButtonText: 'Yes',
+                    reverseButtons: true,
+                  });
+                  if (value) {
+                    const updated_run = await this.props.resetAndRefreshRun( run.run_number );
+                    await Swal(`Run updated`, '', 'success');
+                    await this.props.showManageRunModal(updated_run);
+                    this.fetchLumisections();
+                  }
+                }}
+                type="primary"
+              >
+                Reset RR attributes and refresh
+              </Button>
             </div>
             <br />
 

runregistry_frontend/ducks/online/runs.js

@@ -83,6 +83,18 @@ export const refreshRun = run_number =>
     return run;
   });
 
+export const resetAndRefreshRun = run_number =>
+  error_handler(async (dispatch, getState) => {
+    let { data: run } = await axios.post(
+      `${api_url}/runs/reset_and_refresh_run/${run_number}`,
+      {},
+      auth(getState)
+    );
+    run = formatRuns([run])[0];
+    dispatch({ type: EDIT_RUN, payload: run });
+    return run;
+  });
+
 // reFetch run will just refetch a run
 export const reFetchRun = run_number =>
   error_handler(async (dispatch, getState) => {