Revert "[🍒][CDAP-20917] Sync status UI changes"

cdapio · May 8, 2024 · ffc39df · ffc39df
1 parent d15b558
commit ffc39df
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 44 deletions.
diff --git a/app/cdap/components/PipelineDetails/PipelineDetailsTopPanel/PipelineDetailsMetadata.tsx b/app/cdap/components/PipelineDetails/PipelineDetailsTopPanel/PipelineDetailsMetadata.tsx
@@ -18,7 +18,7 @@ import React, { useEffect } from 'react';
 import { connect, Provider } from 'react-redux';
 import T from 'i18n-react';
 import styled from 'styled-components';
-import { green, orange } from '@material-ui/core/colors';
+import { green, red } from '@material-ui/core/colors';
 import CheckCircleIcon from '@material-ui/icons/CheckCircle';
 import ErrorIcon from '@material-ui/icons/Error';
 
@@ -30,7 +30,6 @@ import { GLOBALS } from 'services/global-constants';
 import { Chip } from '@material-ui/core';
 import { useFeatureFlagDefaultFalse } from 'services/react/customHooks/useFeatureFlag';
 import { getScmSyncStatus } from '../store/ActionCreator';
-import moment from 'moment';
 
 const PREFIX = 'features.PipelineDetails.TopPanel';
 const SCM_PREFIX = 'features.SourceControlManagement';
@@ -81,7 +80,7 @@ interface IPipelineDetailsMetadata {
   };
   scmSyncStatus?: {
     isSynced?: boolean;
-    lastSyncedAt?: number;
+    lastModified?: number;
   };
 }
 
@@ -137,33 +136,19 @@ const PipelineDetailsMetadata = ({
             </Popover>
           </StyledSpan>
         )}
-        {scmMultiSyncEnabled && scmSyncStatus && (
+        {scmMultiSyncEnabled && (
           <StyledSpan>
             {scmSyncStatus.isSynced ? (
               <StyledChip
                 variant="outlined"
                 label={T.translate(`${SCM_PREFIX}.table.gitSyncStatusSynced`)}
                 icon={<CheckCircleIcon style={{ color: green[500] }} fontSize="small" />}
-                title={
-                  scmSyncStatus.lastSyncedAt
-                    ? T.translate(`${SCM_PREFIX}.table.lastSyncedAtRelative`, {
-                        diff: moment(scmSyncStatus.lastSyncedAt).fromNow(true),
-                      })
-                    : undefined
-                }
               />
             ) : (
               <StyledChip
                 variant="outlined"
                 label={T.translate(`${SCM_PREFIX}.table.gitSyncStatusUnsynced`)}
-                icon={<ErrorIcon style={{ color: orange[300] }} fontSize="small" />}
-                title={
-                  scmSyncStatus.lastSyncedAt
-                    ? T.translate(`${SCM_PREFIX}.table.lastSyncedAtRelative`, {
-                        diff: moment(scmSyncStatus.lastSyncedAt).fromNow(true),
-                      })
-                    : undefined
-                }
+                icon={<ErrorIcon style={{ color: red[500] }} fontSize="small" />}
               />
             )}
             <Popover

diff --git a/app/cdap/components/PipelineDetails/store/ActionCreator.js b/app/cdap/components/PipelineDetails/store/ActionCreator.js
@@ -494,21 +494,12 @@ const getScmSyncStatus = (appId) => {
   MyPipelineApi.getScmSyncStatus({
     namespace,
     appId,
-  }).subscribe(
-    (res) => {
-      PipelineDetailStore.dispatch({
-        type: ACTIONS.SET_SCM_SYNC_STATUS,
-        payload: res,
-      });
-    },
-    // eslint-disable-next-line no-unused-vars
-    (err) => {
-      PipelineDetailStore.dispatch({
-        type: ACTIONS.SET_SCM_SYNC_STATUS,
-        payload: null,
-      });
-    }
-  );
+  }).subscribe((res) => {
+    PipelineDetailStore.dispatch({
+      type: ACTIONS.SET_SCM_SYNC_STATUS,
+      payload: res,
+    });
+  });
 };
 
 const reset = () => {

diff --git a/app/cdap/components/PipelineDetails/store/index.js b/app/cdap/components/PipelineDetails/store/index.js
@@ -106,8 +106,7 @@ const DEFAULT_PIPELINE_DETAILS = {
   sourceControlMeta: null,
   pullLoading: false,
   pullStatus: null,
-  scmSyncStatus: null,
-  scmSyncStatusRefreshTime: null,
+  scmSyncStatus: {},
 };
 
 const pipelineDetails = (state = DEFAULT_PIPELINE_DETAILS, action = defaultAction) => {
@@ -290,8 +289,7 @@ const pipelineDetails = (state = DEFAULT_PIPELINE_DETAILS, action = defaultActio
     case ACTIONS.SET_SCM_SYNC_STATUS:
       return {
         ...state,
-        scmSyncStatus: action.payload ? action.payload.app : null,
-        scmSyncStatusRefreshTime: action.payload ? action.payload.lastRefreshTime : null,
+        scmSyncStatus: action.payload,
       };
     case ACTIONS.RESET:
       return DEFAULT_PIPELINE_DETAILS;

diff --git a/app/cdap/components/SourceControlManagement/LocalPipelineListView/PipelineTable.tsx b/app/cdap/components/SourceControlManagement/LocalPipelineListView/PipelineTable.tsx
@@ -27,7 +27,7 @@ import {
   TableSortLabel,
 } from '@material-ui/core';
 import InfoIcon from '@material-ui/icons/Info';
-import { green, orange } from '@material-ui/core/colors';
+import { green, red } from '@material-ui/core/colors';
 import CheckCircleIcon from '@material-ui/icons/CheckCircle';
 import ErrorIcon from '@material-ui/icons/Error';
 
@@ -267,7 +267,7 @@ export const LocalPipelineTable = ({
                         </SyncStatusWrapper>
                       ) : (
                         <SyncStatusWrapper>
-                          <ErrorIcon style={{ color: orange[300] }} />
+                          <ErrorIcon style={{ color: red[500] }} />
                           {T.translate(`${PREFIX}.gitSyncStatusUnsynced`)}
                         </SyncStatusWrapper>
                       )}

diff --git a/app/cdap/components/SourceControlManagement/RemotePipelineListView/RemotePipelineTable.tsx b/app/cdap/components/SourceControlManagement/RemotePipelineListView/RemotePipelineTable.tsx
@@ -28,7 +28,7 @@ import {
   TableRow,
 } from '@material-ui/core';
 import TableSortLabel from '@material-ui/core/TableSortLabel';
-import { green, orange } from '@material-ui/core/colors';
+import { green, red } from '@material-ui/core/colors';
 import CheckCircleIcon from '@material-ui/icons/CheckCircle';
 import ErrorIcon from '@material-ui/icons/Error';
 import StatusButton from 'components/StatusButton';
@@ -255,7 +255,7 @@ export const RemotePipelineTable = ({
                         </SyncStatusWrapper>
                       ) : (
                         <SyncStatusWrapper>
-                          <ErrorIcon style={{ color: orange[300] }} />
+                          <ErrorIcon style={{ color: red[500] }} />
                           {T.translate(`${PREFIX}.gitSyncStatusUnsynced`)}
                         </SyncStatusWrapper>
                       )}

diff --git a/app/cdap/text/text-en.yaml b/app/cdap/text/text-en.yaml
@@ -3288,7 +3288,7 @@ features:
       gitStatus: Connected to Git
       syncStatus: Sync status
       gitStatusHelperText: This status indicates that the pipeline has been pushed to or pulled from the git repository in the past. It does not necessarily mean the content is up to date.
-      syncStatusHelperText: Indicates the sync status with linked remote repository 
+      syncStatusHelperText: This status indicates whether the pipeline is in sync with the linked remote repository. 
       pullFail: Failed to pull this pipeline from remote.
       pushFail: Failed to push this pipeline to remote.
       synced: Synced
@@ -3298,7 +3298,6 @@ features:
       gitSyncStatusUnsynced: Unsynced
       serverSidePaginationLabel: "Results {from} - {to}"
       lastRefreshedAtLabel: Last refreshed at {datetime}
-      lastSyncedAtRelative: Last synced {diff} ago
     syncButton: Sync Pipelines
     title: Source Control Management
     unlinkButton: Unlink Repository