summaryrefslogtreecommitdiffstats
path: root/src/app/inventory
diff options
context:
space:
mode:
authorShawn Severin <shawn.severin@amdocs.com>2017-12-07 15:19:25 -0500
committerShawn Severin <shawn.severin@amdocs.com>2017-12-07 15:19:46 -0500
commita7b4b96afee33a2ff458f906742d88cd306ed961 (patch)
treedcf2b16fdc4f52368327d372112cebaf126a1ded /src/app/inventory
parent6ac2e7c0bef5ee478b36181b8bb384119ad3d937 (diff)
Adding filter bar
Issue-ID: AAI-543 Change-Id: I18ec69f4585a9f01feafd009fcd30493a039b064 Signed-off-by: Shawn Severin <shawn.severin@amdocs.com>
Diffstat (limited to 'src/app/inventory')
-rw-r--r--src/app/inventory/Inventory.jsx32
-rw-r--r--src/app/inventory/InventoryConstants.js25
2 files changed, 33 insertions, 24 deletions
diff --git a/src/app/inventory/Inventory.jsx b/src/app/inventory/Inventory.jsx
index b323446..106619f 100644
--- a/src/app/inventory/Inventory.jsx
+++ b/src/app/inventory/Inventory.jsx
@@ -1,25 +1,28 @@
/*
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============LICENSE_START===================================================
+ * SPARKY (AAI UI service)
+ * ============================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
* Copyright © 2017 Amdocs
- * ================================================================================
+ * All rights reserved.
+ * ============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
+ * ============LICENSE_END=====================================================
*
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
*/
+
import React, {Component} from 'react';
import {connect} from 'react-redux';
import Grid from 'react-bootstrap/lib/Grid';
@@ -46,7 +49,10 @@ import {
import InlineMessage from 'generic-components/InlineMessage/InlineMessage.jsx';
import PaginatedTable from 'generic-components/paginatedTable/PaginatedTable.jsx';
import {
- dateFormatLocalTimeZoneMMDDYYYY, getTicks, getTicksData, sortDataByField
+ dateFormatLocalTimeZoneYYYYMMDD,
+ getTicks,
+ getTicksData,
+ sortDataByField
} from 'utils/DateTimeChartUtil.js';
import TitledContainer from 'generic-components/titledContainer/TitledContainer.jsx';
import {COLOR_BLUE} from 'utils/GlobalConstants.js';
@@ -114,7 +120,7 @@ class Inventory extends Component {
let lastDate = '';
if (sortedData.length > 0) {
lastDate =
- dateFormatLocalTimeZoneMMDDYYYY(sortedData[sortedData.length - 1]
+ dateFormatLocalTimeZoneYYYYMMDD(sortedData[sortedData.length - 1]
.date);
totalEntities = sortedData[sortedData.length - 1].count;
}
@@ -159,12 +165,12 @@ class Inventory extends Component {
}}>
<XAxis dataKey={xAxisAttrName} ticks={ticksArr}
tickCount={ticksArr.length}
- tickFormatter={dateFormatLocalTimeZoneMMDDYYYY}/>
+ tickFormatter={dateFormatLocalTimeZoneYYYYMMDD}/>
<YAxis/>
<CartesianGrid strokeDasharray='3 3'/>
- <Tooltip labelFormatter={dateFormatLocalTimeZoneMMDDYYYY}/>
+ <Tooltip labelFormatter={dateFormatLocalTimeZoneYYYYMMDD}/>
<Brush dataKey={xAxisAttrName}
- tickFormatter={dateFormatLocalTimeZoneMMDDYYYY}
+ tickFormatter={dateFormatLocalTimeZoneYYYYMMDD}
height={20} stroke={COLOR_BLUE}/>
<Line
name={i18n(TOTAL_ENTITY_COUNTS_BY_DATE_CHART.yAxisLabel)}
diff --git a/src/app/inventory/InventoryConstants.js b/src/app/inventory/InventoryConstants.js
index c67fbba..9c289c2 100644
--- a/src/app/inventory/InventoryConstants.js
+++ b/src/app/inventory/InventoryConstants.js
@@ -1,25 +1,28 @@
/*
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ============LICENSE_START===================================================
+ * SPARKY (AAI UI service)
+ * ============================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
* Copyright © 2017 Amdocs
- * ================================================================================
+ * All rights reserved.
+ * ============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
+ * ============LICENSE_END=====================================================
*
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
*/
+
import keyMirror from 'utils/KeyMirror.js';
import {BASE_URL} from 'app/networking/NetworkConstants.js';
@@ -37,9 +40,9 @@ export const COMPLEX_BY_LOCATION_TITLE = 'Complexes By Location';
export const TOTAL_ENTITY_COUNT_TITLE = 'Total Entities';
export const ENTITIES_BY_TYPE_TITLE = 'Entities By Type';
-export const INVENTORY_COUNT_BY_TYPE_SEARCH_URL = BASE_URL + '/visualization/entityCountHistory?type=table';
-export const INVENTORY_COUNT_BY_DATE_SEARCH_URL = BASE_URL + '/visualization/entityCountHistory?type=graph';
-export const INVENTORY_GEO_VISUALIZATION_SEARCH_URL = BASE_URL + '/visualization/geovisualization';
+export const INVENTORY_COUNT_BY_TYPE_SEARCH_URL = BASE_URL + '/rest/visualization/entityCountHistory?type=table';
+export const INVENTORY_COUNT_BY_DATE_SEARCH_URL = BASE_URL + '/rest/visualization/entityCountHistory?type=graph';
+export const INVENTORY_GEO_VISUALIZATION_SEARCH_URL = BASE_URL + '/rest/visualization/geovisualization';
export const GEO_VISUALIZATION_QUERY_STRING_PARAMETERS = '/?entity=';
export const TOTAL_ENTITY_COUNTS_BY_DATE_CHART = {