From aee5dc5c1a62ba13c792028e9eea5886a680eb79 Mon Sep 17 00:00:00 2001
From: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Date: Wed, 7 Oct 2020 13:51:14 +0200
Subject: ConfigApp bugfixes

fix remove button in lists and boolean filters not working, fix delay-period not configurable

Issue-ID: CCSDK-2878
Signed-off-by: Aijana Schumann <aijana.schumann@highstreet-technologies.com>
Change-Id: I49f03840de6092f9ac4641b7c98785b5feb760b4
---
 .../wt/odlux/framework/src/services/restService.ts |  2 +-
 sdnr/wt/odlux/framework/src/views/frame.tsx        | 97 ++++++++++++----------
 2 files changed, 52 insertions(+), 47 deletions(-)

(limited to 'sdnr/wt/odlux/framework')

diff --git a/sdnr/wt/odlux/framework/src/services/restService.ts b/sdnr/wt/odlux/framework/src/services/restService.ts
index 19ef34f91..f05c7b89f 100644
--- a/sdnr/wt/odlux/framework/src/services/restService.ts
+++ b/sdnr/wt/odlux/framework/src/services/restService.ts
@@ -85,7 +85,7 @@ export async function requestRestExt<TData>(path: string = '', init: RequestInit
     };
   }
   const contentType = fetchResult.headers.get("Content-Type") || fetchResult.headers.get("content-type");
-  const isJson = contentType && contentType.toLowerCase().startsWith("application/json");
+  const isJson = contentType && (contentType.toLowerCase().startsWith("application/json") || contentType.toLowerCase().startsWith("application/yang-data+json"));
   try {
     const data = (isJson ? await fetchResult.json() : await fetchResult.text()) as TData;
     return {
diff --git a/sdnr/wt/odlux/framework/src/views/frame.tsx b/sdnr/wt/odlux/framework/src/views/frame.tsx
index 521897554..c8e24fdb9 100644
--- a/sdnr/wt/odlux/framework/src/views/frame.tsx
+++ b/sdnr/wt/odlux/framework/src/views/frame.tsx
@@ -21,6 +21,9 @@ import { HashRouter as Router, Route, Redirect, Switch } from 'react-router-dom'
 import { withStyles, WithStyles, createStyles, Theme } from '@material-ui/core/styles';
 import { faHome, faAddressBook, faSignInAlt } from '@fortawesome/free-solid-svg-icons';
 
+import { SnackbarProvider } from 'notistack';
+import { ConfirmProvider } from 'material-ui-confirm';
+
 import AppFrame from '../components/routing/appFrame';
 import TitleBar from '../components/titleBar';
 import Menu from '../components/navigationMenu';
@@ -33,7 +36,7 @@ import About from '../views/about';
 import Test from '../views/test';
 
 import applicationService from '../services/applicationManager';
-import { SnackbarProvider } from 'notistack';
+
 
 const styles = (theme: Theme) => createStyles({
   root: {
@@ -63,52 +66,54 @@ class FrameComponent extends React.Component<FrameProps>{
     const registrations = applicationService.applications;
     const { classes } = this.props;
     return (
-      <SnackbarProvider maxSnack={3}>
-        <Router>
-          <div className={classes.root}>
-            <SnackDisplay />
-            <ErrorDisplay />
-            <TitleBar />
-            <Menu />
-            <main className={classes.content}>
-              {
-                <div className={classes.toolbar} /> //needed for margins, don't remove!
-              }
-              <Switch>
-                <Route exact path="/" component={() => (
-                  <AppFrame title={"Home"} icon={faHome} >
-                    <Home />
-                  </AppFrame>
-                )} />
-                <Route path="/about" component={() => (
-                  <AppFrame title={"About"} icon={faAddressBook} >
-                    <About />
-                  </AppFrame>
-                )} />
-                {process.env.NODE_ENV === "development" ? <Route path="/test" component={() => (
-                  <AppFrame title={"Test"} icon={faAddressBook} >
-                    <Test />
-                  </AppFrame>
-                )} /> : null}
-                <Route path="/login" component={() => (
-                  <AppFrame title={"Login"} icon={faSignInAlt} >
-                    <Login />
-                  </AppFrame>
-                )} />
-                {Object.keys(registrations).map(p => {
-                  const application = registrations[p];
-                  return (<Route key={application.name} path={application.path || `/${application.name}`} component={() => (
-                    <AppFrame title={application.title || (typeof application.menuEntry === 'string' && application.menuEntry) || application.name} icon={application.icon} appId={application.name} >
-                      <application.rootComponent />
+      <ConfirmProvider>
+        <SnackbarProvider maxSnack={3}>
+            <Router>
+            <div className={classes.root}>
+                <SnackDisplay />
+                <ErrorDisplay />
+                <TitleBar />
+                <Menu />
+                <main className={classes.content}>
+                {
+                    <div className={classes.toolbar} /> //needed for margins, don't remove!
+                }
+                <Switch>
+                    <Route exact path="/" component={() => (
+                    <AppFrame title={"Home"} icon={faHome} >
+                        <Home />
+                    </AppFrame>
+                    )} />
+                    <Route path="/about" component={() => (
+                    <AppFrame title={"About"} icon={faAddressBook} >
+                        <About />
+                    </AppFrame>
+                    )} />
+                    {process.env.NODE_ENV === "development" ? <Route path="/test" component={() => (
+                    <AppFrame title={"Test"} icon={faAddressBook} >
+                        <Test />
+                    </AppFrame>
+                    )} /> : null}
+                    <Route path="/login" component={() => (
+                    <AppFrame title={"Login"} icon={faSignInAlt} >
+                        <Login />
                     </AppFrame>
-                  )} />)
-                })}
-                <Redirect to="/" />
-              </Switch>
-            </main>
-          </div>
-        </Router>
-      </SnackbarProvider>
+                    )} />
+                    {Object.keys(registrations).map(p => {
+                    const application = registrations[p];
+                    return (<Route key={application.name} path={application.path || `/${application.name}`} component={() => (
+                        <AppFrame title={application.title || (typeof application.menuEntry === 'string' && application.menuEntry) || application.name} icon={application.icon} appId={application.name} >
+                        <application.rootComponent />
+                        </AppFrame>
+                    )} />)
+                    })}
+                    <Redirect to="/" />
+                </Switch>
+                </main>
+            </div>
+            </Router>
+        </SnackbarProvider>
+      </ConfirmProvider>  
     );
   }
 }
-- 
cgit 1.2.3-korg