diff --git a/MAINTAINERS.md b/MAINTAINERS.md new file mode 100644 index 0000000..4014a04 --- /dev/null +++ b/MAINTAINERS.md @@ -0,0 +1,6 @@ +Sven Müller (https://github.com/wicked539) +Bastian Dupps (https://github.com/dupps) +David Gonzales-Casin(https://github.com/Gonzo17) +Rudi Forsch(https://github.com/rudifordm) +Arnold Franke (https://github.com/indyarni) +Erik Altmann diff --git a/pom.xml b/pom.xml index f0bd3dd..649c5e0 100644 --- a/pom.xml +++ b/pom.xml @@ -303,29 +303,6 @@ - - - - artifactory - https://artifactory.dm-drogeriemarkt.com/artifactory/repo - - - - - - artifactory - artifactory.dm-drogeriemarkt.com-releases - https://artifactory.dm-drogeriemarkt.com/artifactory/releases-kunde - - - snapshots - artifactory.dm-drogeriemarkt.com-snapshots - https://artifactory.dm-drogeriemarkt.com/artifactory/snapshots-kunde - - - - - diff --git a/src/main/javascript/app.js b/src/main/javascript/app.js index 2e70b1c..3f3aea3 100644 --- a/src/main/javascript/app.js +++ b/src/main/javascript/app.js @@ -3,7 +3,7 @@ import mime from 'rest/interceptor/mime'; import rest from 'rest'; import ReactDOM from 'react-dom'; import React from 'react'; -import { Provider } from 'react-redux'; +import {Provider} from 'react-redux'; import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider'; import injectTapEventPlugin from 'react-tap-event-plugin'; import MicroserviceFilterBox from './components/microserviceFilterbox'; @@ -13,7 +13,7 @@ import AddEditDialog from './components/addEditDialog'; import MicroserviceDeleteServiceDialog from './components/microserviceDeleteServiceDialog'; import LoginDialog from './components/loginDialog'; import store from './stores/microserviceStore'; -import { getRequiredPropertyNames } from './shared/requiredPropertyUtil'; +import {getRequiredPropertyNames} from './shared/requiredPropertyUtil'; // see http://www.material-ui.com/#/get-started/installation injectTapEventPlugin(); @@ -23,19 +23,19 @@ class App extends React.Component { componentDidMount() { let client = rest.wrap(mime).wrap(errorCode); - client({ path: '/selavi/services/stages' }).then(response => { + client({path: '/selavi/services/stages'}).then(response => { store.dispatch({ type: 'FETCH_AVAILABLE_STAGES_SUCCESS', response: response }); - client({ path: '/selavi/services/' + store.getState().stage }).then(response => { + client({path: '/selavi/services/' + store.getState().stage}).then(response => { store.dispatch({ type: 'FETCH_MICROSERVICES_SUCCESS', response: response }); }); }); - client({ path: '/selavi/user' }).then(response => { + client({path: '/selavi/user'}).then(response => { store.dispatch({ type: 'LOGIN_SUCCESS', loggedInUser: response.entity @@ -45,15 +45,15 @@ class App extends React.Component { render() { const serviceBusinessInputFields = { - "id": { label: "Service ID *", hint: "eg. \"ZOE\"", required: true }, - "label": { label: "Label *", hint: "eg. \"ZOE\"", required: true }, + "id": {label: "Service ID *", hint: "eg. \"ZOE\"", required: true}, + "label": {label: "Label *", hint: "eg. \"ZOE\"", required: true}, "fdOwner": { label: "Contact Person *", hint: "eg. \"Altmann, Erik\"", required: true, searchEndpoint: "/selavi/person/search" }, - "tags": { label: "Tags", hint: "eg. \"dm-pos-belege, produktdaten\"", required: false }, + "tags": {label: "Tags", hint: "eg. \"dm-pos-belege, produktdaten\"", required: false}, "description": { label: "Description *", hint: "eg. \"ZKDB Online Echtzeitf\u00e4hig\"", @@ -63,34 +63,34 @@ class App extends React.Component { }; const serviceTechInputFields = { - "microserviceUrl": { label: "URL", hint: "eg. \"https://zoe.dm.de\"", required: false }, - "ipAddress": { label: "IP address(es)", hint: "eg. \"172.23.68.213\"", required: false }, - "networkZone": { label: "Network zone", hint: "eg. \"LAN\"", required: false }, - "external": { type: "toggle", label: "External service (eg., not a microservice)" } + "microserviceUrl": {label: "URL", hint: "eg. \"https://example.organization.de\"", required: false}, + "ipAddress": {label: "IP address(es)", hint: "eg. \"172.23.68.213\"", required: false}, + "networkZone": {label: "Network zone", hint: "eg. \"LAN\"", required: false}, + "external": {type: "toggle", label: "External service (eg., not a microservice)"} }; const serviceDocumentationInputFields = { "documentationLink": { label: "Link to documentation *", - hint: "eg. \"https://wiki.dm.de/ZOE\"", + hint: "eg. \"https://wiki.example.de/ZOE\"", required: true, isLink: true }, "buildMonitorLink": { label: "Link to Build Monitor", - hint: "eg. \"https://zoe-jenkins.dm.de\"", + hint: "eg. \"https://example-jenkins.organization.de\"", required: false, isLink: true }, "monitoringLink": { label: "Link to Monitoring", - hint: "eg. \"https://elk-kibana.dm.de\"", + hint: "eg. \"https://kibana.organization.de\"", required: false, isLink: true }, "bitbucketUrl": { label: "Bitbucket URL *", - hint: "eg. \"https://stash.dm.de/projects/ZOE/repos/zoe\"", + hint: "eg. \"https://stash.example.de/projects/ZOE/repos/zoe\"", required: true, isLink: true } @@ -98,54 +98,54 @@ class App extends React.Component { const serviceInputTabs = [ - { label: "Business", inputFields: serviceBusinessInputFields }, - { label: "Technical", inputFields: serviceTechInputFields }, - { label: "Documentation", inputFields: serviceDocumentationInputFields } + {label: "Business", inputFields: serviceBusinessInputFields}, + {label: "Technical", inputFields: serviceTechInputFields}, + {label: "Documentation", inputFields: serviceDocumentationInputFields} ]; const serviceRequiredProperties = getRequiredPropertyNames(serviceInputTabs); const relationBasicFields = { - "target": { label: "Consumed service", required: true, disabled: true }, - "type": { label: "Type of relation", hint: "eg. \"REST\", \"SOAP\"", required: false } + "target": {label: "Consumed service", required: true, disabled: true}, + "type": {label: "Type of relation", hint: "eg. \"REST\", \"SOAP\"", required: false} }; const relationInputTabs = [ - { label: "Basic", inputFields: relationBasicFields } + {label: "Basic", inputFields: relationBasicFields} ]; return ( -
-
- -
-
- -
-
- - - - - -
-
+
+
+ +
+
+ +
+
+ + + + + +
+
) } } ReactDOM.render( - - - - - , - document.getElementById('react') + + + + + , + document.getElementById('react') ); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 1800ec1..76d87c3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -45,7 +45,7 @@ selavi.property.blacklist=instanceId,hostName,app,ipAddr,status,overriddenstatus # only for development usage eureka.instance.metadata-map.ignoredCommitters=username:password eureka.instance.metadata-map.bitbucketUrl=https://example.com/rest/api/1.0/projects/MIC/repos/selavi -eureka.instance.metadata-map.fdOwner=Erik Altmann +eureka.instance.metadata-map.fdOwner=Owner McOwnface eureka.instance.metadata-map.tags=Microservice Overview eureka.instance.metadata-map.description=Dient als \U00fcbersicht aller verfügbaren Microservices eureka.instance.metadata-map.microserviceUrl=https://example.com/ diff --git a/src/test/javascript/components/addEditDialog.spec.js b/src/test/javascript/components/addEditDialog.spec.js index d876deb..7bd99e6 100644 --- a/src/test/javascript/components/addEditDialog.spec.js +++ b/src/test/javascript/components/addEditDialog.spec.js @@ -333,7 +333,7 @@ describe('', function () { inputFields: { "id": { label: "Service ID *", hint: "eg. \"ZOE\"", required: true }, "label": { label: "Label *", hint: "eg. \"ZOE\"", required: true }, - "fdOwner": { label: "Filiadata-Owner *", required: true, searchEndpoint: "/selavi/person/search" } + "fdOwner": { label: "Owner *", required: true, searchEndpoint: "/selavi/person/search" } } }); @@ -350,7 +350,7 @@ describe('', function () { inputFields: { "id": { label: "Service ID *", hint: "eg. \"ZOE\"", required: true }, "label": { label: "Label *", hint: "eg. \"ZOE\"", required: true }, - "fdOwner": { label: "Filiadata-Owner *", required: true, searchEndpoint: "/selavi/person/search" } + "fdOwner": { label: "Owner *", required: true, searchEndpoint: "/selavi/person/search" } } }); diff --git a/src/test/javascript/shared/requiredPropertyUtil.spec.js b/src/test/javascript/shared/requiredPropertyUtil.spec.js index 0d9c4de..c38b9f5 100644 --- a/src/test/javascript/shared/requiredPropertyUtil.spec.js +++ b/src/test/javascript/shared/requiredPropertyUtil.spec.js @@ -1,23 +1,20 @@ import chai from 'chai'; -import { - getRequiredPropertyNames, - hasAllRequiredProperties -} from '../../../main/javascript/shared/requiredPropertyUtil'; +import {getRequiredPropertyNames, hasAllRequiredProperties} from '../../../main/javascript/shared/requiredPropertyUtil'; describe('requiredPropertyUtil', function () { describe('getRequiredPropertyNames', function () { it('returns array of required property names', function () { const serviceBusinessInputFields = { - "id": { label: "Service ID *", hint: "eg. \"ZOE\"", required: true }, - "label": { label: "Label *", hint: "eg. \"ZOE\"", required: true }, + "id": {label: "Service ID *", hint: "eg. \"ZOE\"", required: true}, + "label": {label: "Label *", hint: "eg. \"ZOE\"", required: true}, "fdOwner": { label: "Contact Person *", hint: "eg. \"Altmann, Erik\"", required: true, searchEndpoint: "/selavi/person/search" }, - "tags": { label: "Tags", hint: "eg. \"dm-pos-belege, produktdaten\"", required: false }, + "tags": {label: "Tags", hint: "eg. \"dm-pos-belege, produktdaten\"", required: false}, "description": { label: "Description", hint: "eg. \"ZKDB Online Echtzeitf\u00e4hig\"", @@ -27,34 +24,34 @@ describe('requiredPropertyUtil', function () { }; const serviceTechInputFields = { - "microserviceUrl": { label: "URL", hint: "eg. \"https://zoe.dm.de\"", required: false }, - "ipAddress": { label: "IP address(es)", hint: "eg. \"172.23.68.213\"", required: false }, - "networkZone": { label: "Network zone", hint: "eg. \"LAN\"", required: false }, - "external": { type: "toggle", label: "External service (eg., not a microservice)" } + "microserviceUrl": {label: "URL", hint: "eg. \"https://zoe.organization.de\"", required: false}, + "ipAddress": {label: "IP address(es)", hint: "eg. \"172.23.68.213\"", required: false}, + "networkZone": {label: "Network zone", hint: "eg. \"LAN\"", required: false}, + "external": {type: "toggle", label: "External service (eg., not a microservice)"} }; const serviceDocumentationInputFields = { "documentationLink": { label: "Link to documentation", - hint: "eg. \"https://wiki.dm.de/ZOE\"", + hint: "eg. \"https://wiki.organization.de/ZOE\"", required: false, isLink: true }, "buildMonitorLink": { label: "Link to Build Monitor", - hint: "eg. \"https://zoe-jenkins.dm.de\"", + hint: "eg. \"https://zoe-jenkins.organization.de\"", required: false, isLink: true }, "monitoringLink": { label: "Link to Monitoring", - hint: "eg. \"https://elk-kibana.dm.de\"", + hint: "eg. \"https://elk-kibana.organization.de\"", required: false, isLink: true }, "bitbucketUrl": { label: "Bitbucket URL", - hint: "eg. \"https://stash.dm.de/projects/ZOE/repos/zoe\"", + hint: "eg. \"https://stash.organization.de/projects/ZOE/repos/zoe\"", required: false, isLink: true } @@ -62,9 +59,9 @@ describe('requiredPropertyUtil', function () { const serviceInputTabs = [ - { label: "Business", inputFields: serviceBusinessInputFields }, - { label: "Technical", inputFields: serviceTechInputFields }, - { label: "Documentation", inputFields: serviceDocumentationInputFields } + {label: "Business", inputFields: serviceBusinessInputFields}, + {label: "Technical", inputFields: serviceTechInputFields}, + {label: "Documentation", inputFields: serviceDocumentationInputFields} ]; const result = getRequiredPropertyNames(serviceInputTabs); @@ -80,7 +77,7 @@ describe('requiredPropertyUtil', function () { "id": "selavi", "label": "selavi", "tag": "zoe", - "consumes": [{ "target": "GLUECKSKIND-APP", "type": "REST" }], + "consumes": [{"target": "GLUECKSKIND-APP", "type": "REST"}], "fdOwner": "Erika Esteban Cardoso" }; @@ -97,7 +94,7 @@ describe('requiredPropertyUtil', function () { "id": "selavi", "label": "selavi", "tag": "zoe", - "consumes": [{ "target": "GLUECKSKIND-APP", "type": "REST" }], + "consumes": [{"target": "GLUECKSKIND-APP", "type": "REST"}], "fdOwner": "Erika Esteban Cardoso" };