From 653bd309acc055610964efcdbcabe8be70d14fd5 Mon Sep 17 00:00:00 2001 From: kasif Date: Fri, 24 Feb 2023 21:19:23 +0530 Subject: [PATCH] fix compliance graph not showing data of past n days Signed-off-by: kasif --- .../reporting-overview.component.spec.ts | 8 ------ .../shared/reporting/stats.service.spec.ts | 2 -- .../shared/reporting/stats.service.ts | 27 +++++-------------- 3 files changed, 7 insertions(+), 30 deletions(-) diff --git a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.spec.ts b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.spec.ts index 325c5e9af16..7af1386c045 100644 --- a/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.spec.ts +++ b/components/automate-ui/src/app/pages/+compliance/+reporting/+reporting-overview/reporting-overview.component.spec.ts @@ -109,7 +109,6 @@ describe('ReportingOverviewComponent', () => { it('gets node status data', () => { spyOn(component, 'getNodeStatusData'); component.selectedButtonTab = 'Node Status'; - localStorage.setItem('current-url', 'reporting/controls'); component.getData(reportQuery); expect(component.getNodeStatusData).toHaveBeenCalledWith(reportQuery); }); @@ -119,7 +118,6 @@ describe('ReportingOverviewComponent', () => { it('gets profile status data', () => { spyOn(component, 'getProfileStatusData'); component.selectedButtonTab = 'Profile Status'; - localStorage.setItem('current-url', 'reporting/controls'); component.getData(reportQuery); expect(component.getProfileStatusData).toHaveBeenCalledWith(reportQuery); }); @@ -128,14 +126,12 @@ describe('ReportingOverviewComponent', () => { describe('getNodeStatusData()', () => { it('gets node status failure data', () => { spyOn(component, 'getNodeStatusFailures'); - localStorage.setItem('current-url', 'reporting/controls'); component.getNodeStatusData(reportQuery); expect(component.getNodeStatusFailures).toHaveBeenCalledWith(reportQuery); }); it('gets node status summary data', () => { spyOn(component, 'getNodeSummary'); - localStorage.setItem('current-url', 'reporting/controls'); component.getNodeStatusData(reportQuery); expect(component.getNodeSummary).toHaveBeenCalledWith(reportQuery); }); @@ -150,7 +146,6 @@ describe('ReportingOverviewComponent', () => { describe('getProfileStatusData()', () => { it('gets profile status failure data', () => { spyOn(component, 'getProfileStatusFailures'); - localStorage.setItem('current-url', 'reporting/controls'); component.getProfileStatusData(reportQuery); expect(component.getProfileStatusFailures).toHaveBeenCalledWith(reportQuery); }); @@ -286,7 +281,6 @@ describe('ReportingOverviewComponent', () => { }); describe('getControlsTrend()', () => { - localStorage.setItem('current-url', 'reporting/controls'); beforeEach(() => { spyOn(statsService, 'getControlsTrend').and.returnValue(observableOf([ { @@ -439,7 +433,6 @@ describe('ReportingOverviewComponent', () => { } ]; - localStorage.setItem('current-url', 'reporting/controls'); beforeEach(() => { spyOn(statsService, 'getNodeTrend').and.returnValue(observableOf(data)); @@ -464,7 +457,6 @@ describe('ReportingOverviewComponent', () => { filters: [ {type: { name: 'node'}, value: { id: '1231'}}], last24h: false }; - localStorage.setItem('current-url', 'reporting/controls'); const data = [ { 'report_time': dateRange.end, diff --git a/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.spec.ts b/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.spec.ts index 2bf9492be69..815d5022673 100644 --- a/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.spec.ts +++ b/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.spec.ts @@ -494,7 +494,6 @@ describe('StatsService', () => { last24h: false }; - localStorage.setItem('current-url', 'reporting/controls'); const expectedUrl = `${COMPLIANCE_URL}/reporting/stats/trend`; const expectedResponse = [{ 'time': '2017-03-05T00:00:00+0000', @@ -529,7 +528,6 @@ describe('StatsService', () => { filters: filters, last24h: false }; - localStorage.setItem('current-url', 'test'); const expectedUrl = `${COMPLIANCE_URL}/reporting/stats/trend`; const expectedResponse = [{ diff --git a/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.ts b/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.ts index 6cdf179fdf8..cb92b7fd169 100644 --- a/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.ts +++ b/components/automate-ui/src/app/pages/+compliance/shared/reporting/stats.service.ts @@ -41,6 +41,7 @@ export class StatsService { getFailures(types: Array, reportQuery: ReportQuery): Observable { const url = `${CC_API_URL}/reporting/stats/failures`; + reportQuery = this.getStartDate(reportQuery); const formatted = this.formatFilters(reportQuery); formatted.push({ type: 'types', values: types }); const body = { filters: formatted }; @@ -50,6 +51,7 @@ export class StatsService { getNodeSummary(reportQuery: ReportQuery): Observable { const url = `${CC_API_URL}/reporting/stats/summary`; + reportQuery = this.getStartDate(reportQuery); const formatted = this.formatFilters(reportQuery); const body = { type: 'nodes', filters: formatted }; @@ -59,6 +61,7 @@ export class StatsService { getControlsSummary(reportQuery: ReportQuery): Observable { const url = `${CC_API_URL}/reporting/stats/summary`; + reportQuery = this.getStartDate(reportQuery); const formatted = this.formatFilters(reportQuery); const body = { type: 'controls', filters: formatted }; @@ -89,14 +92,8 @@ export class StatsService { getNodeTrend(reportQuery: ReportQuery) { const url = `${CC_API_URL}/reporting/stats/trend`; const interval = 86400; - const prev = localStorage.getItem('current-url'); - const url_array = ['reporting/nodes' , 'reporting/profiles' , 'reporting/controls']; - const urlcheck = url_array.some(urlVar => prev.includes(urlVar)); - if (urlcheck) { - const timeInterval = reportQuery.interval; - this.getTimeInterval(timeInterval, reportQuery); - localStorage.setItem('current-url', url); - } + const timeInterval = reportQuery.interval; + this.getTimeInterval(timeInterval, reportQuery); const formatted = this.formatFilters(reportQuery, false); const body = {type: 'nodes', interval, filters: formatted}; @@ -107,14 +104,8 @@ export class StatsService { getControlsTrend(reportQuery: ReportQuery) { const url = `${CC_API_URL}/reporting/stats/trend`; const interval = 86400; - const prev = localStorage.getItem('current-url'); - const url_array = ['reporting/nodes' , 'reporting/profiles' , 'reporting/controls']; - const urlcheck = url_array.some(urlVar => prev.includes(urlVar)); - if (urlcheck) { - const timeInterval = reportQuery.interval; - this.getTimeInterval(timeInterval, reportQuery); - localStorage.setItem('current-url', url); - } + const timeInterval = reportQuery.interval; + this.getTimeInterval(timeInterval, reportQuery); const formatted = this.formatFilters(reportQuery, false); const body = {type: 'controls', interval, filters: formatted}; @@ -151,8 +142,6 @@ export class StatsService { getNodes(reportQuery: ReportQuery, listParams: any): Observable { const url = `${CC_API_URL}/reporting/nodes/search`; - localStorage.setItem('current-url', url); - reportQuery = this.getStartDate(reportQuery); let formatted = this.formatFilters(reportQuery); formatted = this.addStatusParam(formatted); @@ -189,7 +178,6 @@ export class StatsService { getProfiles(reportQuery: ReportQuery, listParams: any): Observable { const url = `${CC_API_URL}/reporting/profiles`; - localStorage.setItem('current-url', url); reportQuery = this.getStartDate(reportQuery); let formatted = this.formatFilters(reportQuery); @@ -213,7 +201,6 @@ export class StatsService { getControls(reportQuery: ReportQuery): Observable<{total: any, items: any}> { const url = `${CC_API_URL}/reporting/controls`; - localStorage.setItem('current-url', url); reportQuery = this.getStartDate(reportQuery); let formatted = this.formatFilters(reportQuery);