From da4fd6169717cfa04d644d0af0d23dd089a6e373 Mon Sep 17 00:00:00 2001 From: herbert Date: Sat, 14 Dec 2019 00:06:42 +0100 Subject: remove old version of devicemodel devicemanager oldux featureaggregator Issue-ID: SDNC-1004 Signed-off-by: herbert Change-Id: I5337643181e2398e5a8097e4ee14fa4ac96d0d4c --- sdnr/wt/odlux/apps/demoApp/.babelrc | 17 --- sdnr/wt/odlux/apps/demoApp/package.json | 40 ----- sdnr/wt/odlux/apps/demoApp/pom.xml | 161 --------------------- .../apps/demoApp/src/actions/authorActions.ts | 51 ------- .../odlux/apps/demoApp/src/components/counter.tsx | 34 ----- .../demoApp/src/handlers/demoAppRootHandler.ts | 43 ------ .../apps/demoApp/src/handlers/editAuthorHandler.ts | 33 ----- .../demoApp/src/handlers/listAuthorsHandler.ts | 57 -------- sdnr/wt/odlux/apps/demoApp/src/index.html | 25 ---- sdnr/wt/odlux/apps/demoApp/src/models/author.ts | 19 --- sdnr/wt/odlux/apps/demoApp/src/plugin.tsx | 54 ------- .../apps/demoApp/src/services/authorService.ts | 72 --------- .../odlux/apps/demoApp/src/views/authorsList.tsx | 87 ----------- .../wt/odlux/apps/demoApp/src/views/editAuthor.tsx | 34 ----- .../sdnr/wt/odlux/bundles/MyOdluxBundle.java | 68 --------- .../resources/OSGI-INF/blueprint/blueprint.xml | 9 -- .../sdnr/wt/odlux/bundles/test/TestBundleRes.java | 45 ------ .../odlux/apps/demoApp/src2/test/resources/test.js | 5 - sdnr/wt/odlux/apps/demoApp/tsconfig.json | 37 ----- sdnr/wt/odlux/apps/demoApp/webpack.config.js | 134 ----------------- 20 files changed, 1025 deletions(-) delete mode 100644 sdnr/wt/odlux/apps/demoApp/.babelrc delete mode 100644 sdnr/wt/odlux/apps/demoApp/package.json delete mode 100644 sdnr/wt/odlux/apps/demoApp/pom.xml delete mode 100644 sdnr/wt/odlux/apps/demoApp/src/actions/authorActions.ts delete mode 100644 sdnr/wt/odlux/apps/demoApp/src/components/counter.tsx delete mode 100644 sdnr/wt/odlux/apps/demoApp/src/handlers/demoAppRootHandler.ts delete mode 100644 sdnr/wt/odlux/apps/demoApp/src/handlers/editAuthorHandler.ts delete mode 100644 sdnr/wt/odlux/apps/demoApp/src/handlers/listAuthorsHandler.ts delete mode 100644 sdnr/wt/odlux/apps/demoApp/src/index.html delete mode 100644 sdnr/wt/odlux/apps/demoApp/src/models/author.ts delete mode 100644 sdnr/wt/odlux/apps/demoApp/src/plugin.tsx delete mode 100644 sdnr/wt/odlux/apps/demoApp/src/services/authorService.ts delete mode 100644 sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx delete mode 100644 sdnr/wt/odlux/apps/demoApp/src/views/editAuthor.tsx delete mode 100644 sdnr/wt/odlux/apps/demoApp/src2/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/MyOdluxBundle.java delete mode 100644 sdnr/wt/odlux/apps/demoApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml delete mode 100644 sdnr/wt/odlux/apps/demoApp/src2/test/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/test/TestBundleRes.java delete mode 100644 sdnr/wt/odlux/apps/demoApp/src2/test/resources/test.js delete mode 100644 sdnr/wt/odlux/apps/demoApp/tsconfig.json delete mode 100644 sdnr/wt/odlux/apps/demoApp/webpack.config.js (limited to 'sdnr/wt/odlux/apps/demoApp') diff --git a/sdnr/wt/odlux/apps/demoApp/.babelrc b/sdnr/wt/odlux/apps/demoApp/.babelrc deleted file mode 100644 index 3d8cd1260..000000000 --- a/sdnr/wt/odlux/apps/demoApp/.babelrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "presets": [ - ["@babel/preset-react"], - ["@babel/preset-env", { - "targets": { - "chrome": "66" - }, - "spec": true, - "loose": false, - "modules": false, - "debug": false, - "useBuiltIns": "usage", - "forceAllTransforms": true - }] - ], - "plugins": [] -} diff --git a/sdnr/wt/odlux/apps/demoApp/package.json b/sdnr/wt/odlux/apps/demoApp/package.json deleted file mode 100644 index 4cf46b9e1..000000000 --- a/sdnr/wt/odlux/apps/demoApp/package.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "@odlux/demo-app", - "version": "0.1.0", - "description": "A react based modular UI framework", - "main": "index.js", - "scripts": { - "start": "webpack-dev-server --env debug", - "build": "webpack --env release --config webpack.config.js", - "build:dev": "webpack --env debug --config webpack.config.js" - }, - "repository": { - "type": "git", - "url": "https://git.mfico.de/highstreet-technologies/odlux.git" - }, - "keywords": [ - "reactjs", - "redux", - "ui", - "framework" - ], - "author": "Matthias Fischer", - "license": "Apache-2.0", - "dependencies": { - "@odlux/framework": "*" - }, - "peerDependencies": { - "@types/react": "16.4.14", - "@types/react-dom": "16.0.8", - "@types/react-router-dom": "4.3.1", - "@material-ui/core": "3.8.3", - "@material-ui/icons": "3.0.2", - "@types/classnames": "2.2.6", - "@types/flux": "3.1.8", - "@types/jquery": "3.3.10", - "jquery": "3.3.1", - "react": "16.5.2", - "react-dom": "16.5.2", - "react-router-dom": "4.3.1" - } -} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/demoApp/pom.xml b/sdnr/wt/odlux/apps/demoApp/pom.xml deleted file mode 100644 index 32c8cc2c5..000000000 --- a/sdnr/wt/odlux/apps/demoApp/pom.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-odlux-app-demoApp - 0.7.0-SNAPSHOT - bundle - - sdnr-wt-odlux-app-demoApp - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - - ${project.groupId} - sdnr-wt-odlux-core-model - ${project.version} - - - ${project.groupId} - sdnr-wt-odlux-core-provider - ${project.version} - test - - - junit - junit - test - - - - - - highstreet repo - https://cloud-highstreet-technologies.com/mvn/ - - true - always - - - - - - src2/main/java - - - dist - odlux - - - src2/main/resources - - - src2/test/resources - - - - - maven-clean-plugin - - - - dist - false - - - node - false - - - node_modules - false - - - ../node_modules - false - - - - bin - false - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-test-source - generate-test-sources - - add-test-source - - - - src2/test/java - - - - - - - de.jacksitlab - frontend-maven-plugin - 1.7.1 - - - install node and yarn - - install-node-and-yarn - - - initialize - - v8.10.0 - v1.12.3 - - - - yarn build - - yarn - - - run build - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.features.sdnr.wt.odlux.model.*,com.opensymphony.* - - - - - - - diff --git a/sdnr/wt/odlux/apps/demoApp/src/actions/authorActions.ts b/sdnr/wt/odlux/apps/demoApp/src/actions/authorActions.ts deleted file mode 100644 index f75075192..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src/actions/authorActions.ts +++ /dev/null @@ -1,51 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 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 - * - * 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========================================================================== - */ -import { Action } from '../../../../framework/src/flux/action'; -import { Dispatch } from '../../../../framework/src/flux/store'; -import { AddErrorInfoAction } from '../../../../framework/src/actions/errorActions'; - -import { IAuthor } from '../models/author'; -import { authorService } from '../services/authorService'; - -export class ApplicationBaseAction extends Action { } - - -export class LoadAllAuthorsAction extends ApplicationBaseAction { - constructor() { - super(); - } -} - -// in React Action is most times a Message -export class AllAuthorsLoadedAction extends ApplicationBaseAction { - constructor(public authors: IAuthor[] | null, public error?: string) { - super(); - - } -} - -export const loadAllAuthorsAsync = (dispatch: Dispatch) => { - dispatch(new LoadAllAuthorsAction()); - authorService.getAllAuthors().then(authors => { - dispatch(new AllAuthorsLoadedAction(authors)); - }, error => { - dispatch(new AllAuthorsLoadedAction(null, error)); - dispatch(new AddErrorInfoAction(error)); - }); -} - diff --git a/sdnr/wt/odlux/apps/demoApp/src/components/counter.tsx b/sdnr/wt/odlux/apps/demoApp/src/components/counter.tsx deleted file mode 100644 index b47fa4507..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src/components/counter.tsx +++ /dev/null @@ -1,34 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 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 - * - * 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========================================================================== - */ -import * as React from 'react'; - -export class Counter extends React.Component<{}, { counter: number }> { - constructor(props: {}) { - super(props); - - this.state = { - counter: 0 - }; - } - - render() { - return ( - - ) - } -} \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/demoApp/src/handlers/demoAppRootHandler.ts b/sdnr/wt/odlux/apps/demoApp/src/handlers/demoAppRootHandler.ts deleted file mode 100644 index 9ff8450c8..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src/handlers/demoAppRootHandler.ts +++ /dev/null @@ -1,43 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 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 - * - * 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========================================================================== - */ - -import { combineActionHandler } from '../../../../framework/src/flux/middleware'; - -import { IApplicationStoreState } from '../../../../framework/src/store/applicationStore'; - -import { listAuthorsHandler, IListAuthors } from './listAuthorsHandler'; -import { editAuthorHandler, IEditAuthor } from './editAuthorHandler'; - -export interface IDemoAppStoreState { - listAuthors: IListAuthors; - editAuthor: IEditAuthor; -} - -declare module '../../../../framework/src/store/applicationStore' { - interface IApplicationStoreState { - demo: IDemoAppStoreState - } -} - -const actionHandlers = { - listAuthors: listAuthorsHandler, - editAuthor: editAuthorHandler, -}; - -export const demoAppRootHandler = combineActionHandler (actionHandlers); -export default demoAppRootHandler; diff --git a/sdnr/wt/odlux/apps/demoApp/src/handlers/editAuthorHandler.ts b/sdnr/wt/odlux/apps/demoApp/src/handlers/editAuthorHandler.ts deleted file mode 100644 index 34b533cb1..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src/handlers/editAuthorHandler.ts +++ /dev/null @@ -1,33 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 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 - * - * 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========================================================================== - */ -import { IActionHandler } from '../../../../framework/src/flux/action'; - -import { IAuthor } from '../models/author'; -export interface IEditAuthor { - author: IAuthor | null; - isDirty: boolean; -} - -const editAuthorInit: IEditAuthor = { - author: null, - isDirty: false -}; - -export const editAuthorHandler: IActionHandler = (state = editAuthorInit, action) => { - return state; -}; diff --git a/sdnr/wt/odlux/apps/demoApp/src/handlers/listAuthorsHandler.ts b/sdnr/wt/odlux/apps/demoApp/src/handlers/listAuthorsHandler.ts deleted file mode 100644 index ca2b6d3c6..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src/handlers/listAuthorsHandler.ts +++ /dev/null @@ -1,57 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 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 - * - * 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========================================================================== - */ -import { IActionHandler } from '../../../../framework/src/flux/action'; - -import { IAuthor } from '../models/author'; -import { LoadAllAuthorsAction, AllAuthorsLoadedAction } from '../actions/authorActions'; - -export interface IListAuthors { - authors: IAuthor[]; - busy: boolean; -} - -const listAuthorsInit: IListAuthors = { - authors: [], - busy: false -}; - -export const listAuthorsHandler: IActionHandler = (state = listAuthorsInit, action) => { - if (action instanceof LoadAllAuthorsAction) { - - state = { - ...state, - busy: true - }; - - } else if (action instanceof AllAuthorsLoadedAction) { - if (!action.error && action.authors) { - state = { - ...state, - authors: action.authors, - busy: false - }; - } else { - state = { - ...state, - busy: false - }; - } - } - - return state; -}; \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/demoApp/src/index.html b/sdnr/wt/odlux/apps/demoApp/src/index.html deleted file mode 100644 index e85bcbb03..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - Demo App - - - -
- - - - - - \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/demoApp/src/models/author.ts b/sdnr/wt/odlux/apps/demoApp/src/models/author.ts deleted file mode 100644 index 7e28ae8aa..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src/models/author.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Represents an author. - */ -export interface IAuthor { - /** - * Defines the unique id of the autor. - */ - id: number; - - /** - * Defines the first name of this author. - */ - firstName: string; - - /** - * Defines the last name of this author. - */ - lastName: string; -} diff --git a/sdnr/wt/odlux/apps/demoApp/src/plugin.tsx b/sdnr/wt/odlux/apps/demoApp/src/plugin.tsx deleted file mode 100644 index 4d67c28ac..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src/plugin.tsx +++ /dev/null @@ -1,54 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 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 - * - * 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========================================================================== - */ -import * as React from "react"; -import { withRouter, RouteComponentProps, Route, Switch, Redirect } from 'react-router-dom'; - -import { faAddressBook, faRegistered } from '@fortawesome/free-solid-svg-icons'; - -import applicationManager from '../../../framework/src/services/applicationManager'; -import connect, { Connect } from '../../../framework/src/flux/connect'; - -import { demoAppRootHandler } from './handlers/demoAppRootHandler'; - -import AuthorsList from './views/authorsList'; -import EditAuthor from './views/editAuthor'; - -import { Counter } from './components/counter'; - -type AppProps = RouteComponentProps & Connect; - -const App = (props: AppProps) => ( - - - - - -); - -const FinalApp = withRouter(connect()(App)); - -export function register() { - const applicationApi = applicationManager.registerApplication({ - name: "demo", - icon: faAddressBook, - rootComponent: FinalApp, - rootActionHandler: demoAppRootHandler, - exportedComponents: { counter: Counter }, - menuEntry: "Demo" - }); -} diff --git a/sdnr/wt/odlux/apps/demoApp/src/services/authorService.ts b/sdnr/wt/odlux/apps/demoApp/src/services/authorService.ts deleted file mode 100644 index 13e4b316c..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src/services/authorService.ts +++ /dev/null @@ -1,72 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 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 - * - * 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========================================================================== - */ -import { IAuthor } from '../models/author'; - -import * as $ from 'jquery'; - -const base_url = 'https://api.mfico.de/v1/authors'; - -/** - * Represents a web api accessor service for all author related actions. - */ -class AuthorService { - - /** - * Gets all known authors from the backend. - * @returns A promise of the type array of @see {@link IAuthor} containing all known authors. - */ - public getAllAuthors(): Promise { - return new Promise((resolve: (value: IAuthor[]) => void, reject: (err: any) => void) => { - $.ajax({ method: "GET", url: base_url }) - .then((data) => { resolve(data); }, (err) => { reject(err) }); - }); - } - - /** - * Gets an author by its id from the backend. - * @returns A promise of the type @see {@link IAuthor} containing the author to get. - */ - public getAuthorById(id: string | number): Promise { - return new Promise((resolve: (value: IAuthor) => void, reject: (err: any) => void) => { - $.ajax({ method: "GET", url: base_url + "/" + id }) - .then((data) => { resolve(data); }, (err) => { reject(err) }); - }); - } - - -/** - * Saves the given author to the backend api. - * @returns A promise of the type @see {@link IAuthor} containing the autor returned by the backend api. - */ - public saveAuthor(author: IAuthor): Promise { - return new Promise((resolve: (value: IAuthor) => void, reject: (err: any) => void) => { - // simulate server save - window.setTimeout(() => { - if (Math.random() > 0.8) { - reject("Could not save author."); - } else { - resolve(author); - } - }, 800); // simulate a short network delay - }); - } -} - -// return as a singleton -export const authorService = new AuthorService(); -export default authorService; diff --git a/sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx b/sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx deleted file mode 100644 index b461aa7bd..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src/views/authorsList.tsx +++ /dev/null @@ -1,87 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 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 - * - * 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========================================================================== - */ -import * as React from 'react'; -import { withRouter, RouteComponentProps } from 'react-router-dom'; - -import Table from '@material-ui/core/Table'; -import TableBody from '@material-ui/core/TableBody'; -import TableCell from '@material-ui/core/TableCell'; -import TableHead from '@material-ui/core/TableHead'; -import TableRow from '@material-ui/core/TableRow'; -import Paper from '@material-ui/core/Paper'; // means border - -import connect from '../../../../framework/src/flux/connect'; - -import { loadAllAuthorsAsync } from '../actions/authorActions'; -import { IAuthor } from '../models/author'; - -interface IAuthorsListProps { - authors: IAuthor[], - busy: boolean, - onLoadAllAuthors: () => void -} - -class AuthorsListComponent extends React.Component { - - render(): JSX.Element { - const { authors, busy } = this.props; - return ( - - - - - Id - First Name - Last Name - - - - { authors.map(author => ( - this.editAuthor(author) }> - { author.id } - { author.firstName } - { author.lastName } - - )) } - -
- - ); - }; - - public componentDidMount() { - this.props.onLoadAllAuthors(); - } - - private editAuthor = (author: IAuthor) => { - author && this.props.history.push(this.props.match.path + '/' + author.id); - }; -} - -export const AuthorsList = withRouter( - connect( - ({ demo: state }) => ({ - authors: state.listAuthors.authors, - busy: state.listAuthors.busy - }), - (dispatcher) => ({ - onLoadAllAuthors: () => { - dispatcher.dispatch(loadAllAuthorsAsync) - } - }))(AuthorsListComponent)); -export default AuthorsList; diff --git a/sdnr/wt/odlux/apps/demoApp/src/views/editAuthor.tsx b/sdnr/wt/odlux/apps/demoApp/src/views/editAuthor.tsx deleted file mode 100644 index 92f671234..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src/views/editAuthor.tsx +++ /dev/null @@ -1,34 +0,0 @@ -/** - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt odlux - * ================================================================================================= - * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 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 - * - * 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========================================================================== - */ -import * as React from 'react'; -import { withRouter, RouteComponentProps } from 'react-router-dom'; - -type EditAuthorProps = RouteComponentProps<{ authorId: string}>; - -class EditAuthorComponent extends React.Component { - render(): JSX.Element { - return ( -
-

Edit Author { this.props.match.params.authorId }

-
- ) - } -} - -export const EditAuthor = withRouter(EditAuthorComponent); -export default EditAuthor; \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/demoApp/src2/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/MyOdluxBundle.java b/sdnr/wt/odlux/apps/demoApp/src2/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/MyOdluxBundle.java deleted file mode 100644 index 1e882fc69..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src2/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/MyOdluxBundle.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt - * ================================================================================================= - * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 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 - * - * 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========================================================================== - ******************************************************************************/ -package org.onap.ccsdk.features.sdnr.wt.odlux.bundles; - -import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundle; -import org.onap.ccsdk.features.sdnr.wt.odlux.model.bundles.OdluxBundleLoader; - -public class MyOdluxBundle extends OdluxBundle { - - @Override - public void initialize() { - super.initialize(); - } - - @Override - public void clean() { - super.clean(); - } - - @Override - public String getResourceFileContent(String filename) { - return super.getResourceFileContent(filename); - } - - @Override - public boolean hasResource(String filename) { - return super.hasResource(filename); - } - - @Override - public void setBundleName(String bundleName) { - super.setBundleName(bundleName); - } - - @Override - public void setLoader(OdluxBundleLoader loader) { - super.setLoader(loader); - } - - @Override - public String getBundleName() { - return super.getBundleName(); - } - - @Override - public OdluxBundleLoader getLoader() { - return super.getLoader(); - } - - public MyOdluxBundle() { - super(); - } -} diff --git a/sdnr/wt/odlux/apps/demoApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml b/sdnr/wt/odlux/apps/demoApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index 91f6002ac..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src2/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/demoApp/src2/test/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/test/TestBundleRes.java b/sdnr/wt/odlux/apps/demoApp/src2/test/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/test/TestBundleRes.java deleted file mode 100644 index edf68e096..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src2/test/java/org/onap/ccsdk/features/sdnr/wt/odlux/bundles/test/TestBundleRes.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt - * ================================================================================================= - * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. 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 - * - * 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========================================================================== - ******************************************************************************/ -package org.onap.ccsdk.features.sdnr.wt.odlux.bundles.test; - -import static org.junit.Assert.*; - -import org.junit.Test; -import org.onap.ccsdk.features.sdnr.wt.odlux.OdluxBundleLoaderImpl; -import org.onap.ccsdk.features.sdnr.wt.odlux.bundles.MyOdluxBundle; - -public class TestBundleRes { - - @Test - public void test() { - OdluxBundleLoaderImpl loader = OdluxBundleLoaderImpl.getInstance(); - MyOdluxBundle b = new MyOdluxBundle(); - b.setLoader(loader); - b.setIndex(0); - b.setBundleName("abc"); - b.initialize(); - assertTrue(loader.getNumberOfBundles()==1); - assertNotNull(b.getLoader()); - assertEquals("abc",b.getBundleName()); - assertTrue(b.hasResource("test.js")); - assertNotNull(b.getResourceFileContent("test.js")); - b.clean(); - assertTrue(loader.getNumberOfBundles()==0); - } - -} diff --git a/sdnr/wt/odlux/apps/demoApp/src2/test/resources/test.js b/sdnr/wt/odlux/apps/demoApp/src2/test/resources/test.js deleted file mode 100644 index b47fdc39f..000000000 --- a/sdnr/wt/odlux/apps/demoApp/src2/test/resources/test.js +++ /dev/null @@ -1,5 +0,0 @@ -asdac sad -as -d -sad - sadfa \ No newline at end of file diff --git a/sdnr/wt/odlux/apps/demoApp/tsconfig.json b/sdnr/wt/odlux/apps/demoApp/tsconfig.json deleted file mode 100644 index a66b5d828..000000000 --- a/sdnr/wt/odlux/apps/demoApp/tsconfig.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": "./src", - "outDir": "./dist", - "sourceMap": true, - "forceConsistentCasingInFileNames": true, - "allowSyntheticDefaultImports": false, - "allowUnreachableCode": false, - "allowUnusedLabels": false, - "noFallthroughCasesInSwitch": true, - "noImplicitAny": true, - "noImplicitReturns": true, - "noImplicitThis": true, - "strictNullChecks": true, - "pretty": true, - "newLine": "LF", - "module": "es2015", - "target": "es2016", - "moduleResolution": "node", - "experimentalDecorators": true, - "jsx": "preserve", - "lib": [ - "dom", - "es2015", - "es2016" - ], - "types": [ - "prop-types", - "react", - "react-dom" - ] - }, - "exclude": [ - "dist", - "node_modules" - ] -} diff --git a/sdnr/wt/odlux/apps/demoApp/webpack.config.js b/sdnr/wt/odlux/apps/demoApp/webpack.config.js deleted file mode 100644 index 61dd8f6f6..000000000 --- a/sdnr/wt/odlux/apps/demoApp/webpack.config.js +++ /dev/null @@ -1,134 +0,0 @@ -/** - * Webpack 4 configuration file - * see https://webpack.js.org/configuration/ - * see https://webpack.js.org/configuration/dev-server/ - */ - -"use strict"; - -const path = require("path"); -const webpack = require("webpack"); -const CopyWebpackPlugin = require("copy-webpack-plugin"); -const TerserPlugin = require('terser-webpack-plugin'); - -// const __dirname = (path => path.replace(/^([a-z]\:)/, c => c.toUpperCase()))(process.__dirname()); - -module.exports = (env) => { - const distPath = path.resolve(__dirname, env === "release" ? "." : "../..", "dist"); - const frameworkPath = path.resolve(__dirname, env === "release" ? "../../framework" : "../..", "dist"); - return [{ - name: "App", - - mode: "none", //disable default behavior - - target: "web", - - context: path.resolve(__dirname, "src"), - - entry: { - demoApp: ["./plugin.tsx"] - }, - - devtool: env === "release" ? false : "source-map", - - resolve: { - extensions: [".ts", ".tsx", ".js", ".jsx"] - }, - - output: { - path: distPath, - filename: "[name].js", - library: "[name]", - libraryTarget: "umd2", - chunkFilename: "[name].js" - }, - module: { - rules: [{ - test: /\.tsx?$/, - exclude: /node_modules/, - use: [{ - loader: "babel-loader" - }, { - loader: "ts-loader" - }] - }, { - test: /\.jsx?$/, - exclude: /node_modules/, - use: [{ - loader: "babel-loader" - }] - }] - }, - optimization: { - noEmitOnErrors: true, - namedModules: env !== "release", - minimize: env === "release", - minimizer: env !== "release" ? [] : [new TerserPlugin({ - terserOptions: { - warnings: false, // false, true, "verbose" - compress: { - drop_console: true, - drop_debugger: true, - } - } - })], - }, - plugins: [ - new webpack.DllReferencePlugin({ - context: path.resolve(__dirname, "../../framework/src"), - manifest: require(path.resolve(frameworkPath, "vendor-manifest.json")), - sourceType: "umd2" - }), - new webpack.DllReferencePlugin({ - context: path.resolve(__dirname, "../../framework/src"), - manifest: require(path.resolve(frameworkPath, "app-manifest.json")), - sourceType: "umd2" - }), - ...(env === "release") ? [ - new webpack.DefinePlugin({ - "process.env": { - NODE_ENV: "'production'", - VERSION: JSON.stringify(require("./package.json").version) - } - }), - ] : [ - new webpack.DefinePlugin({ - "process.env": { - NODE_ENV: "'development'", - VERSION: JSON.stringify(require("./package.json").version) - } - }), - new CopyWebpackPlugin([{ - from: 'index.html', - to: distPath - }]), - ] - ], - - devServer: { - public: "http://localhost:3100", - contentBase: frameworkPath, - - compress: true, - headers: { - "Access-Control-Allow-Origin": "*" - }, - host: "0.0.0.0", - port: 3100, - disableHostCheck: true, - historyApiFallback: true, - inline: true, - hot: false, - quiet: false, - stats: { - colors: true - }, - proxy: { - "/api": { - target: "http://localhost:3001", - secure: false - } - } - } - }]; -} -- cgit 1.2.3-korg