Revamp of mscolab operation menu and addition of "archive" operation #1782
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,6 +59,8 @@ | |
| migrate = Migrate(APP, db, render_as_batch=True) | ||
| auth = HTTPBasicAuth() | ||
|
|
||
| ARCHIVE_THRESHOLD = 30 | ||
|
|
||
| try: | ||
| from mscolab_auth import mscolab_auth | ||
| except ImportError as ex: | ||
|
|
@@ -489,13 +491,17 @@ def get_operation_details(): | |
| @verify_user | ||
| def set_last_used(): | ||
| op_id = request.form.get('op_id', None) | ||
| days_ago = int(request.form.get('days', 0)) | ||
| operation = Operation.query.filter_by(id=int(op_id)).first() | ||
| operation.last_used = datetime.datetime.utcnow() - datetime.timedelta(days=days_ago) | ||
| temp_operation_active = operation.active | ||
| if days_ago > ARCHIVE_THRESHOLD: | ||
| operation.active = False | ||
| else: | ||
| operation.active = True | ||
| db.session.commit() | ||
| # Reload Operation List | ||
| if temp_operation_active != operation.active: | ||
|
There was a problem hiding this comment. the wording maybe can be changed to archived, unarchived etc. There was a problem hiding this comment. changing operation.active requires changes to the DB, I guess? There was a problem hiding this comment. yes, in the models. and on staging you could do this by There was a problem hiding this comment. review and also add new parts to the section Operation based features in https://github.com/Open-MSS/MSS/blob/develop/docs/mscolab.rst#operation-based-features There was a problem hiding this comment. I am not convinced that we should change the DB format to be more consistent in a part that is not user-visible. There was a problem hiding this comment. We can do this when we need another change. It is not needed now, but at the moment we introduce something new we anyways have to do a server database migration. |
||
| token = request.args.get('token', request.form.get('token', False)) | ||
| json_config = {"token": token} | ||
| sockio.sm.update_operation_list(json_config) | ||
|
|
@@ -507,11 +513,12 @@ def set_last_used(): | |
| def update_last_used(): | ||
| operations = Operation.query.filter().all() | ||
| for operation in operations: | ||
| if operation.last_used is not None: | ||
| days_ago = (datetime.datetime.utcnow() - operation.last_used).days | ||
| if days_ago > ARCHIVE_THRESHOLD: | ||
| operation.active = False | ||
| else: | ||
| operation.active = True | ||
| db.session.commit() | ||
| return jsonify({"success": True}), 200 | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # -*- coding: utf-8 -*- | ||
|
|
||
| # Form implementation generated from reading ui file 'mslib/msui/ui/ui_operation_archive.ui' | ||
| # | ||
| # Created by: PyQt5 UI code generator 5.15.7 | ||
| # | ||
| # WARNING: Any manual changes made to this file will be lost when pyuic5 is | ||
| # run again. Do not edit this file unless you know what you are doing. | ||
|
|
||
|
|
||
| from PyQt5 import QtCore, QtGui, QtWidgets | ||
|
|
||
|
|
||
| class Ui_OperationArchiveBrowser(object): | ||
| def setupUi(self, OperationArchiveBrowser): | ||
| OperationArchiveBrowser.setObjectName("OperationArchiveBrowser") | ||
| OperationArchiveBrowser.resize(754, 393) | ||
| self.verticalLayout = QtWidgets.QVBoxLayout(OperationArchiveBrowser) | ||
| self.verticalLayout.setObjectName("verticalLayout") | ||
| self.label = QtWidgets.QLabel(OperationArchiveBrowser) | ||
| self.label.setObjectName("label") | ||
| self.verticalLayout.addWidget(self.label) | ||
| self.listArchivedOperations = QtWidgets.QListWidget(OperationArchiveBrowser) | ||
| self.listArchivedOperations.setObjectName("listArchivedOperations") | ||
| self.verticalLayout.addWidget(self.listArchivedOperations) | ||
| self.horizontalLayout = QtWidgets.QHBoxLayout() | ||
| self.horizontalLayout.setObjectName("horizontalLayout") | ||
| self.pbUnarchiveOperation = QtWidgets.QPushButton(OperationArchiveBrowser) | ||
| self.pbUnarchiveOperation.setObjectName("pbUnarchiveOperation") | ||
| self.horizontalLayout.addWidget(self.pbUnarchiveOperation) | ||
| spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) | ||
| self.horizontalLayout.addItem(spacerItem) | ||
| self.pbClose = QtWidgets.QPushButton(OperationArchiveBrowser) | ||
| self.pbClose.setObjectName("pbClose") | ||
| self.horizontalLayout.addWidget(self.pbClose) | ||
| self.verticalLayout.addLayout(self.horizontalLayout) | ||
|
|
||
| self.retranslateUi(OperationArchiveBrowser) | ||
| QtCore.QMetaObject.connectSlotsByName(OperationArchiveBrowser) | ||
|
|
||
| def retranslateUi(self, OperationArchiveBrowser): | ||
| _translate = QtCore.QCoreApplication.translate | ||
| OperationArchiveBrowser.setWindowTitle(_translate("OperationArchiveBrowser", "Browse archived operations")) | ||
| self.label.setText(_translate("OperationArchiveBrowser", "Operation Archive")) | ||
| self.pbUnarchiveOperation.setToolTip(_translate("OperationArchiveBrowser", "<html><head/><body><p>Becomes available when you have the right to unarchive an operation. Moves this operation to the list of current operations.</p></body></html>")) | ||
| self.pbUnarchiveOperation.setText(_translate("OperationArchiveBrowser", "Unarchive")) | ||
| self.pbClose.setText(_translate("OperationArchiveBrowser", "close")) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should maybe make this configurable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe. 30 days seems a tad short for me as a typical campaign may run longer.
New issue?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, this needs also a documentation