Reset all when a new file is uploaded (#46)

* clear all when a file is uploaded again
* add spinner for uploading larger files

Author: gcroci2

app/callbacks.py

@@ -14,9 +14,11 @@
 import plotly.graph_objects as go
 from config import GM_FILTER_DROPDOWN_BGC_CLASS_OPTIONS
 from config import GM_FILTER_DROPDOWN_MENU_OPTIONS
+from config import GM_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS
 from config import GM_RESULTS_TABLE_MANDATORY_COLUMNS
 from config import GM_RESULTS_TABLE_OPTIONAL_COLUMNS
 from config import MG_FILTER_DROPDOWN_MENU_OPTIONS
+from config import MG_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS
 from config import MG_RESULTS_TABLE_MANDATORY_COLUMNS
 from config import MG_RESULTS_TABLE_OPTIONAL_COLUMNS
 from config import SCORING_DROPDOWN_MENU_OPTIONS
@@ -58,9 +60,13 @@
 # ------------------ Upload and Process Data ------------------ #
 @du.callback(
     id="dash-uploader",
-    output=[Output("dash-uploader-output", "children"), Output("file-store", "data")],
+    output=[
+        Output("dash-uploader-output", "children"),
+        Output("file-store", "data"),
+        Output("loading-spinner-container", "children", allow_duplicate=True),
+    ],
 )
-def upload_data(status: du.UploadStatus) -> tuple[str, str | None]:
+def upload_data(status: du.UploadStatus) -> tuple[str, str | None, None]:
     """Handle file upload and validate pickle files.
 
     Args:
@@ -77,22 +83,26 @@ def upload_data(status: du.UploadStatus) -> tuple[str, str | None]:
             return (
                 f"Successfully uploaded: {os.path.basename(latest_file)} [{round(status.uploaded_size_mb, 2)} MB]",
                 str(latest_file),
+                None,
             )
         except (pickle.UnpicklingError, EOFError, AttributeError):
-            return f"Error: {os.path.basename(latest_file)} is not a valid pickle file.", None
+            return f"Error: {os.path.basename(latest_file)} is not a valid pickle file.", None, None
         except Exception as e:
             # Handle any other unexpected errors
-            return f"Error uploading file: {str(e)}", None
-    return "No file uploaded", None
+            return f"Error uploading file: {str(e)}", None, None
+    return "No file uploaded", None, None
 
 
 @app.callback(
     Output("processed-data-store", "data"),
     Output("processed-links-store", "data"),
+    Output("loading-spinner-container", "children", allow_duplicate=True),
     Input("file-store", "data"),
     prevent_initial_call=True,
 )
-def process_uploaded_data(file_path: Path | str | None) -> tuple[str | None, str | None]:
+def process_uploaded_data(
+    file_path: Path | str | None,
+) -> tuple[str | None, str | None, str | None]:
     """Process the uploaded pickle file and store the processed data.
 
     Args:
@@ -102,7 +112,7 @@ def process_uploaded_data(file_path: Path | str | None) -> tuple[str | None, str
         JSON string of processed data or None if processing fails.
     """
     if file_path is None:
-        return None, None
+        return None, None, None
 
     try:
         with open(file_path, "rb") as f:
@@ -230,10 +240,10 @@ def process_mg_link(mf, gcf, methods_data):
         else:
             processed_links = {}
 
-        return json.dumps(processed_data), json.dumps(processed_links)
+        return json.dumps(processed_data), json.dumps(processed_links), None
     except Exception as e:
         print(f"Error processing file: {str(e)}")
-        return None, None
+        return None, None, None
 
 
 @app.callback(
@@ -249,6 +259,11 @@ def process_mg_link(mf, gcf, methods_data):
         Output("gm-scoring-blocks-id", "data", allow_duplicate=True),
         Output("gm-scoring-blocks-container", "children", allow_duplicate=True),
         Output("gm-results-button", "disabled"),
+        Output("gm-table", "selected_rows", allow_duplicate=True),
+        Output("gm-table-select-all-checkbox", "value", allow_duplicate=True),
+        Output("gm-filter-accordion-component", "value", allow_duplicate=True),
+        Output("gm-scoring-accordion-component", "value", allow_duplicate=True),
+        Output("gm-results-table-column-toggle", "value", allow_duplicate=True),
         # MG tab outputs
         Output("mg-tab", "disabled"),
         Output("mg-filter-accordion-control", "disabled"),
@@ -260,6 +275,11 @@ def process_mg_link(mf, gcf, methods_data):
         Output("mg-scoring-blocks-id", "data", allow_duplicate=True),
         Output("mg-scoring-blocks-container", "children", allow_duplicate=True),
         Output("mg-results-button", "disabled"),
+        Output("mg-table", "selected_rows", allow_duplicate=True),
+        Output("mg-table-select-all-checkbox", "value", allow_duplicate=True),
+        Output("mg-filter-accordion-component", "value", allow_duplicate=True),
+        Output("mg-scoring-accordion-component", "value", allow_duplicate=True),
+        Output("mg-results-table-column-toggle", "value", allow_duplicate=True),
     ],
     [Input("file-store", "data")],
     prevent_initial_call=True,
@@ -275,6 +295,16 @@ def disable_tabs_and_reset_blocks(
     Returns:
         Tuple containing boolean values for disabling tabs, styles, and new block data.
     """
+    default_gm_column_value = (
+        [GM_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS[0]]
+        if GM_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS
+        else []
+    )
+    default_mg_column_value = (
+        [MG_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS[0]]
+        if MG_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS
+        else []
+    )
     if file_path is None:
         # Disable all tabs and controls when no file is uploaded
         return (
@@ -289,6 +319,11 @@ def disable_tabs_and_reset_blocks(
             [],
             [],
             True,
+            [],
+            [],
+            [],
+            [],
+            default_gm_column_value,
             # MG tab - disabled
             True,
             True,
@@ -300,6 +335,11 @@ def disable_tabs_and_reset_blocks(
             [],
             [],
             True,
+            [],
+            [],
+            [],
+            [],
+            default_mg_column_value,
         )
 
     # Enable the tabs and reset blocks
@@ -327,6 +367,11 @@ def disable_tabs_and_reset_blocks(
         gm_scoring_initial_block_id,
         gm_scoring_new_blocks,
         False,
+        [],
+        [],
+        [],
+        [],
+        default_gm_column_value,
         # MG tab - enabled with initial blocks
         False,
         False,
@@ -338,6 +383,11 @@ def disable_tabs_and_reset_blocks(
         mg_scoring_initial_block_id,
         mg_scoring_new_blocks,
         False,
+        [],
+        [],
+        [],
+        [],
+        default_mg_column_value,
     )
 
 

app/layouts.py

@@ -216,7 +216,9 @@ def create_filter_accordion(
                 value=f"{control_id.split('-')[0]}-filter-accordion",
             ),
         ],
+        value=[],
         className="mt-5 mb-3",
+        id=f"{control_id.split('-')[0]}-filter-accordion-component",
     )
 
 
@@ -258,7 +260,9 @@ def create_scoring_accordion(control_id, blocks_store_id, blocks_container_id):
                 value=f"{control_id.split('-')[0]}-scoring-accordion",
             ),
         ],
+        value=[],
         className="mt-5 mb-3",
+        id=f"{control_id.split('-')[0]}-scoring-accordion-component",
     )
 
 
@@ -577,6 +581,17 @@ def create_tab_content(prefix, filter_title, checkl_options, no_sort_columns):
     className="p-5 ml-5 mr-5",
 )
 
+loading_spinner = dbc.Spinner(
+    html.Div(id="loading-spinner-container"),
+    color="primary",
+    size="lg",
+    type="border",
+    fullscreen=True,
+    fullscreen_style={
+        "backgroundColor": "rgba(0, 0, 0, 0.3)",
+        "zIndex": "9999",
+    },
+)
 
 # ------------------ Tab Content Configuration ------------------ #
 # No-sort columns definitions
@@ -640,5 +655,5 @@ def create_tab_content(prefix, filter_title, checkl_options, no_sort_columns):
 # ------------------ Layout Function ------------------ #
 def create_layout():  # noqa: D103
     return dmc.MantineProvider(
-        [dbc.Container([navbar, uploader, tabs], fluid=True, className="p-0")]
+        [dbc.Container([navbar, uploader, loading_spinner, tabs], fluid=True, className="p-0")]
     )

tests/test_callbacks.py

@@ -24,6 +24,8 @@
 from app.callbacks import process_uploaded_data
 from app.callbacks import scoring_apply
 from app.callbacks import upload_data
+from app.config import GM_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS
+from app.config import MG_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS
 from . import DATA_DIR
 
 
@@ -95,7 +97,7 @@ def test_upload_data():
     status = UploadStatus(
         uploaded_files=[MOCK_FILE_PATH], n_total=1, uploaded_size_mb=5.39, total_size_mb=5.39
     )
-    upload_string, path_string = upload_data(status)
+    upload_string, path_string, _ = upload_data(status)
 
     # Check the result
     assert upload_string == f"Successfully uploaded: {MOCK_FILE_PATH.name} [5.39 MB]"
@@ -104,14 +106,14 @@ def test_upload_data():
 
 @pytest.mark.parametrize("input_path", [None, Path("non_existent_file.pkl")])
 def test_process_uploaded_data_invalid_input(input_path):
-    processed_data, processed_links = process_uploaded_data(input_path)
+    processed_data, processed_links, _ = process_uploaded_data(input_path)
     assert processed_data is None
     assert processed_links is None
 
 
 def test_process_uploaded_data_structure():
-    processed_data, processed_links = process_uploaded_data(MOCK_FILE_PATH)
-    processed_data_no_links, processed_links_no_links = process_uploaded_data(
+    processed_data, processed_links, _ = process_uploaded_data(MOCK_FILE_PATH)
+    processed_data_no_links, processed_links_no_links, _ = process_uploaded_data(
         MOCK_FILE_PATH_NO_LINKS
     )
 
@@ -241,6 +243,17 @@ def test_process_uploaded_data_structure():
 
 
 def test_disable_tabs(mock_uuid):
+    default_gm_column_value = (
+        [GM_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS[0]]
+        if GM_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS
+        else []
+    )
+    default_mg_column_value = (
+        [MG_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS[0]]
+        if MG_RESULTS_TABLE_CHECKL_OPTIONAL_COLUMNS
+        else []
+    )
+
     # Test with None as input
     result = disable_tabs_and_reset_blocks(None)
     assert result == (
@@ -255,6 +268,11 @@ def test_disable_tabs(mock_uuid):
         [],
         [],
         True,
+        [],
+        [],
+        [],
+        [],
+        default_gm_column_value,
         # MG tab - disabled
         True,
         True,
@@ -266,6 +284,11 @@ def test_disable_tabs(mock_uuid):
         [],
         [],
         True,
+        [],
+        [],
+        [],
+        [],
+        default_mg_column_value,
     )
 
     # Test with a string as input
@@ -284,6 +307,11 @@ def test_disable_tabs(mock_uuid):
         gm_scoring_block_ids,
         gm_scoring_blocks,
         gm_results_disabled,
+        gm_table_selected_rows,
+        gm_table_checkbox_value,
+        gm_filter_accordion_value,
+        gm_scoring_accordion_value,
+        gm_results_table_column_toggle,
         # MG tab outputs
         mg_tab_disabled,
         mg_filter_accordion_disabled,
@@ -295,6 +323,11 @@ def test_disable_tabs(mock_uuid):
         mg_scoring_block_ids,
         mg_scoring_blocks,
         mg_results_disabled,
+        mg_table_selected_rows,
+        mg_table_checkbox_value,
+        mg_filter_accordion_value,
+        mg_scoring_accordion_value,
+        mg_results_table_column_toggle,
     ) = result
 
     # Assert GM tab outputs
@@ -310,6 +343,11 @@ def test_disable_tabs(mock_uuid):
     assert len(gm_scoring_blocks) == 1
     assert isinstance(gm_scoring_blocks[0], dmc.Grid)
     assert gm_results_disabled is False
+    assert gm_table_selected_rows == []
+    assert gm_table_checkbox_value == []
+    assert gm_filter_accordion_value == []
+    assert gm_scoring_accordion_value == []
+    assert gm_results_table_column_toggle == default_gm_column_value
 
     # Assert MG tab outputs
     assert mg_tab_disabled is False
@@ -324,6 +362,11 @@ def test_disable_tabs(mock_uuid):
     assert len(mg_scoring_blocks) == 1
     assert isinstance(mg_scoring_blocks[0], dmc.Grid)
     assert mg_results_disabled is False
+    assert mg_table_selected_rows == []
+    assert mg_table_checkbox_value == []
+    assert mg_filter_accordion_value == []
+    assert mg_scoring_accordion_value == []
+    assert mg_results_table_column_toggle == default_mg_column_value
 
 
 def test_scoring_apply_metcalf_raw():