aboutsummaryrefslogtreecommitdiffstats
path: root/sdnr/wt
diff options
context:
space:
mode:
authorHerbert Eiselt <herbert.eiselt@highstreet-technologies.com>2019-04-03 17:03:52 +0200
committerHerbert Eiselt <herbert.eiselt@highstreet-technologies.com>2019-04-03 17:04:45 +0200
commit3d6dd098db8ec243ca716a09fc55decbdd23b726 (patch)
tree6280e9f7b928370df0bbef8017d67b62d508d2ad /sdnr/wt
parentf12e38296c410dd105b5721f8ebaa29df789a6b6 (diff)
SDN-R Inventory export
Add inventory export and search Change-Id: Ib9541cea9be1bd7628f5e89ba17a65439f98a5bf Issue-ID: SDNC-494 Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Diffstat (limited to 'sdnr/wt')
-rw-r--r--sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryAppRootHandler.ts27
-rw-r--r--sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryElementsHandler.tsx19
-rw-r--r--sdnr/wt/odlux/apps/inventoryApp/src/index.html2
-rw-r--r--sdnr/wt/odlux/apps/inventoryApp/src/plugin.tsx2
-rw-r--r--sdnr/wt/odlux/apps/inventoryApp/src/views/dashboard.tsx107
-rw-r--r--sdnr/wt/odlux/apps/inventoryApp/webpack.config.js32
6 files changed, 113 insertions, 76 deletions
diff --git a/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryAppRootHandler.ts b/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryAppRootHandler.ts
new file mode 100644
index 000000000..6330e7e87
--- /dev/null
+++ b/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryAppRootHandler.ts
@@ -0,0 +1,27 @@
+// main state handler
+
+import { combineActionHandler } from '../../../../framework/src/flux/middleware';
+
+// ** do not remove **
+import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore';
+import { IActionHandler } from '../../../../framework/src/flux/action';
+import { IInventoryElementsState, inventoryElementsActionHandler } from './inventoryElementsHandler';
+
+
+export interface IInventoryAppStateState {
+ inventoryElements: IInventoryElementsState
+}
+
+
+declare module '../../../../framework/src/store/applicationStore' {
+ interface IApplicationStoreState {
+ inventory: IInventoryAppStateState;
+ }
+}
+
+const actionHandlers = {
+ inventoryElements: inventoryElementsActionHandler
+};
+
+export const faultAppRootHandler = combineActionHandler<IInventoryAppStateState>(actionHandlers);
+export default faultAppRootHandler;
diff --git a/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryElementsHandler.tsx b/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryElementsHandler.tsx
new file mode 100644
index 000000000..5673d1778
--- /dev/null
+++ b/sdnr/wt/odlux/apps/inventoryApp/src/handlers/inventoryElementsHandler.tsx
@@ -0,0 +1,19 @@
+import { createExternal,IExternalTableState } from '../../../../framework/src/components/material-table/utilities';
+import { createSearchDataHandler } from '../../../../framework/src/utilities/elasticSearch';
+
+import { InventoryType } from '../models/inventory';
+
+export interface IInventoryElementsState extends IExternalTableState<InventoryType> { }
+
+// create eleactic search material data fetch handler
+const inventoryElementsSearchHandler = createSearchDataHandler<InventoryType>("sdnevents/inventoryequipment");
+
+export const {
+ actionHandler: inventoryElementsActionHandler,
+ createActions: createInventoryElementsActions,
+ createProperties: createInventoryElementsProperties,
+ reloadAction: inventoryElementsReloadAction,
+
+ // set value action, to change a value
+} = createExternal<InventoryType>(inventoryElementsSearchHandler, appState => appState.inventory.inventoryElements);
+
diff --git a/sdnr/wt/odlux/apps/inventoryApp/src/index.html b/sdnr/wt/odlux/apps/inventoryApp/src/index.html
index d24358e18..0cdb9e93b 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/src/index.html
+++ b/sdnr/wt/odlux/apps/inventoryApp/src/index.html
@@ -17,7 +17,7 @@
// run the application
require(["app", "inventoryApp"], function (app, inventoryApp) {
inventoryApp.register();
- app("./app.tsx");
+ app("./app.tsx").runApplication();
});
</script>
</body>
diff --git a/sdnr/wt/odlux/apps/inventoryApp/src/plugin.tsx b/sdnr/wt/odlux/apps/inventoryApp/src/plugin.tsx
index 6022d9569..e5e7cc8c7 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/src/plugin.tsx
+++ b/sdnr/wt/odlux/apps/inventoryApp/src/plugin.tsx
@@ -6,11 +6,13 @@ import { faShoppingBag } from '@fortawesome/free-solid-svg-icons'; // select ap
import applicationManager from '../../../framework/src/services/applicationManager';
import { Dashboard } from './views/dashboard';
+import faultAppRootHandler from './handlers/inventoryAppRootHandler';
export function register() {
applicationManager.registerApplication({
name: "inventory",
icon: faShoppingBag,
+ rootActionHandler: faultAppRootHandler,
rootComponent: Dashboard,
menuEntry: "Inventory"
});
diff --git a/sdnr/wt/odlux/apps/inventoryApp/src/views/dashboard.tsx b/sdnr/wt/odlux/apps/inventoryApp/src/views/dashboard.tsx
index b2361af7f..2c6b4c838 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/src/views/dashboard.tsx
+++ b/sdnr/wt/odlux/apps/inventoryApp/src/views/dashboard.tsx
@@ -1,78 +1,47 @@
import * as React from "react";
-import { MaterialTable, DataCallback, MaterialTableCtorType } from '../../../../framework/src/components/material-table';
-import { Result, InventoryType } from '../models/inventory';
+import { Connect, connect, IDispatcher } from '../../../../framework/src/flux/connect';
+import { MaterialTable, MaterialTableCtorType } from '../../../../framework/src/components/material-table';
-
-const url = `${ window.location.origin}/database/sdnevents/inventoryequipment/_search`;
-
-const fetchData: DataCallback = async (page, rowsPerPage, orderBy, order, filter) => {
- const from = rowsPerPage && page != null && !isNaN(+page)
- ? (+page) * rowsPerPage
- : null;
-
- const filterKeys = filter && Object.keys(filter) || [];
-
- const query = {
- ...filterKeys.length > 0 ? {
- query: {
- bool: {
- must: filterKeys.reduce((acc, cur) => {
- if (acc && filter && filter[cur]) {
- acc.push({ [filter[cur].indexOf("*") > -1 || filter[cur].indexOf("?") > -1 ? "wildcard" : "prefix"]: { [cur]: filter[cur] } });
- }
- return acc;
- }, [] as any[])
- }
- }
- }: { "query": { "match_all": {} } },
- ...rowsPerPage ? { "size": rowsPerPage } : {} ,
- ...from ? { "from": from } : {},
- ...orderBy && order ? { "sort": [{ [orderBy]: order }] } : {},
- };
-
- const result = await fetch(url, {
- method: "POST", // *GET, POST, PUT, DELETE, etc.
- mode: "no-cors", // no-cors, cors, *same-origin
- cache: "no-cache", // *default, no-cache, reload, force-cache, only-if-cached
- headers: {
- "Content-Type": "application/json; charset=utf-8",
- // "Content-Type": "application/x-www-form-urlencoded",
- },
- body: JSON.stringify(query), // body data type must match "Content-Type" header
- });
-
- if (result.ok) {
- const queryResult: Result<InventoryType> = await result.json();
- const data = {
- page: Math.min(page || 0, queryResult.hits.total || 0 / (rowsPerPage || 1)),
- rowCount: queryResult.hits.total,
- rows: queryResult && queryResult.hits && queryResult.hits.hits && queryResult.hits.hits.map(h => (
- {
- ...h._source,
- _id: h._id
- }
- )) || []
- };
- return data;
- }
-
- return { page: 0, rowCount: 0, rows: [] };
-};
+import { InventoryType } from '../models/inventory';
+import { IApplicationStoreState } from "../../../../framework/src/store/applicationStore";
+import { createInventoryElementsProperties, createInventoryElementsActions } from "../handlers/inventoryElementsHandler";
const InventoryTable = MaterialTable as MaterialTableCtorType<InventoryType & {_id: string}>;
-export const Dashboard : React.SFC = (props) => (
- <InventoryTable onRequestData={ fetchData } columns={ [
- { property: "uuid", title: "Name" },
- { property: "parentUuid", title: "Parent" },
- { property: "mountpoint", title: "Mountpoint" },
- { property: "manufacturerIdentifier", title: "Manufacturer" },
- { property: "serial", title: "Serial" },
- { property: "typeName", title: "Type" },
- ] } title="Inventory" idProperty="_id" >
+const mapProps = (state: IApplicationStoreState) => ({
+ inventoryElementsProperties: createInventoryElementsProperties(state),
+ inventoryElements: state.inventory.inventoryElements
+});
+
+const mapDispatch = (dispatcher: IDispatcher) => ({
+ inventoryElementsActions: createInventoryElementsActions(dispatcher.dispatch)
+});
+
+class DashboardComponent extends React.Component<Connect<typeof mapProps, typeof mapDispatch>> {
+ render() {
+ return <InventoryTable title="Inventory" idProperty="_id" columns={[
+ { property: "mountpoint", title: "Mountpoint" },
+ { property: "manufacturerIdentifier", title: "Manufacturer" },
+ { property: "parentUuid", title: "Parent" },
+ { property: "uuid", title: "Name" },
+ { property: "serial", title: "Serial" },
+ { property: "version", title: "Version" },
+ { property: "date", title: "Date" },
+ { property: "description", title: "Description" },
+ { property: "partTypeId", title: "Part Type Id" },
+ { property: "modelIdentifier", title: "Model Identifier" },
+ { property: "typeName", title: "Type" },
+ { property: "treeLevel", title: "Containment Level" },
+ ]} {...this.props.inventoryElementsActions} {...this.props.inventoryElementsProperties} >
+ </InventoryTable>
+ }
- </InventoryTable>
-);
+ componentDidMount() {
+ this.props.inventoryElementsActions.onToggleFilter();
+ this.props.inventoryElementsActions.onHandleRequestSort("mountpoint");
+ }
+}
+export const Dashboard = connect(mapProps, mapDispatch)(DashboardComponent);
export default Dashboard; \ No newline at end of file
diff --git a/sdnr/wt/odlux/apps/inventoryApp/webpack.config.js b/sdnr/wt/odlux/apps/inventoryApp/webpack.config.js
index e992a1042..2af2bdb95 100644
--- a/sdnr/wt/odlux/apps/inventoryApp/webpack.config.js
+++ b/sdnr/wt/odlux/apps/inventoryApp/webpack.config.js
@@ -79,13 +79,13 @@ module.exports = (env) => {
new webpack.DllReferencePlugin({
context: path.resolve(__dirname, "../../framework/src"),
manifest: require(path.resolve(frameworkPath, "vendor-manifest.json")),
- sourceType: "umd2"
- }),
+ sourceType: "umd2"
+ }),
new webpack.DllReferencePlugin({
context: path.resolve(__dirname, "../../framework/src"),
manifest: require(path.resolve(frameworkPath, "app-manifest.json")),
- sourceType: "umd2"
- }),
+ sourceType: "umd2"
+ }),
...(env === "release") ? [
new webpack.DefinePlugin({
"process.env": {
@@ -126,11 +126,31 @@ module.exports = (env) => {
colors: true
},
proxy: {
- "/database": {
- target: "http://localhost:8181",
+
+ "/oauth2/": {
+ target: "http://localhost:3000",
+ secure: false
+ },
+ "/database/": {
+ target: "http://localhost:3000",
+ secure: false
+ },
+ "/restconf/": {
+ target: "http://localhost:3000",
+ secure: false
+ },
+ "/help/": {
+ target: "http://localhost:3000",
+ secure: false
+ },
+ "/websocket/": {
+ target: "http://localhost:3000",
+ ws: true,
+ changeOrigin: true,
secure: false
}
}
+
}
}];
}