set consistent state

kamu-data · Sep 2, 2024 · 7c19f63 · 7c19f63
1 parent ff1aa56
commit 7c19f63
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Fixed
+- Set consistent state with `force update` link
+
 ## [0.26.0] - 2024-08-30
-## Fixed
+### Fixed
 - Disabled unused menu items for account settings
 - The file name for the file upload service may contain special characters.
 - Added form initialization for an existing configuration(Compaction tab)
@@ -16,26 +20,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Replaced the constructor with `inject` function for all components and services
 
 ## [0.25.1] - 2024-08-22
-## Added
+### Added
 - Added the ability to reset the dataset in 2 modes(`Reset to Seed` and `Flatten metadata`)
 - Extended `Fetch uncacheable` checkbox for the update scheduler.
 - Added active link `force update` for the flow with uncacheable source(Flows table)
-## Fixed
+### Fixed
 - Access tokens: when you turn on the switch, all tokens are displayed (active and revoked)
 
 
 ## [0.25.0] - 2024-08-13
-## Added
+### Added
 - Migrated Angular v.14 to Angular v.16 
 
 ## [0.24.0] - 2024-08-12
-## Fixed
+### Fixed
 - "Update now" button is present when user is not logged in 
 - Changed tab size in the monaco editor
 - Removed sliding animation from pop-up windows
 - Minor modifications for variables and secrets tab
 - Optimized and modified the query for getting data for the flow list
-## Added
+### Added
 - Improved UX of flows table:
   - Main description message is clickable
   - Duration block displayed correctly(added delay)
@@ -45,20 +49,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added recursive flag for compaction for full mode
 
 ## [0.23.2] - 2024-07-23
-## Fixed
+### Fixed
 - Fixed bug with update after closing window(Overview tab)
 
 ## [0.23.1] - 2024-07-19
-## Added
+### Added
 - Displayed application version in console 
 
 
 ## [0.23.0] - 2024-07-18
-## Added
+### Added
 - Added access token feature
 - Added environment variables and secrets for the dataset
 - Added new flag(enableDatasetEnvVarsManagment) in the runtime configuration
-## Fixed
+### Fixed
 - Fixed bug with cache(Data tab) on the deployment version
 - Extended full source info for EthereumLogs(Metadata tab)
 - Added multi-line fields for ETH filter & signature(Metadata block)

diff --git a/src/app/common/components/flows-table/flows-table.component.ts b/src/app/common/components/flows-table/flows-table.component.ts
@@ -207,9 +207,14 @@ export class FlowsTableComponent extends BaseComponent implements OnInit, OnChan
         return (
             node.description.__typename === "FlowDescriptionDatasetPollingIngest" &&
             node.description.ingestResult?.__typename === "FlowDescriptionUpdateResultUpToDate" &&
-            ((node.configSnapshot?.__typename === "FlowConfigurationIngest" && !node.configSnapshot.fetchUncacheable) ||
-                !node.configSnapshot)
+            node.configSnapshot?.__typename === "FlowConfigurationIngest" &&
+            !node.configSnapshot.fetchUncacheable &&
+            // TODO: Remove this condition
+            Boolean(node.configSnapshot)
         );
+        // TODO: Replace when will be new API
+        // ||
+        //     !node.configSnapshot)
     }
 
     public onForceUpdate(node: FlowSummaryDataFragment): void {

diff --git a/src/app/common/components/flows-table/flows-table.helpers.ts b/src/app/common/components/flows-table/flows-table.helpers.ts
@@ -97,10 +97,14 @@ export class DatasetFlowTableHelpers {
                                     : element.description.ingestResult?.__typename ===
                                             "FlowDescriptionUpdateResultUpToDate" &&
                                         element.description.ingestResult.uncacheable &&
-                                        ((element.configSnapshot?.__typename === "FlowConfigurationIngest" &&
-                                            !element.configSnapshot.fetchUncacheable) ||
-                                            !element.configSnapshot)
-                                      ? `Source is uncacheable: to re-scan the data, use`
+                                        element.configSnapshot?.__typename === "FlowConfigurationIngest" &&
+                                        !element.configSnapshot.fetchUncacheable &&
+                                        // TODO: Remove this condition
+                                        element.configSnapshot
+                                      ? // TODO: Replace when will be new API
+                                        // ||
+                                        //     !node.configSnapshot)
+                                        `Source is uncacheable: to re-scan the data, use`
                                       : "Dataset is up-to-date";
 
                             case "FlowDescriptionDatasetExecuteTransform":

diff --git a/...ow/dataset-flow-details/tabs/flow-details-history-tab/flow-details-history-tab.helpers.ts b/...ow/dataset-flow-details/tabs/flow-details-history-tab/flow-details-history-tab.helpers.ts
@@ -140,11 +140,14 @@ export class DatasetFlowDetailsHelpers {
                                             : flowDetails.description.ingestResult?.__typename ===
                                                     "FlowDescriptionUpdateResultUpToDate" &&
                                                 flowDetails.description.ingestResult.uncacheable &&
-                                                ((flowDetails.configSnapshot?.__typename ===
-                                                    "FlowConfigurationIngest" &&
-                                                    !flowDetails.configSnapshot.fetchUncacheable) ||
-                                                    !flowDetails.configSnapshot)
-                                              ? "Source is uncacheable: to re-scan the data, use force update"
+                                                flowDetails.configSnapshot?.__typename === "FlowConfigurationIngest" &&
+                                                !flowDetails.configSnapshot.fetchUncacheable &&
+                                                // TODO: Remove this condition
+                                                flowDetails.configSnapshot
+                                              ? // TODO: Replace when will be new API
+                                                // ||
+                                                //     !flowDetails.configSnapshot)
+                                                "Source is uncacheable: to re-scan the data, use force update"
                                               : "Dataset is up-to-date";
 
                                     case "FlowDescriptionDatasetExecuteTransform":