Merge branch 'dev'
Change-Id: Id8da3f16abc420815b949bfb04ebf25bdad67a4a
diff --git a/README.md b/README.md
index b98664f..773f612 100644
--- a/README.md
+++ b/README.md
@@ -1,37 +1,59 @@
-## minimum requirements
+## Documentation
+
+Before you start, please take a look at the [Getting Started Guide](https://git.eclipse.org/c/mdmbl/org.eclipse.mdm.nucleus.git/plain/doc/GettingStarted_mdmbl.pdf) which can also be found in the [Download area](https://projects.eclipse.org/projects/technology.mdmbl/downloads) of the project and in the `docs` directory relative to this README.md
+
+## Minimum requirements
* JDK 1.8.0_45
-* Gradle 4.10.2
-## build dependencies
-Before you can install and build the application, you have to checkout and install: (gradlew install)
-* org.eclipse.mdm.api.base
-* org.eclipse.mdm.api.default
-* org.eclipse.mdm.api.odsadapter
+> This project uses a Gradle Wrapper
-## build, deploy and configure the application
+## Build dependencies
+Before you can build and deploy the application, you have to checkout the following repositories in the same root directory as the current project
+* `git clone https://git.eclipse.org/r/mdmbl/org.eclipse.mdm.api.base.git`
+* `git clone https://git.eclipse.org/r/mdmbl/org.eclipse.mdm.api.default.git`
+* `git clone https://git.eclipse.org/r/mdmbl/org.eclipse.mdm.api.odsadapter.git`
-Please see the installation / setup docu: org.eclipse.mdm.nucleus/doc
+You **MUST** have the following directory structure afterwards
-1. **edit** the **org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/property.service.ts** and set the variables host, port and prefix for your deployment
-(This properties are used to create the rest URLs to communicate with the backend)
-Furthermore, specify the **contextPath** in **org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/webpack.config.js**
-2. **build** the application (gradlew install)
-The command **gradlew install** at **org.eclipse.mdm.nucleus** creates a ZIP archive named **mdm_web-${version}.zip** at
-**/org.eclipse.mdm.nucleus/build/distributions**
-The ZIP archive contains the backend **org.eclipse.mdm.nucleus-${version}.war** and the configurations **/configuration**
-3. **check** that the database for the preference service is running or else start it with **asadmin start-database**.
-4. **deploy** the backend ( **org.eclipse.mdm.nucleuss-${version}.war** file) at your application server. Make sure to deploy the war file with application name **org.eclipse.mdm.nucleus**, otherwise the LoginRealmModule is not able to lookup the ConnectorService EJB. Additionally in the following examples, we assume that the context root is also set to **org.eclipse.mdm.nucleus**.
-When deploying on command line you can use: **asadmin deploy --name org.eclipse.mdm.nucleus "/path/to/org.eclipse.mdm.nucleus-${version}.war"**
-5. **copy the content** of the extracted **/configuration** folder to **GLASSFISH_ROOT/glassfish/domains/domain1/config**.
- There is also a system property **org.eclipse.mdm.configPath**, that can be used to redefine the location of the folder to another location.
-6. **edit** the **org.eclipse.mdm.connector/service.xml** file to configure the data sources
-7. **configure** a **LoginModule** with name **MDMRealm** (See section **Configure LoginModule** for details)
-8. **restart** the application server
-9. **visit** the main page of the client to make sure everything works fine. The main page of the client should be available under
-http://SERVER:PORT/{APPLICATIONROOT}
-_(eg: http://localhost:8080/org.eclipse.mdm.nucleus_)
+```
+.
+├── org.eclipse.mdm.api.base
+├── org.eclipse.mdm.api.default
+├── org.eclipse.mdm.api.odsadapter
+└── org.eclipse.mdm.nucleus
+```
-## configure LoginModule
+Now you can use `gradlew install` in the `org.eclipse.mdm.nucleus` directory, but you should configure the application first.
+
+## Build, deploy and configure the application
+
+1. Edit the `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/core/property.service.ts` and set the `data_host` variable according to your deployment
+ (This property will be used to create the REST URLs to communicate with the backend).
+
+2. Build the application with `gradlew install`.
+ The command `gradlew install` executed at `org.eclipse.mdm.nucleus` creates a ZIP archive named `build/distributions/openMDM_application-${version}.zip` at `org.eclipse.mdm.nucleus/build/distributions`
+ The ZIP archive contains the backend `org.eclipse.mdm.nucleus-${version}.war` and the configuration files in the `configuration` directory
+
+3. Check that the database for the preference service is running, otherwise start it with `asadmin start-database` as described in the Getting Started Guide.
+
+4. Deploy the WAR file `org.eclipse.mdm.nucleuss-${version}.war` on your application server. Make sure to deploy the WAR file with application name `org.eclipse.mdm.nucleus`, otherwise the `LoginRealmModule` is not able to lookup the `ConnectorService` EJB.
+ Additionally in the following examples, we assume that the context root is also set to `org.eclipse.mdm.nucleus`.
+ When deploying from command line you can use `asadmin deploy --name org.eclipse.mdm.nucleus /path/to/org.eclipse.mdm.nucleus-${version}.war`
+
+5. Copy the content of the extracted `configuration` folder to `GLASSFISH_ROOT/glassfish/domains/domain1/config`.
+ There is also a system property `org.eclipse.mdm.configPath`, which can be used to redefine the location of the folder to another location.
+
+6. Edit the `org.eclipse.mdm.connector/service.xml` file to configure the data sources
+
+7. Configure a `LoginModule` with name `MDMRealm` (See section **Configure LoginModule** for details)
+
+8. Restart the application server
+
+9. Visit the main page of the client to make sure everything works fine.
+ The main page of the client should be available under `http://SERVER:PORT/{APPLICATIONROOT}` (eg: http://localhost:8080/org.eclipse.mdm.nucleus)
+
+## Configure LoginModule
+
MDM 5 backend implements the delegated approach to roles and permissions, wherein the data sources (ASAM ODS server, PAK cloud)
themselves can implement their own security scheme (which they already have) and then delegates the appropriate
user data to the backends.
@@ -42,32 +64,38 @@
In the case of PAK Cloud this is done by passing the user name along with a http header `X-Remote-User` which is then
used by PAK Cloud to establish the users roles (from an internal database or an external authentication provider).
-Before the user is 'logged in on behalf' he is authenticated by a LoginModule within the Glassfish application server.
+Before the user is 'logged in on behalf' he is authenticated by a `LoginModule` within the Glassfish application server.
There are different implementations available (e.g. LDAP, Certificate, JDBC, ...). To keep this guide simple, we will setup
-a FileRealm, which stores the user information in a flat file:
+a `FileRealm`, which stores the user information in a flat file.
-The following command will create a FileRealm with name `MDMRealm` that stores the users in a file called `mdm-keyfile`:
-
+The following command will create a `FileRealm` with name `MDMRealm` that stores the users in a file called `mdm-keyfile`
```
-asadmin create-auth-realm --classname com.sun.enterprise.security.auth.realm.file.FileRealm --property file=${com.sun.aas.instanceRoot}/config/mdm-keyfile:jaas-context=MDMRealm:assign-groups=MDM MDMRealm
+asadmin create-auth-realm --classname com.sun.enterprise.security.auth.realm.file.FileRealm --property file=${com.sun.aas.instanceRoot}/config/mdm-keyfile:jaas-context=MDMRealm:assign-groups=Guest MDMRealm
```
-To be able to login you need to explicitly add users to the `MDMRealm`:
+To be able to login you need to explicitly add users to the `MDMRealm`.
+Here we add the user `MdmUser`
+```
+asadmin create-file-user --authrealmname MDMRealm --groups Admin:DescriptiveDataAuthor:Guest MdmUser
+```
-```
-asadmin create-file-user --authrealmname MDMRealm
-```
+Currently three roles are supported by openMDM, adapt the users according to your needs
+* **Admin**: Administrator role allowed to access the Administration section in the web application
+* **DescriptiveDataAuthor**: Users allowed to edit context data
+* **Guest**: Default application users allowed to browse and read measurement data
+
+Keep in mind that the roles are mainly used to enable/disable certain actions in the web application.
+Authorization in openMDM is still done via the delegation approach, e.g. the adapters are responsible for handling authorization on data.
Next you need to add the following snippet to your `login.conf` in `${com.sun.aas.instanceRoot}/config/`
-
```
MDMRealm {
com.sun.enterprise.security.auth.login.FileLoginModule required;
};
```
-As a last step you have to provide the credentials of the technical user in adapter configuration in `service.xml`.
-For the ODS adapter you you have to specify the parameters `user` and `password` of the technical user. For example:
+As a last step you have to provide the credentials of the technical user in adapter configuration in `service.xml`.
+For the ODS adapter you have to specify the parameters `user` and `password` of the technical user. For example
```
<service entityManagerFactoryClass="org.eclipse.mdm.api.odsadapter.ODSContextFactory">
...
@@ -77,648 +105,500 @@
</service>
```
-Make sure to restart Glassfish after this change.
+Make sure to restart Glassfish afterwards.
-### Remove MDMLoginRealm from previous versions:
-In versions 5.0.0M1, 0.10 and older the configuration of a custom login realm was neccessary. If you configured your glassfish instance
-for one of these version, you can remove the old configuration options and artifact, as they are no longer needed:
+### Remove MDMLoginRealm from previous versions
-* **delete** the jar file **org.eclipse.mdm.realm.login.glassfish-VERSION.jar** from **GLASSFISH_ROOT/glassfish/domains/domain1/lib**
-
-* **open** the Glassfish login **configuration file** at **GLASSFISH_ROOT/glassfish/domains/domain1/config/login.conf**
-
-* **delete** custom MDM realm module entry to this config file
-
-```
-MDMLoginRealm {
- org.eclipse.mdm.realm.login.glassfish.LoginRealmModule required;
-};
-```
+In versions 5.0.0M1, 0.10 and older the configuration of a custom login realm was necessary. If you configured your Glassfish server instance
+for one of these versions, you can remove the old configuration options and artifact, as they are no longer needed.
-* **remove** the MDMLoginRealm by executing the following command or by deleting it in the Glassfish web console:
-
-```
-asadmin delete-auth-realm MDMLoginRealm
-```
+#### Steps to delete the old configuration and artifacts
+* Delete the JAR file `org.eclipse.mdm.realm.login.glassfish-VERSION.jar` from `GLASSFISH_ROOT/glassfish/domains/domain1/lib`
+* Open the Glassfish login **configuration file** at `GLASSFISH_ROOT/glassfish/domains/domain1/config/login.conf`
+* Delete custom MDM realm module entry to this config file
+ ```
+ MDMLoginRealm {
+ org.eclipse.mdm.realm.login.glassfish.LoginRealmModule required;
+ };
+ ```
+* Remove the `MDMLoginRealm` by executing `asadmin delete-auth-realm MDMLoginRealm` or by deleting it in the Glassfish web console
-## configure logging
+## Configure logging
-MDM 5 uses SLF4J and logback for logging. The default configuration file can be found at **org.eclipse.mdm.nucleus/src/main/resources/logback.xml**. It logs INFO level messages to **mdm5.log** in the **logs** folder of the Glassfish domain. If you want to customize logging, you can either edit the file within the war file or preferably provide your own logging configuration via system parameter in the JVM settings in Glassfish: **-Dlogback.configurationFile=/path/to/config.xml**
+MDM 5 uses SLF4J and Logback for logging. The default configuration file can be found at `org.eclipse.mdm.nucleus/src/main/resources/logback.xml`.
+It logs INFO level messages to `mdm5.log` in the **logs** folder of the Glassfish domain.
+If you want to customize logging, you can either edit the file within the WAR file or preferably provide your own logging configuration via system parameter in the JVM settings in Glassfish `-Dlogback.configurationFile=/path/to/config.xml`
-## available rest URLs
+## Available REST URLs
Please use the generated OpenAPI Specification, which is generated at build time.
The OpenAPI Specification is available in `org.eclipse.mdm.nucleus/build/openapi/openapi.json` or at runtime at `http://{SERVER}:{PORT}/{APPLICATIONROOT}/openapi.json`.
-Futhermore a Swagger UI is available under `http://{SERVER}:{PORT}/{APPLICATIONROOT}/swagger.html`.
+Furthermore a Swagger UI is available at `http://{SERVER}:{PORT}/{APPLICATIONROOT}/swagger.html`
-The following list of URLs will be removed in future releases.
+### Structure of the URLs
-**Business Object: Environment**
+* `SERVER` the hostname of the Glassfish server
+* `PORT` the port of the Glassfish server
+* `APPLICATIONROOT` is the context root under which MDM is deployed
+* `SOURCENAME` is the source name the underlying data source
-* http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments
-* http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}
-* http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}/localizations
-* _example: http://localhost:8080/org.eclipse.mdm.nucleus/mdm/environments_
+#### Environment
-Since all other calls operate on a specific source all subsequent calls share the common prefix
-`http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}/`, which we will be our root for the description of the next calls.
-Strings enclosed in curly brackets are meant to be replaced by appropriate values. The following parameters are recurring throughout the different URLs:
+* `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments`
+* `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}`
+* `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}/localizations`
-* APPLICATIONROOT is the context root under which MDM is deployed
-* SOURCENAME is the source name the underlying data source
-* CONTEXTTYPE is one of [unitundertest, testsequence, testequipment]
-* DATATYPE is one of [STRING, STRING_SEQUENCE, DATE, DATE_SEQUENCE, BOOLEAN, BOOLEAN_SEQUENCE, BYTE, BYTE_SEQUENCE, SHORT, SHORT_SEQUENCE, INTEGER, INTEGER_SEQUENCE, LONG, LONG_SEQUENCE, FLOAT, FLOAT_SEQUENCE, DOUBLE, DOUBLE_SEQUENCE, BYTE_STREAM, BYTE_STREAM_SEQUENCE, FLOAT_COMPLEX, FLOAT_COMPLEX_SEQUENCE, DOUBLE_COMPLEX, DOUBLE_COMPLEX_SEQUENCE, FILE_LINK, FILE_LINK_SEQUENCE]
-* FILTERSTRING is a String defining a filter. For example `Test.Name eq "t*"` filters for all tests which names begin with `t`. Strings should be quoted with `"`. `"` characters within strings have to be escaped with a backslash. For backward compatibility `'` is also allowed to quote strings, but may be blocked in URLs in some environments, thus `"` should be preferred.
-* REMOTE_PATH is the remote path of a file link as it is returned in the attributes of type FILE_LINK and FILE_LINK_SEQUENCE. Make sure to properly url escape the value of the remote path. Especially slashes have to be escaped with `%2F`.
+#### Business objects
+The following parameters are recurring throughout the different URLs
-**Business Object: Test**
+* `ID` the identifier of the business object
-* GET: /tests
-* POST: /tests
-* GET: /tests?filter={FILTERSTRING}
-* GET: /tests/searchattributes
-* GET: /tests/localizations
-* GET: /tests/{TESTID}
-* PUT: /tests/{TESTID}
-* DELETE: /tests/{TESTID}
-* GET: /tests/{TESTID}/files/{REMOTE_PATH}
+* `CONTEXTTYPE` is one of
+ * `unitundertest`
+ * `testsequence`
+ * `testequipment`
+
+* `DATATYPE` is one of
+ * `STRING`
+ * `STRING_SEQUENCE`
+ * `DATE, DATE_SEQUENCE`
+ * `BOOLEAN`
+ * `BOOLEAN_SEQUENCE`
+ * `BYTE`
+ * `BYTE_SEQUENCE`
+ * `SHORT`
+ * `SHORT_SEQUENCE`
+ * `INTEGER`
+ * `INTEGER_SEQUENCE`
+ * `LONG`
+ * `LONG_SEQUENCE`
+ * `FLOAT`
+ * `FLOAT_SEQUENCE`
+ * `DOUBLE`
+ * `DOUBLE_SEQUENCE`
+ * `BYTE_STREAM`
+ * `BYTE_STREAM_SEQUENCE`
+ * `FLOAT_COMPLEX`
+ * `FLOAT_COMPLEX_SEQUENCE`
+ * `DOUBLE_COMPLEX`
+ * `DOUBLE_COMPLEX_SEQUENCE`
+ * `FILE_LINK`
+ * `FILE_LINK_SEQUENCE`
+
+* `FILTERSTRING` is a String defining a filter. For example `Test.Name eq "t*"` filters for all tests which names begin with `t`.
+ Strings should be quoted with `"`. `"` characters within strings have to be escaped with a backslash. For backward compatibility `'` is also allowed to quote strings, but may be blocked in URLs in some environments, thus `"` should be preferred.
+
+* `REMOTE_PATH` is the remote path of a file link as it is returned in the attributes of type `FILE_LINK` and `FILE_LINK_SEQUENCE`
+ Make sure to properly URL escape the value of the remote path. Especially slashes have to be escaped with `%2F`.
+
+##### Examples
-**Business Object: TestStep**
+Most of the Business objects support the following calls (examples for **TestStep**)
-* GET: /teststeps
-* POST: /teststeps
-* GET: /teststeps?filter=FILTERSTRING
-* GET: /teststeps/searchattributes
-* GET: /teststeps/localizations
-* GET: /teststeps/{TESTSTEPID}
-* PUT: /teststeps/{TESTSTEPID}
-* DELETE: /teststeps/{TESTSTEPID}
-* GET: /teststeps/{TESTSTEPID}/files/{REMOTE_PATH}
-* GET: /teststeps/{TESTSTEPID}/contexts
-* PUT: /teststeps/{TESTSTEPID}/contexts
-* GET: /teststeps/{TESTSTEPID}/contexts/{CONTEXTTYPE}
-* PUT: /teststeps/{TESTSTEPID}/contexts/{CONTEXTTYPE}
-* GET: /teststeps/{TESTSTEPID}/contexts/testequipment/sensors
+* `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}/teststeps?filter={FILTERSTRING}`
+* `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}/teststeps/searchattributes`
+* `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}/teststeps/localizations`
+* `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}/teststeps/{ID}`
+* `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}/teststeps/{ID}/contexts/{CONTEXTTYPE}`
-**Business Object: Measurement**
+For **TestStep** and **Measurement** it is also possible to receive files
-* GET: /measurements
-* POST: /measurements
-* GET: /measurements?filter={FILTERSTRING}
-* GET: /measurements/searchattributes
-* GET: /measurements/localizations
-* GET: /measurements/{MEASUREMENTID}
-* PUT: /measurements/{MEASUREMENTID}
-* DELETE: /measurements/{MEASUREMENTID}
-* GET: /measurements/{MEASUREMENTID}/files/{REMOTE_PATH}
-* GET: /measurements/{MEASUREMENTID}/contexts
-* GET: /measurements/{MEASUREMENTID}/contexts/{CONTEXTTYPE}
-* PUT: /measurements/{MEASUREMENTID}/contexts/{CONTEXTTYPE}
-* GET: /measurements/{MEASUREMENTID}/contexts/testequipment/sensors
+* `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}/teststeps/{ID}/files/{REMOTE_PATH}`
-**Business Object: ChannelGroup**
-* GET: /channelgroups
-* GET: /channelgroups/localizations
-* GET: /channelgroups/{CHANNELGROUPID}
+#### Query endpoint
-**Business Object: Channel**
+* `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/query`
+ Example: `curl -POST -H "Content-Type: application/json" -d '{"resultType": "test", "columns": ["Test.Name", "TestStep.Name"], "filters": { "sourceName": "SOURCENAME", "filter": "Test.Id gt 1", "searchString": ""}}'http://sa:sa@localhost:8080/org.eclipse.mdm.nucleus/mdm/query`
+
+* `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/suggestions`
+ Example: `curl -POST -H "Content-Type: application/json" -d '{"sourceNames": ["SOURCENAME"], "type": "Test", "attrName": "Name"}' http://sa:sa@localhost:8080/org.eclipse.mdm.nucleus/mdm/suggestions`
-* GET: /channels
-* GET: /channels/localizations
-* GET: /channels/{CHANNELID}
+#### ATFX Import
-**Business Object: Project**
+POST: `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}/import`
-* GET: /projects
-* POST: /projects
-* GET: /projects?filter={FILTERSTRING}
-* GET: /projects/searchattributes
-* GET: /projects/localizations
-* GET: /projects/{PROJECTID}
-* PUT: /projects/{PROJECTID}
-* DELETE: /projects/{PROJECTID}
+Imports an ATFX file into the specified environment. The ATFX file must conform to the MDM 5 data model.
-**Business Object: Pool**
+> TODO Templates
-* GET: /pools
-* POST: /pools
-* GET: /pools?filter={FILTERSTRING}
-* GET: /pools/searchattributes
-* GET: /pools/localizations
-* GET: /pools/{POOLID}
-* PUT: /pools/{POOLID}
-* DELETE: /pools/{POOLID}
+Three content types are accepted
+* `application/xml`: The ATFX file is sent in the body of the POST request.
-**Business Object: ValueList**
+* `multipart/form-data`: The ATFX file and its binary files are provided as multipart form data. The field name represents the original file name and the field value the contents of the file.
+ The ATFX file is detected by its file extension 'atfx' or the media type 'application/xml'. Only one ATFX file can be sent at a time.
-* GET: /valuelists
-* POST: /valuelists (JSON: { "Name" : "testValueList" })
-* GET: /valuelists/{VALUELISTID}
-* PUT: /valuelists/{VALUELISTID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /valuelists/{VALUELISTID}
-* GET: /valuelists/searchattributes
-* GET: /valuelists/localizations
+* `application/zip`: The ATFX file and its component files are provided as a zip file. The ATFX file is detected by its file extension 'atfx'. Only one ATFX file can be included in the zip file.
-**Business Object: ValueListValue**
-
-* GET: /valuelists/{VALUELISTID}/values
-* POST: /valuelists/{VALUELISTID}/values (JSON: { "Name" : "testValueListValue" })
-* GET: /valuelists/{VALUELISTID}/values/{VALUELISTVALUEID}
-* PUT: /valuelists/{VALUELISTID}/values/{VALUELISTVALUEID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /valuelists/{VALUELISTID}/values/{VALUELISTVALUEID}
-* GET: /valuelists/{VALUELISTID}/values/searchattributes
-* GET: /valuelists/{VALUELISTID}/values/localizations
-
-**Business Object: PhysicalDimension**
-
-* GET: /physicaldimensions
-* POST: /physicaldimensions (JSON: { "Name" : "testPhysicalDimension" })
-* GET: /physicaldimensions/{PHYSICALDIMENSIONID}
-* PUT: /physicaldimensions/{PHYSICALDIMENSIONID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /physicaldimensions/{PHYSICALDIMENSIONID}
-* GET: /physicaldimensions/searchattributes
-* GET: /physicaldimensions/localizations
-
-**Business Object: Unit**
-
-* GET: /units
-* POST: /units (JSON: { "Name" : "testUnit", "PhysicalDimension" : "PHYSICALDIMENSIONID" })
-* GET: /units/{UNITID}
-* PUT: /units/{UNITID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /units/{UNITID}
-* GET: /units/searchattributes
-* GET: /units/localizations
-
-**Business Object: Quantity**
-
-* GET: /quantities
-* POST: /quantities (JSON: { "Name" : "testQuantity", "Unit" : "UNITID" })
-* GET: /quantities/{QUANTITYID}
-* PUT: /quantities/{QUANTITYID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /quantities/{QUANTITYID}
-* GET: /quantities/searchattributes
-* GET: /quantities/localizations
-
-**Business Object: CatalogComponent**
-
-* GET: /catcomps/{CONTEXTTYPE}
-* POST: /catcomps/{CONTEXTTYPE} (JSON: { "Name" : "testCatalogComponent" })
-* GET: /catcomps/{CONTEXTTYPE}/{CATALOGCOMPONENTID}
-* PUT: /catcomps/{CONTEXTTYPE}/{CATALOGCOMPONENTID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /catcomps/{CONTEXTTYPE}/{CATALOGCOMPONENTID}
-* GET: /catcomps/{CONTEXTTYPE}/searchattributes
-* GET: /catcomps/{CONTEXTTYPE}/localizations
-
-**Business Object: CatalogAttribute**
-
-* GET: /catcomps/{CONTEXTTYPE}/{CATALOGCOMPONENTID}/catattrs
-* POST: /catcomps/{CONTEXTTYPE}/{CATALOGCOMPONENTID}/catattrs (JSON: { "Name" : "testCatalogAttribute", "DataType" : "DATATYPE" })
-* GET: /catcomps/{CONTEXTTYPE}/{CATALOGCOMPONENTID}/catattrs/{CATALOGATTRIBUTEID}
-* PUT: /catcomps/{CONTEXTTYPE}/{CATALOGCOMPONENTID}/catattrs/{CATALOGATTRIBUTEID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /catcomps/{CONTEXTTYPE}/{CATALOGCOMPONENTID}/catattrs/{CATALOGATTRIBUTEID}
-* GET: /catcomps/{CONTEXTTYPE}/{CATALOGCOMPONENTID}/catattrs/searchattributes
-* GET: /catcomps/{CONTEXTTYPE}/{CATALOGCOMPONENTID}/catattrs/localizations
-
-**Business Object: CatalogSensor**
-
-* GET: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors
-* POST: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors (JSON: { "Name" : "testCatalogSensor" })
-* GET: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/{CATALOGSENSORID}
-* PUT: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/{CATALOGSENSORID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/{CATALOGSENSORID}
-* GET: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/searchattributes
-* GET: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/localizations
-
-**Business Object: CatalogSensorAttribute**
-
-* GET: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/{CATALOGSENSORID}/catsensorattrs
-* POST: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/{CATALOGSENSORID}/catsensorattrs (JSON: { "Name" : "testCatalogAttribute", "DataType" : "DATATYPE" })
-* GET: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/{CATALOGSENSORID}/catsensorattrs/{CATALOGATTRIBUTEID}
-* PUT: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/{CATALOGSENSORID}/catsensorattrs/{CATALOGATTRIBUTEID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/{CATALOGSENSORID}/catsensorattrs/{CATALOGATTRIBUTEID}
-* GET: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/{CATALOGSENSORID}/catsensorattrs/searchattributes
-* GET: /catcomps/testequipment/{CATALOGCOMPONENTID}/catsensors/{CATALOGSENSORID}/catsensorattrs/localizations
-
-**Business Object: TemplateRoot**
-
-* GET: /tplroots/{CONTEXTTYPE}
-* POST: /tplroots/{CONTEXTTYPE} (JSON: { "Name" : "testTemplateRoot" })
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}
-* PUT: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}
-* GET: /tplroots/{CONTEXTTYPE}/searchattributes
-* GET: /tplroots/{CONTEXTTYPE}/localizations
-
-**Business Object: TemplateComponent**
-
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps
-* POST: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps (JSON: { "Name" : "testTemplateComponent", "CatalogComponent" : "CATALOGCOMPONENTID" })
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}
-* PUT: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/searchattributes
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/localizations
-
-**Business Object: TemplateAttribute**
-
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplattrs
-* POST: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplattrs (JSON: { "Name" : "testCatalogAttribute" } (name must be identical with corresponding CatalogAttribute))
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplattrs/{TEMPLATEATTRIBUTEID}
-* PUT: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplattrs/{TEMPLATEATTRIBUTEID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplattrs/{TEMPLATEATTRIBUTEID}
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplattrs/searchattributes
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplattrs/localizations
-
-**Business Object: TemplateSensor**
-
-* GET: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors
-* POST: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors (JSON: { "Name" : "testTemplateSensor", "CatalogSensor" : "CATALOGSENSORID", "quantity" : "QUANTITYID" })
-* GET: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors/{TEMPLATESENSORID}
-* PUT: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors/{TEMPLATESENSORID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors/{TEMPLATESENSORID}
-* GET: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors/searchattributes
-* GET: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors/localizations
-
-**Business Object: TemplateSensorAttribute**
-
-* GET: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors/{TEMPLATESENSORID}/tplsensorattrs
-* GET: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors/{TEMPLATESENSORID}/tplsensorattrs/{TEMPLATEATTRIBUTEID}
-* PUT: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors/{TEMPLATESENSORID}/tplsensorattrs/{TEMPLATEATTRIBUTEID} (JSON: { "MimeType" : "myMimeType" })
-* GET: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors/{TEMPLATESENSORID}/tplsensorattrs/searchattributes
-* GET: /tplroots/testequipment/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplsensors/{TEMPLATESENSORID}/tplsensorattrs/localizations
-
-**Business Object: NestedTemplateComponent**
-
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps
-* POST: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps (JSON: { "Name" : "testNestedTemplateComponent", "CatalogComponent" : "CATALOGCOMPONENTID" })
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/{NESTEDTEMPLATECOMPONENTID}
-* PUT: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/{NESTEDTEMPLATECOMPONENTID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/{NESTEDTEMPLATECOMPONENTID}
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/searchattributes
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/localizations
-
-**Business Object: NestedTemplateAttribute**
-
-* CONTEXTTYPE is one of [unitundertest, testsequence, testequipment]
-
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/{NESTEDTEMPLATECOMPONENTID}/tplattrs
-* POST: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/{NESTEDTEMPLATECOMPONENTID}/tplattrs (JSON: { "Name" : "testCatalogAttribute" } (name must be identical with corresponding CatalogAttribute))
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/{NESTEDTEMPLATECOMPONENTID}/tplattrs/{NESTEDTEMPLATEATTRIBUTEID}
-* PUT: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/{NESTEDTEMPLATECOMPONENTID}/tplattrs/{NESTEDTEMPLATEATTRIBUTEID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/{NESTEDTEMPLATECOMPONENTID}/tplattrs/{NESTEDTEMPLATEATTRIBUTEID}
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/{NESTEDTEMPLATECOMPONENTID}/tplattrs/searchattributes
-* GET: /tplroots/{CONTEXTTYPE}/{TEMPLATEROOTID}/tplcomps/{TEMPLATECOMPONENTID}/tplcomps/{NESTEDTEMPLATECOMPONENTID}/tplattrs/localizations
-
-**Business Object: TemplateTest**
-
-* GET: /tpltests
-* POST: /tpltests (JSON: { "Name" : "testTemplateTest" })
-* GET: /tpltests/{TEMPLATETESTID}
-* PUT: /tpltests/{TEMPLATETESTID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /tpltests/{TEMPLATETESTID}
-* GET: /tpltests/searchattributes
-* GET: /tpltests/localizations
-
-**Business Object: TemplateTestStep**
-
-* GET: /tplteststeps
-* POST: /tplteststeps (JSON: { "Name" : "testTemplateTestStep" })
-* GET: /tplteststeps/{TEMPLATETESTSTEPID}
-* PUT: /tplteststeps/{TEMPLATETESTSTEPID} (JSON: { "MimeType" : "myMimeType" })
-* DELETE: /tplteststeps/{TEMPLATETESTSTEPID}
-* GET: /tplteststeps/searchattributes
-* GET: /tplteststeps/localizations
-
-**Business Object: TemplateTestStepUsage**
-
-* GET: /tpltests/{TEMPLATETESTID}/tplteststepusages
-* POST: /tpltests/{TEMPLATETESTID}/tplteststepusages (JSON: { "Name" : "testTemplateTestStepUsage", "TemplateTestStep" : "TEMPLATETESTSTEPID" })
-* GET: /tpltests/{TEMPLATETESTID}/tplteststepusages/{TEMPLATETESTSTEPUSAGEID}
-* DELETE: /tpltests/{TEMPLATETESTID}/tplteststepusages/{TEMPLATETESTSTEPUSAGEID}
-* GET: /tpltests/{TEMPLATETESTID}/tplteststepusages/searchattributes
-* GET: /tpltests/{TEMPLATETESTID}/tplteststepusages/localizations
-
-**Values endpoint**
-
-Values endpoint accepts `application/protobuf` and `application/json`. For larger amounts of data Protobuf should be preferred. The IDL-file for Protobuf is available in `org.eclipse.mdm.businessobjects/src/main/proto/mdm.proto`
-
-* POST: /values/read (Protobuf: in - ReadRequest, out - MeasuredValuesList)
-* POST: /values/write (Protobuf: in - WriteRequestList)
-* POST: /values/preview (Protobuf: in - PreviewRequest, out - PreviewValuesList)
-
-
-**Query endpoint**
-
-* http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/query
-
- _example:
-`curl -POST -H "Content-Type: application/json" -d '{"resultType": "test", "columns": ["Test.Name", "TestStep.Name"], "filters": { "sourceName": "SOURCENAME", "filter": "Test.Id gt 1", "searchString": ""}}'http://sa:sa@localhost:8080/org.eclipse.mdm.nucleus/mdm/query`
-* http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/suggestions
-
- _example: `curl -POST -H "Content-Type: application/json" -d '{"sourceNames": ["SOURCENAME"], "type": "Test", "attrName": "Name"}' http://sa:sa@localhost:8080/org.eclipse.mdm.nucleus/mdm/suggestions`
-
-**ATFX Import**
-
-POST: http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/environments/{SOURCENAME}/import
-
-Imports an ATFX file into the specified environment. The ATFX file must conform to the openMDM5 datamodel.
-
-TODO Templates
-
-Three content-types are accepted:
-- application/xml: The ATFX file is sent in the body of the POST request.
-- multipart/form-data: The ATFX file and its binary files are provided as multipart form data. The field name represents the original file name and the field value the contents of the file. The ATFX file is detected by its file extension 'atfx' or the media type 'application/xml'. Only one ATFX file can be sent at a time.
-- application/zip: The ATFX file and its component files are provided as a zip file. The ATFX file is detected by its file extension 'atfx'. Only one ATFX file can be included in the zip file.
-
-The POST request returns a JSON-Object with the following properties:
-- state: Status of the import. Either `OK` or `FAILED`.
-- message: Error message in case the import fails.
-- stacktrace: Stacktrace in case the import fails.
+The POST request returns a JSON-Object with the following properties
+* state: Status of the import. Either `OK` or `FAILED`.
+* message: Error message in case the import fails.
+* stacktrace: Stacktrace in case the import fails.
The returned HTTP status is either `200`, if the imported succeeded or `400`, if the import failed.
-**ATFX Export**
+#### ATFX Export
-POST: http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/export
+POST: `http://{SERVER}:{PORT}/{APPLICATIONROOT}/mdm/export`
Accepts a shopping basket XML file and exports the contained elements into an ATFX file.
Currently it is only supported to export objects from one environment.
-Returned content types in response:
-- application/xml: The response body contains the exported ATFX file
-- application/zip: The response contains a zip file with the exported ATFX file and accompanying component files.
+Returned content types in response:
+* `application/xml`: The response body contains the exported ATFX file
-###Example: file download
+* `application/zip`: The response contains a zip file with the exported ATFX file and accompanying component files.
-* Login:
+### Example: File download
-`curl -XPOST --cookie-jar cookie -H "Content-Type: application/x-www-form-urlencoded" -d j_username=sa -d j_password=sa http://localhost:8080/org.eclipse.mdm.nucleus/j_security_check`
+* Login
+ `curl -XPOST --cookie-jar cookie -H "Content-Type: application/x-www-form-urlencoded" -d j_username=sa -d j_password=sa http://localhost:8080/org.eclipse.mdm.nucleus/j_security_check`
-* Request a test and extract the remotePath from the first file reference:
+* Request a test and extract the remotePath from the first file reference
+ `FILE_PATH="$(curl --cookie cookie -s http://localhost:8080/org.eclipse.mdm.nucleus/mdm/environments/MDMNVH/teststeps/10 | jq -r '.data[0].attributes[] | select (.name | contains("MDMLinks")) | .value[0].remotePath')"`
-`FILE_PATH="$(curl --cookie cookie -s http://localhost:8080/org.eclipse.mdm.nucleus/mdm/environments/MDMNVH/teststeps/10 | jq -r '.data[0].attributes[] | select (.name | contains("MDMLinks")) | .value[0].remotePath')"`
+* Urlescape remotePath if necessary
+ `FILE_PATH="$(echo $FILE_PATH | python -c 'import sys,urllib;print urllib.quote(sys.stdin.read().strip(), "")')"`
-* Urlescape remotePath if necessary:
-
-`FILE_PATH="$(echo $FILE_PATH | python -c 'import sys,urllib;print urllib.quote(sys.stdin.read().strip(), "")')"`
-
-* Request the file content:
-
-`curl --cookie cookie http://localhost:8080/org.eclipse.mdm.nucleus/mdm/environments/MDMNVH/teststeps/10/files/$FILE_PATH`
+* Request the file content
+ `curl --cookie cookie http://localhost:8080/org.eclipse.mdm.nucleus/mdm/environments/MDMNVH/teststeps/10/files/$FILE_PATH`
## Preference Service
-Preference service stores its data to a relational database. The database connection is looked up by JNDI and the JNDI name and other database relevant parameters are specified in src/main/resources/META-INF/persistence.xml. The default JNDI name for the JDBC resource is set to jdbc/openMDM. This JDBC resource and its dependent JDBC Connection Pool has to be created and configured within the glassfish web administration console or through asadmin command line tool.
+Preference service stores its data to a relational database. The database connection is looked up by JNDI and the JNDI name and other database relevant parameters are specified in `src/main/resources/META-INF/persistence.xml`. The default JNDI name for the JDBC resource is set to `jdbc/openMDM`. This JDBC resource and its dependent JDBC Connection Pool has to be created and configured within the Glassfish web administration console or through `asadmin` command line tool.
-Furthermore the schema has to be created in the configured database. Therefore database DDL scripts are available for PostgreSQL and Apache Derby databases in the folder `schema/org.eclipse.mdm.preferences` of the distribution. Other databases supported by EclipseLink may also work, but is up to the user to adapt the DDL scripts.
+Furthermore the schema has to be created in the configured database. Therefore database DDL scripts are available for PostgreSQL and Apache Derby databases in the folder `schema/org.eclipse.mdm.preferences` of the distribution.
+Other databases supported by EclipseLink may also work, but is up to the user to adapt the DDL scripts.
-### available rest URLs
-* http://{SERVER}:POART/{APPLICATIONROOT}/mdm/preferences
-* example: `curl -GET -H "Content-Type: application/json" http://localhost:8080/org.eclipse.mdm.nucleus/mdm/preferences?scope=SYSTEM&key=ignoredAttributes`
-* example: `curl -PUT -H "Content-Type: application/json" -d '{"scope": "SYSTEM", "key": "ignoredAttributes", "value": "[\"*.MimeType\"]"}' http://localhost:8080/org.eclipse.mdm.nucleus/mdm/preferences`
-* example: `curl -DELETE http://localhost:8080/org.eclipse.mdm.nucleus/mdm/preferences/ID`
+### Examples
+* Receive values
+ `curl -GET -H "Content-Type: application/json" http://localhost:8080/org.eclipse.mdm.nucleus/mdm/preferences?scope=SYSTEM&key=ignoredAttributes`
+
+* Set value
+ `curl -PUT -H "Content-Type: application/json" -d '{"scope": "SYSTEM", "key": "ignoredAttributes", "value": "[\"*.MimeType\"]"}' http://localhost:8080/org.eclipse.mdm.nucleus/mdm/preferences`
+
+* Delete entry
+ `curl -DELETE http://localhost:8080/org.eclipse.mdm.nucleus/mdm/preferences/ID`
## FreeTextSearch
### Configuration
-1. **start** ElasticSearch. ElasticSearch can be downloaded at https://www.elastic.co/products/elasticsearch. The minimum supported Elasticsearch version is 7. For testing purpose, it can be simply started by executing bin/run.bat
-2. **edit** the configuration (global.properties) to fit your environment. You need an ODS Server which supports Notifications. All fields have to be there, but can be empty. However certain ODS Servers ignore some parameters (e.g. PeakODS ignores pollingIntervall since it pushes notifications).
-3. **start up** the application. At the first run it will index the database. This might take a while. After that MDM registers itself as NotificationListener and adapts all changes one-by-one.
+1. Start ElasticSearch. ElasticSearch can be downloaded at https://www.elastic.co/products/elasticsearch. The minimum supported Elasticsearch version is 7. For testing purpose, it can be simply started by executing `bin/run.sh`
+
+2. Edit the configuration (`global.properties`) to fit your environment. You need an ODS Server which supports Notifications. All fields have to be there, but can be empty. However certain ODS Servers ignore some parameters (e.g. PeakODS ignores pollingIntervall since it pushes notifications).
+
+3. Start the application. At the first run it will index the database. This might take a while. After that MDM registers itself as `NotificationListener` and adapts all changes one-by-one.
### Run on dedicated server
-The Indexing is completely independent from the searching. So the Indexer can be freely deployed at any other machine. In the simplest case, the same steps as in Configuration have to be done. The application can then be deployed on any other machine. All components besides the FreeTextIndexer and its dependencies are not user. Those can be left out, if desired.
+
+The Indexing is completely independent from the searching. So the Indexer can be freely deployed at any other machine.
+In the simplest case, the same steps as in Configuration have to be done.
+The application can then be deployed on any other machine. All components besides the FreeTextIndexer and its dependencies are not user. Those can be left out, if desired.
## Connector and service.xml
-The service.xml contains all information necessary for the Connector-Service to connect to the available datasources/adapter instances. Since this information includes secret information like passwords, it is possible
-to provide lookups, which gives you the possibility to specify tokens as references to properties defined elsewhere.
+The `service.xml` contains all information necessary for the Connector-Service to connect to the available datasources/adapter instances.
+Since this information includes secret information like passwords, it is possible to provide lookups, which gives you the possibility to specify tokens as references to properties defined elsewhere.
-There are different lookups available:
-* sys: Looks up variables defined as system properties
-* env: Looks up variables defined as environment variables
+There are different lookups available
+* `sys`: Looks up variables defined as system properties
+* `env`: Looks up variables defined as environment variables
Example:
+
`<param name="password">${env:odsPassword}</param>`
-##Known issues:
-If you run into "java.lang.ClassNotFoundException: javax.xml.parsers.ParserConfigurationException not found by org.eclipse.persistence.moxy" this is a bug described in https://bugs.eclipse.org/bugs/show_bug.cgi?id=463169 and https://java.net/jira/browse/GLASSFISH-21440.
-This solution is to replace GLASSFISH_HOME/glassfish/modules/org.eclipse.persistence.moxy.jar with this: http://central.maven.org/maven2/org/eclipse/persistence/org.eclipse.persistence.moxy/2.6.1/org.eclipse.persistence.moxy-2.6.1.jar
+## Known issues
+If you run into `java.lang.ClassNotFoundException: javax.xml.parsers.ParserConfigurationException not found by org.eclipse.persistence.moxy` this is a bug described in https://bugs.eclipse.org/bugs/show_bug.cgi?id=463169 and https://java.net/jira/browse/GLASSFISH-21440.
+This solution is to replace `GLASSFISH_HOME/glassfish/modules/org.eclipse.persistence.moxy.jar` with this file http://central.maven.org/maven2/org/eclipse/persistence/org.eclipse.persistence.moxy/2.6.1/org.eclipse.persistence.moxy-2.6.1.jar
-If you run into "java.lang.ClassNotFoundException: com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector not found by com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" you have to download http://central.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.5.1/jackson-module-jaxb-annotations-2.5.1.jar and put it under GLASSFISH_HOME/glassfish/domains/domain1/autodeploy/bundles
+If you run into `java.lang.ClassNotFoundException: com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector not found by com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider` you have to download http://central.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.5.1/jackson-module-jaxb-annotations-2.5.1.jar and put in the `GLASSFISH_HOME/glassfish/domains/domain1/autodeploy/bundles` folder
## Client preferences
-The applications preferences are managed in the administration section. This section can be accessed via the `Administration` button in the main navigation bar or via
-* `http://../administration`.
-A preference is a pair of a unique key and a value. The key is composed of a prefix defining the purpose of the preference followed by an arbitrary but unique identifier string. It is recommended to choose the identifier the same as the preferences 'name' field, in case there is one. The value holds the preference's data in a Json string. The following preferences, sorted by their scope, can be set:
+The applications preferences are managed in the administration section. This section can be accessed via the **Administration** button in the main navigation bar or via http://localhost:8080/org.eclipse.mdm.nucleus/administration
-User:
+A preference is a pair of a unique key and a value. The key is composed of a prefix defining the purpose of the preference followed by an arbitrary but unique identifier string.
+It is recommended to choose the identifier the same as the preferences `name` field, in case there is one. The value holds the preference's data in a JSON string.
+
+The following preferences, sorted by their scope, can be set
+
+* User
- Basket
- View
- Filter
-System:
+* System
- Node provider
- Shopping basket file extensions
-Source:
+* Source
- Ignored attributes
However, it might be necessary to reload the application before a newly defined preference is available or any changes on an existing preferences are applied.
-WARNING: Corrupted preferences can result in malfunctions of the application.
+
+**WARNING**: Corrupted preferences can result in malfunctions of the application.
### User scope
+
A user scoped preference's area of effect is limited to the logged in user. All user scoped preferences can also be set in dialogs in the main application.
-1.) Basket
- Basket preferences keys must start with the prefix `basket.nodes.`. This preference has the fields 'items' and 'name' and holds all the information for saved baskets. The field 'items' holds an array of MDMItems, providing the relevant information of a related node, i.e. 'source', 'type' and 'id'. The field 'name' defines the name, which is provided in the main application to load this basket.
+1. Basket
+ Basket preferences keys must start with the prefix `basket.nodes.`
+ This preference has the fields `items` and `name` and holds all the information for saved baskets.
+ * The field `items` holds an array of MDMItems, providing the relevant information of a related node, i.e. `source`, `type` and `id`.
+ * The field `name` defines the name, which is provided in the main application to load this basket.
+
+ Example
+ ```
+ {
+ "items": [{"source":"MDMNVH","type":"Test","id":38}],
+ "name": "basketExample"
+ }
+ ```
- ** Example:
- { "items": [{"source":"MDMNVH","type":"Test","id":38}],
- "name": "basketExample" }
+2. View
+ View preferences keys must start with the prefix `tableview.view.`
+ This preference has the fields `columns` and `name` and holds the layout information for the tables displaying the search results and the basket nodes.
+ * The field `columns` holds an array of ViewColumn objects. A ViewColumn is an Object with the fields `type`, `name`, `sortOrder` and an optional field `style`.
+ * The field `type` can be set to all available MDM data types, i.e. `Project`, `Pool`, `Test`, `TestStep`, `Measurement`, `ChannelGroup`, `Channel`.
+ * The field `name` field specifies an attribute, which must be an searchable attribute for the given `type`.
+ * The field `sortOrder` can be set by the number `1` (ascending), `-1` (descending), or null (unsorted). Only one column of the array can have a non-null value `sortOrder` at a time. The ViewColumn's style element can hold any CSS-style object. However, it is supposed to contain only the columns width. The column order in the array is identically with the appearance in the table.
+ * The field `name` defines the name, which is provided in the main application to load this view.
-2.) View
- View preferences keys must start with the prefix `tableview.view.` This preference has the fields 'columns' and 'name' and holds the layout information for the tables displaying the search results and the basket nodes.
- The field 'columns' holds an array of ViewColumn objects. A ViewColumn is an Object with the fields 'type', 'name', 'sortOrder' and an optional field 'style'. The ViewColumn's 'type' can be set to all available MDM data types, i.e. `Project`, `Pool`, `Test`, `TestStep`, `Measurement`, `ChannelGroup`, `Channel`. The ViewColumn's 'name' field specifies an attribute, which must be an searchable attribute for the given 'type'. The ViewColumn's sortOrder can be set by the number `1` (ascending), `-1` (descending), or null (unsorted). Only one column of the array can have a non-null value sortOrder at a time. The ViewColumn's style element can hold any CSS-style object. However, it is supposed to contain only the columns width. The column order in the array is identically with the appearance in the table.
- The view's field 'name' defines the name, which is provided in the main application to load this view.
+ Example
+ ```
+ {
+ "columns": [
+ {
+ "type": "Test",
+ "name": "Id",
+ "style": {"width":"75px"},
+ "sortOrder": null
+ }
+ ],
+ "name": "viewExample"
+ }
+ ```
- **Example:
- { "columns": [{"type":"Test","name":"Id","style":{"width":"75px"},"sortOrder":null}],
- "name": "viewExample" }
-
-3.) Filter
- Filter preferences keys must start with the prefix `filter.nodes.`. This preference has the fields 'conditions', 'name', 'environments', 'resultType' and 'fulltextQuery'. It provides the information for the attribute based / advanced search.
- The field 'conditions' holds an array of Condition objects. A Condition specifies a search condition for attribute based search. It consists of the fields 'type', 'name', 'operator', 'value' and 'valueType'. The Condition's 'type' can be set to all available MDM data types, i.e. `Project`, `Pool`, `Test`, `TestStep`, `Measurement`, `ChannelGroup`, `Channel`. The Condition's 'name' field specifies an attribute, which must be an searchable attribute for the given 'type'. The Condition's 'operator' field, holds on of the following numbers: `0`(=), `1`(<), `2`(>), `3`(like). The Condition's 'value' field holds a string array containing input for the attribute based search. The Condition's 'resultType' field should match the type corresponding to the attribute specified in the 'name' filed, e.g. `string`, `date` or `long`.
- The Filter's field 'name' defines the name, which is provided in the main application to load this filter.
- The Filter's field 'environments' holds an string array with the names of the sources that should be included in the search.
- The Filter's field 'resultType' can be set to all available MDM data types (see above). Only nodes of this type will be included in the search.
- The Filter's field 'fulltextQuery' holds a string containing full text search input.
-
- **Example:
- { "conditions":[{"type":"Test","attribute":"Name","operator":0,"value":[],"valueType":"string"}],
- "name":"filterExample",
- "environments":["sourceName"],
- "resultType":"Test",
- "fulltextQuery":"" }
+3. Filter
+ Filter preferences keys must start with the prefix `filter.nodes.`
+ This preference has the fields `conditions`, `name`, `environments`, `resultType` and `fulltextQuery`.
+ It provides the information for the attribute based / advanced search.
+ * The field `conditions` holds an array of Condition objects. A Condition specifies a search condition for attribute based search. It consists of the fields `type`, `name`, `operator`, `value` and `valueType`. The Condition's `type` can be set to all available MDM data types, i.e. `Project`, `Pool`, `Test`, `TestStep`, `Measurement`, `ChannelGroup`, `Channel`.
+ * The Condition's `name` field specifies an attribute, which must be an searchable attribute for the given `type`.
+ * The Condition's `operator` field, holds on of the following numbers: `0`(=), `1`(<), `2`(>), `3`(like).
+ * The Condition's `value` field holds a string array containing input for the attribute based search.
+ * The Condition's `resultType` field should match the type corresponding to the attribute specified in the `'name` filed, e.g. `string`, `date` or `long`.
+ * The field `name` defines the name, which is provided in the main application to load this filter.
+ * The field `environments` holds an string array with the names of the sources that should be included in the search.
+ * The field `resultType` can be set to all available MDM data types (see above). Only nodes of this type will be included in the search.
+ * The field `fulltextQuery` holds a string containing full text search input.
+
+ Example
+ ```
+ { "conditions": [
+ {
+ "type": "Test",
+ "attribute": "Name",
+ "operator": 0,
+ "value": [],
+ "valueType":"string"
+ }
+ ],
+ "name": "filterExample",
+ "environments": ["sourceName"],
+ "resultType": "Test",
+ "fulltextQuery": ""
+ }
+ ```
### System scope
+
System scoped preference are applied globally.
-1.) Node provider
+* Node provider
+ The navigation tree structure can be defined via a node provider. The default node provider is set in `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/defaultnodeprovider.json`.
+ It is recommended not to change the default node provider. Instead new node providers can be added as preferences.
+ Their keys must start with the prefix `nodeprovider.`. Once a custom node provider is supplied it can be selected in the dropdown menu in the navigation tree header.
+
+ * Structure
- The navigation tree structure can be defined via a node provider. The default node provider is set in
- * ..\src\main\webapp\src\app\navigator\defaultnodeprovider.json.
- It is recommended not to change the default node provider. Instead new node providers can be added as preferences. Their keys must start with the prefix ´nodeprovider.´. Once a custom node provider is supplied it can be selected in the dropdown menu in the navigation tree header.
+ * First layer/root nodes
+ In the node provider each layer of nodes of the navigation tree is defined in a nested object.
+ The first layer of nodes, is always the environment level. This is necessary due to the provided endpoints.
+ The first layer consists of the fields `name`, `type`, and `children`.
+ * The field `name` sets the name, which is displayed in the application to select the corresponding node provider.
+ * The field `type` defines the data type of the nodes, which is always `Environments` on the first layer.
+
+ The next layer of nodes are defined via the field `children`.
- I.) Structure
+ * Children
+ A child object consists of the fields `type`, `query`, and `children`.
+ * The field `type` sets the data type of this layer of nodes. It can be set to all available MDM data types, i.e. `Project`, `Pool`, `Test`, `TestStep`, `Measurement`, `ChannelGroup`, `Channel`.
+ * The filed `query` holds the URL to load this layer of nodes. The first part of the query for each child object should be `/` plus the type of the layer in small letters followed by an `s`.
+ For a nested child objected a filter is attached to the query in the form: `?filter=<parentType>.Id eq {<parentType>.Id}`. The placeholder <parentType> has to be replaced by the actual parent type (set in the field `type` in the parent child or root layer, see example below).
+ At runtime the curly braces will be replaced by the Id of the parent node. Further child objects, and thereby more sublayers, can be nested via the field `children`.
+
+ The children field does not need to be set for the last layer of nodes.
+
+ * Examples
- a) First layer/root nodes
- In the node provider each layer of nodes of the navigation tree is defined in a nested object. The first layer of nodes, is always the environment level. This is necessary due to the provided endpoints. The first layer consists of the fields 'name', 'type', and 'children'. The field 'name' sets the name, which is displayed in the application to select the corresponding node provider. The field 'type' defines the data type of the nodes, which is always `Environments` on the first layer. The next layer of nodes are defined via the field 'children'.
+ * Minimal node provider
+ ```
+ { "name": "My name to display", "type": "Environment"}
+ ```
- b) Children
- A child object consists of the fields 'type', 'query', and 'children'. The field 'type' sets the data type of this layer of nodes. It can be set to all available MDM data types, i.e. `Project`, `Pool`, `Test`, `TestStep`, `Measurement`, `ChannelGroup`, `Channel`. The filed 'query' holds the URL to load this layer of nodes. The first part of the query for each child object should be `/` plus the type of the layer in small letters followed by an `s`. For a nested child objected a filter is attached to the query in the form: `?filter=<parentType>.Id eq {<parentType>.Id}`. The placeholder <parentType> has to be replaced by the actual parent type (set in the field 'type' in the parent child or root layer, see example below). At runtime the curly braces will be replaced by the Id of the parent node. Further child objects, and thereby more sublayers, can be nested via the field 'children'. The children field does not need to be set for the last layer of nodes.
-
- II.) Examples
-
- a) Minimal node provider
- { "name": "My name to display", "type": "Environment"}
-
- b) node provider with two child layers
- {
- "name": "My name to display",
- "type": "Environment",
- "children": {
- "type": "Project",
- "query": "/projects",
- "children": {
- "type": "Pool",
- "query": "/pools?filter=Project.Id eq {Project.Id}"
+ * Node provider with two child layers
+ ```
+ {
+ "name": "My name to display",
+ "type": "Environment",
+ "children": {
+ "type": "Project",
+ "query": "/projects",
+ "children": {
+ "type": "Pool",
+ "query": "/pools?filter=Project.Id eq {Project.Id}"
+ }
+ }
}
- }
- }
-
-2.) Shopping basket file extensions
+ ```
-When downloading the contents of a shopping basket, a file with extension `mdm` is generated. Additional file extensions can be adding by poviding a preference with key `shoppingbasket.fileextensions`. Here you can define a list of objects with attributes 'label' and 'extension'. For example: `[ { "label": "MyTool", "extension": "mdm-mytool" }, { "label": "OtherTool", "extension": "mdm-other" } ]`. If `MyTool` has a file handler registered for the extension `mdm-mytool`, the application will be launched if the browser automatically opens the file after download.
+* Shopping basket file extensions
+
+ When downloading the contents of a shopping basket, a file with extension `mdm` is generated.
+ Additional file extensions can be adding by poviding a preference with key `shoppingbasket.fileextensions`.
+ Here you can define a list of objects with attributes `label` and `extension`.
+ For example: `[ { "label": "MyTool", "extension": "mdm-mytool" }, { "label": "OtherTool", "extension": "mdm-other" } ]`.
+ If `MyTool` has a file handler registered for the extension `mdm-mytool`, the application will be launched if the browser automatically opens the file after download.
### Source scope
-Source scoped preferences are applied at any user but limited to the specified source. The source can be specified in the `Add Preference` or `Edit Preference` dialog.
-1.) Ignored Attributes
-The ignore attributes preference must have the exact key `ignoredAttributes`. An identifier must not be added. The preference specifies all attributes, which are supposed to be ignored in the detail view. The preference is a simple Json string holding a list of attributes in the form {"<type>.<AttributeName>"}. The placeholders <type> and <AttributeName> have to be replaced by the actual type and name of the attribute which should be ignored, respectively.
+Source scoped preferences are applied at any user, but are limited to the specified source. The source can be specified in the **Add Preference** or **Edit Preference** dialog.
-**Example:
-["*.MimeType", "TestStep.Sortindex"]
+* Ignored Attributes
+ The ignore attributes preference must have the exact key `ignoredAttributes`. An identifier must not be added.
+ The preference specifies all attributes, which are supposed to be ignored in the detail view. The preference is a simple JSON string holding a list of attributes in the form {"<type>.<AttributeName>"}.
+ The placeholders <type> and <AttributeName> have to be replaced by the actual type and name of the attribute which should be ignored, respectively.
-##Create a module
-Any MDM module needs to be a valid angular2 module. An angular2 module consists of one angular2 component and one ng-module at least. In the angular2 component any content can be defined. The component must be declared in a ng-module to grant accessibility in the rest of the application. In a module additional components and services can be defined. All related files should be stored in a new subfolder in the app folder
-* ..\org.eclipse.mdm.nucleus\org.eclipse.mdm.application\src\main\webapp\src\app.
+ Example:
+ `["*.MimeType", "TestStep.Sortindex"]`
-###Angular2 components (see example 1)
-A component is defined in a typescript file starting with the @Component() identifier. Any html content can be provided here in an inline template or via a link to an external html resource. Thereafter the component itself, which is supposed to hold any logic needed, is defined and exported.
+## Create a module for the Web application
-###Ng-module (see example 2)
- On one hand the ng-module provides other MDM modules of the application, and thereby all the services and components declared within them, in this MDM module. The 'imports' array holds all modules from the application needed in this MDM module. It should always hold the MDMCoreModule, which provides basic functionalities. On the other hand a ng-module grants accessibility of components of this module in other directives (including the html template) within the module (in a 'declaration' array) or even in other parts of the application (in an 'export' array). For more details see *https://angular.io/docs/ts/latest/guide/ngmodule.html.
+Any MDM module needs to be a valid [Angular module](https://angular.io/guide/architecture-modules) aka NgModule.
+A NgModule consists of the module definition, components, services and other files that are in the scope of the module.
+The component can hold any content. The component must be declared in a module definition to grant accessibility in the rest of the application.
+All related files should be stored in a new module subfolder in the app folder `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app` (eg. `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/new-module`)
- ** Minimal example
- First create a new folder
- * ..\org.eclipse.mdm.nucleus\org.eclipse.mdm.application\src\main\webapp\src\app\new-module
+### Example module
- 1) Minimal angular2 component
- Add a new typescript file named 'mdm-new.component.ts' with the following content:
+An example for a new module can be found at `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/example-module`
- import {Component} from '@angular/core';
- @Component({template: '<h1>Example Module</h1>'})
- export class MDMNewComponent {}
+### Creating a MDM module
- 2) Minimal ng-module
- Add a new typescript file named 'mdm-new.module.ts' with the following content:
+1. Create a new folder eg. `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/new-module`
- import { NgModule } from '@angular/core';
- import { MDMCoreModule } from '../core/mdm-core.module';
- import { MDMNewComponent } from './mdm-new.component';
- @NgModule({imports: [MDMCoreModule], declarations: [MDMNewComponent]})
- export class MDMNewModule {}
+2. Create an Angular component (eg. `mdm-new.component.ts`) inside that new folder
+ ```typescript
+ import {Component} from '@angular/core';
+ @Component({template: '<h1>Example Module</h1>'})
+ export class MDMNewComponent {}
+ ```
+ A component is defined in a Typescript file with the `@Component()` decorator.
+ Any HTML content can be provided here in an inline template or via a link to an external HTML resource. Thereafter the component itself, which is supposed to hold any logic needed, is defined and exported.
+ For more details see https://angular.io/guide/architecture-components.
+
+3. Create a minimal NgModule (eg. `mdm-new.module.ts` ) inside that new folder
+ ```typescript
+ import { NgModule } from '@angular/core';
+ import { MDMCoreModule } from '../core/mdm-core.module';
+ import { MDMNewComponent } from './mdm-new.component';
+ @NgModule({imports: [MDMCoreModule], declarations: [MDMNewComponent]})
+ export class MDMNewModule {}
+ ```
+ The `imports` array holds all modules from the application needed in this MDM module. It should always hold the `MDMCoreModule`, which provides basic functionalities.
+ On the other hand a NgModule grants accessibility of components of this module in other directives (including the HTML template) within the module (in a `declaration` array) or even in other parts of the application (in an `export` array).
+ For more details see https://angular.io/guide/architecture-modules.
-###Embedding a module (no lazy loading)
-To embed this new module in MDM you have to register this module in the MDMModules Module.
-This is done by registering the component to **moduleRoutes** in **modules-routing.module.ts**:
-***
- { path: 'new', component: MDMNewComponent}
-***
+### Embedding a module (no lazy loading)
-Furthermore you have to define a display name for the registered route in the array returned by **getLinks** in **modules.component.ts**:
-***
-{ path: 'new', name: 'New Module' }
-***
+To embed this new module in MDM you have to register this module in the `MDMModules` Module.
+* Import the new module at `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.module.ts`
-For further information refer to the Angular 2 documentation for modules & router:
-* https://angular.io/docs/ts/latest/guide/ngmodule.html
-* https://angular.io/docs/ts/latest/guide/router.html
+* Register a route to the new module at `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules-routing.module.ts`
+ ```
+ { path: 'new', component: MDMNewComponent}
+ ```
+
+ * Furthermore you have to define a display name for the registered route in the `links` array in `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.ts`
+ ```
+ { path: 'new', name: 'New Module' }
+ ```
+
+For further information refer to the Angular documentation:
+* https://angular.io/guide/architecture-components
+* https://angular.io/guide/architecture-modules
+* https://angular.io/guide/router
- ###Lazy loading and routing module
- For lazy-loading (recommended in case there is a high number of modules) embedding of the module is slightly different.
- ***
+### Lazy loading and routing module
+
+For lazy-loading (recommended in case there is a high number of modules) embedding of the module is slightly different.
+```
{ path: 'example', loadChildren: '../example-module/mdm-example.module#MDMExampleModule'}
- ***
+```
- Additionally, a ng-module, the so called routing module, is needed to provide the routes to this modules components.
- ***
+Additionally, a NgModule, the so called routing module (eg. `mdm-new-routing.module.ts`), is needed to provide the routes to this modules components.
+```typescript
const moduleRoutes: Routes = [{ path: '', component: MDMExampleComponent }];
@NgModule({imports: [RouterModule.forChild(moduleRoutes)], exports: [RouterModule]})
export class MDMExampleRoutingModule {}
- ***
+```
- The routing module needs to be declared in the ng-module of this module as well. A full example is provided in
- * ..\org.eclipse.mdm.nucleus\org.eclipse.mdm.application\src\main\webapp\src\app\example-module
+### Filerelease module
+The filerelease module is stored in the following folder `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/filerelease`
+It can be embedded as any other module described above.
+```
+{ path: 'filerelease', component: MDMFilereleaseComponent }
+```
- ###Filerelease module
- The filerelease module is stored in the following folder:
-*..\org.eclipse.mdm.nucleus\org.eclipse.mdm.application\src\main\webapp\src\app\filerelease
+```
+{ name: 'MDM Files', path: 'filerelease'}
+```
-It can be embedded as any other module described above. Register to **moduleRoutes** in **modules-routing.module.ts**:
-***
- { path: 'filerelease', component: MDMFilereleaseComponent }
-***
-
-Add entry to **links** array in **MDMModulesComponent**:
-***
- { name: 'MDM Suche', path: 'search'}
-***
-
-To make the filerelease module available in the detail view it needs to be imported in the corresponding ng-module **mdm-detail.module.ts**.
-Thereafter, the MDMFilereleaseCreateComponent can be imported to the **mdm-detail-view.component.ts**. Then the following has to be added to the **mdm-detail-view.component.html** file:
-***
+### Adding a module to the detail view (eg. filerelease module)
+To make the filerelease module available in the detail view it needs to be imported in the corresponding MDM Module `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.module.ts`
+Thereafter, the `MDMFilereleaseCreateComponent` can be imported to the `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-view/mdm-detail-view.component.ts`.
+Then the following has to be added to the `org.eclipse.mdm.nucleus/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-view/mdm-detail-view.component.html` file:
+```
<mdm-filerelease-create [node]=selectedNode [disabled]="isReleasable()"></mdm-filerelease-create>
-***
-
-
+```
It should be located right after the add to basket button:
-***
+```
<div class="btn-group pull-right" role="group">
<button type="button" class="btn btn-default" (click)="add2Basket()" [disabled]="isShopable()">In den Warenkorb</button>
<mdm-filerelease-create [node]=selectedNode [disabled]="isReleasable()"></mdm-filerelease-create>
</div>
-***
+```
-## Copyright and License ##
+## Copyright and License
Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
- See the NOTICE file(s) distributed with this work for additional
+ See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership.
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0.
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0 which is available at
+ http://www.eclipse.org/legal/epl-2.0.
SPDX-License-Identifier: EPL-2.0
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 91a2465..e4b8154 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@
}
group = 'org.eclipse.mdm'
-version = '5.1.0'
+version = '5.2.0M1-SNAPSHOT'
description = 'mdm nucleus'
apply plugin: 'war'
@@ -141,6 +141,11 @@
from "${project.projectDir}/org.eclipse.mdm.preferences/build/generated-schema/"
into "${project.projectDir}/build/tmp/openmdm_application/schema/org.eclipse.mdm.preferences"
}
+
+ copy {
+ from "${project.projectDir}/org.eclipse.mdm.preferences/src/main/sql/"
+ into "${project.projectDir}/build/tmp/openmdm_application/schema/update"
+ }
}
}
diff --git a/doc/GettingStarted_mdmbl.pdf b/doc/GettingStarted_mdmbl.pdf
index b194922..e0bc613 100644
--- a/doc/GettingStarted_mdmbl.pdf
+++ b/doc/GettingStarted_mdmbl.pdf
Binary files differ
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContext.java b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContext.java
index 0efdc5f..13f000a 100644
--- a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContext.java
+++ b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContext.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -13,6 +13,8 @@
********************************************************************************/
package org.eclipse.mdm.api.atfxadapter;
+import java.io.File;
+import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -20,12 +22,15 @@
import org.asam.ods.AoSession;
import org.asam.ods.ErrorCode;
import org.asam.ods.SeverityFlag;
+import org.eclipse.mdm.api.atfxadapter.filetransfer.ATFXFileService;
import org.eclipse.mdm.api.base.adapter.ModelManager;
+import org.eclipse.mdm.api.base.file.FileService;
import org.eclipse.mdm.api.base.query.DataAccessException;
import org.eclipse.mdm.api.base.query.QueryService;
import org.eclipse.mdm.api.dflt.ApplicationContext;
import org.eclipse.mdm.api.dflt.EntityManager;
import org.eclipse.mdm.api.dflt.model.EntityFactory;
+import org.eclipse.mdm.api.dflt.model.ExtSystemAttribute;
import org.eclipse.mdm.api.odsadapter.query.ODSEntityFactory;
import org.eclipse.mdm.api.odsadapter.query.ODSModelManager;
import org.eclipse.mdm.api.odsadapter.query.ODSQueryService;
@@ -46,23 +51,29 @@
private ODSModelManager modelManager;
private ATFXEntityManager entityManager;
+ private File atfxFile;
+
private static final String INCLUDE_CATALOG = "includeCatalog";
/**
* Creates a new ATFX application context.
*
- * @param orb the CORBA ORB used to connect to the ODS API
+ * @param orb the CORBA ORB used to connect to the ODS API
* @param aoSession
* @param parameters
+ * @param atfxFile
+ * @param extSystemAttrList
* @throws AoException
*/
- public ATFXContext(ORB orb, AoSession aoSession, Map<String, String> parameters) throws AoException {
+ public ATFXContext(ORB orb, AoSession aoSession, Map<String, String> parameters,
+ List<ExtSystemAttribute> extSystemAttrList, File atfxFile) throws AoException {
this.parameters = parameters;
boolean includeCatalog = Boolean.valueOf(parameters.getOrDefault(INCLUDE_CATALOG, "false"));
this.modelManager = new ODSModelManager(orb, aoSession, new ATFXEntityConfigRepositoryLoader(includeCatalog));
- this.entityManager = new ATFXEntityManager(this);
+ this.entityManager = new ATFXEntityManager(this, extSystemAttrList);
+ this.atfxFile = atfxFile;
LOGGER.debug("ATFXContext initialized.");
}
@@ -165,4 +176,15 @@
throw new AoException(ErrorCode.AO_NOT_IMPLEMENTED, SeverityFlag.ERROR, 0,
"Method 'createCoSession' not implemented in openATFX");
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.mdm.api.base.BaseApplicationContext#getFileService()
+ */
+ @Override
+ public Optional<FileService> getFileService() {
+ return Optional.of(new ATFXFileService(this.atfxFile.getParentFile()));
+ }
+
}
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContextFactory.java b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContextFactory.java
index 2e571ac..0187ba0 100644
--- a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContextFactory.java
+++ b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXContextFactory.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -16,6 +16,8 @@
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import org.asam.ods.AoException;
@@ -23,16 +25,59 @@
import org.eclipse.mdm.api.base.ConnectionException;
import org.eclipse.mdm.api.dflt.ApplicationContext;
import org.eclipse.mdm.api.dflt.ApplicationContextFactory;
+import org.eclipse.mdm.api.dflt.EntityManager;
+import org.eclipse.mdm.api.dflt.model.ExtSystem;
+import org.eclipse.mdm.api.dflt.model.ExtSystemAttribute;
import org.omg.CORBA.ORB;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Strings;
import de.rechner.openatfx.AoServiceFactory;
public class ATFXContextFactory implements ApplicationContextFactory {
+ private static final Logger LOG = LoggerFactory.getLogger(ATFXContextFactory.class);
+
private static final ORB orb = ORB.init(new String[] {}, System.getProperties());
+ private static final String PROP_EXTSYSTEMNAME = "extSystemName";
+
@Override
public ApplicationContext connect(Map<String, String> parameters) throws ConnectionException {
+ return initApplicationContext(parameters, null);
+ }
+
+ public ApplicationContext connect(Map<String, String> parameters, ApplicationContext targetContext)
+ throws ConnectionException {
+
+ EntityManager entityManager = targetContext.getEntityManager()
+ .orElseThrow(() -> new ConnectionException("TargetEntity manager not present!"));
+
+ String extSystemName = parameters.get(PROP_EXTSYSTEMNAME);
+
+ List<ExtSystemAttribute> extSystemAttrList = new ArrayList<>();
+
+ if (!Strings.isNullOrEmpty(extSystemName)) {
+ List<ExtSystem> extSystemList = entityManager.loadAll(ExtSystem.class, extSystemName);
+
+ if (extSystemList == null || extSystemList.isEmpty()) {
+ LOG.warn("External system with name '{}' nor found! Try to import file without mapping!",
+ extSystemName);
+ } else if (extSystemList.size() > 1) {
+ throw new ConnectionException(
+ String.format("More than one external system with name '%s' found!", extSystemName));
+ } else {
+ extSystemAttrList = entityManager.loadChildren(extSystemList.get(0), ExtSystemAttribute.class);
+ }
+ }
+
+ return initApplicationContext(parameters, extSystemAttrList);
+ }
+
+ private ApplicationContext initApplicationContext(Map<String, String> parameters,
+ List<ExtSystemAttribute> extSystemAttrList) throws ConnectionException {
File atfxFile = new File(parameters.get("atfxfile"));
try {
@@ -43,7 +88,7 @@
throw new ConnectionException(
"Cannot open session on a not existing or empty ATFX file: " + atfxFile.getAbsolutePath());
}
- return new ATFXContext(orb, aoSession, parameters);
+ return new ATFXContext(orb, aoSession, parameters, extSystemAttrList, atfxFile);
} catch (AoException e) {
throw new ConnectionException("Error " + e.reason, e);
} catch (IOException e) {
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityManager.java b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityManager.java
index 76db600..06da146 100644
--- a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityManager.java
+++ b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/ATFXEntityManager.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -22,9 +22,13 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import javax.management.ServiceNotFoundException;
+
import org.asam.ods.AoException;
import org.asam.ods.ApplicationStructure;
import org.asam.ods.ElemId;
@@ -38,6 +42,7 @@
import org.eclipse.mdm.api.base.massdata.ReadRequest;
import org.eclipse.mdm.api.base.model.Channel;
import org.eclipse.mdm.api.base.model.ChannelGroup;
+import org.eclipse.mdm.api.base.model.ContextComponent;
import org.eclipse.mdm.api.base.model.ContextDescribable;
import org.eclipse.mdm.api.base.model.ContextRoot;
import org.eclipse.mdm.api.base.model.ContextType;
@@ -48,6 +53,7 @@
import org.eclipse.mdm.api.base.model.Test;
import org.eclipse.mdm.api.base.model.TestStep;
import org.eclipse.mdm.api.base.model.User;
+import org.eclipse.mdm.api.base.model.Value;
import org.eclipse.mdm.api.base.query.DataAccessException;
import org.eclipse.mdm.api.base.query.Filter;
import org.eclipse.mdm.api.base.query.JoinType;
@@ -57,6 +63,9 @@
import org.eclipse.mdm.api.base.query.Result;
import org.eclipse.mdm.api.dflt.EntityManager;
import org.eclipse.mdm.api.dflt.model.Classification;
+import org.eclipse.mdm.api.dflt.model.EntityFactory;
+import org.eclipse.mdm.api.dflt.model.ExtSystemAttribute;
+import org.eclipse.mdm.api.dflt.model.MDMAttribute;
import org.eclipse.mdm.api.dflt.model.Status;
import org.eclipse.mdm.api.dflt.model.TemplateTest;
import org.eclipse.mdm.api.dflt.model.TemplateTestStep;
@@ -81,23 +90,45 @@
* @see ODSEntityManager
*/
public class ATFXEntityManager implements EntityManager {
+ private static final String AA_ID = "Id";
+
+ private static final String AE_TESTSTEP = "TestStep";
+
+ private static final String AE_TEST = "Test";
+
+ private static final String AE_STRUCTURE_LEVEL = "StructureLevel";
+
+ private static final String AE_PROJECT = "Project";
+
private static final Logger LOGGER = LoggerFactory.getLogger(ATFXEntityManager.class);
+ private static final String PROP_ASAMPATH = "org.eclipse.mdm.api.atfxadapter.asampath";
+
+ private static final Pattern EXTSYSTEMCOMP_REGEX = Pattern.compile("\\[(.+)\\].*", Pattern.DOTALL);
+ private static final Pattern EXTSYSTEMATTR_REGEX = Pattern.compile("\\[.*\\](.+)", Pattern.DOTALL);
+
private final ATFXContext context;
private final ODSModelManager odsModelManager;
private final QueryService queryService;
private final EntityLoader entityLoader;
+ private final List<ExtSystemAttribute> extSystemAttrList;
+
+ private NameHelper nameHelper;
/**
* Constructor.
*
- * @param context The {@link ODSContext}.
+ * @param context The {@link ODSContext}.
+ * @param extSystemAttrList
+ * @throws ServiceNotFoundException
*/
- public ATFXEntityManager(ATFXContext context) {
+ public ATFXEntityManager(ATFXContext context, List<ExtSystemAttribute> extSystemAttrList) {
this.context = context;
this.odsModelManager = context.getODSModelManager();
this.queryService = context.getQueryService()
.orElseThrow(() -> new ServiceNotProvidedException(QueryService.class));
+ this.extSystemAttrList = extSystemAttrList;
+
entityLoader = new EntityLoader(odsModelManager, queryService);
}
@@ -308,25 +339,127 @@
ElemId elemId = new ElemId(((ODSEntityType) contextDescribableEntityType).getODSID(),
ODSConverter.toODSID(contextDescribable.getID()));
try {
- T_LONGLONG[] contextRootIds = odsModelManager.getApplElemAccess().getRelInst(elemId,
- contextDescribableEntityType.getRelation(entityType).getName());
+ Optional<Relation> relation = getRelation(contextDescribableEntityType, entityType);
- if (contextRootIds != null && contextRootIds.length > 0) {
- // There can only be one result per ContextType, thus we take the first one and
- // ignore the rest
- String instanceID = Long.toString(ODSConverter.fromODSLong(contextRootIds[0]));
+ if (relation.isPresent()) {
+ T_LONGLONG[] contextRootIds = odsModelManager.getApplElemAccess().getRelInst(elemId,
+ relation.get().getName());
- contextRoots.put(contextType,
- entityLoader.load(new Key<>(ContextRoot.class, contextType), instanceID));
+ if (contextRootIds != null && contextRootIds.length > 0) {
+ // There can only be one result per ContextType, thus we take the first one and
+ // ignore the rest
+ String instanceID = Long.toString(ODSConverter.fromODSLong(contextRootIds[0]));
+
+ contextRoots.put(contextType,
+ entityLoader.load(new Key<>(ContextRoot.class, contextType), instanceID));
+ }
}
} catch (AoException e) {
throw new DataAccessException("Cannot load contextRoot '" + entityType.getName() + "' for ID '"
+ contextDescribable.getID() + "': " + e.reason, e);
}
}
+
+ if (extSystemAttrList != null) {
+ contextRoots = mapAttributesWithExtSystem(contextRoots);
+ }
+
return contextRoots;
}
+ private Optional<Relation> getRelation(EntityType contextDescribableEntityType, EntityType entityType) {
+ try {
+ return Optional.of(contextDescribableEntityType.getRelation(entityType));
+ } catch (IllegalArgumentException e) {
+ return Optional.empty();
+ }
+ }
+
+ private Map<ContextType, ContextRoot> mapAttributesWithExtSystem(Map<ContextType, ContextRoot> contextRoots) {
+
+ EntityFactory entityFactory = this.context.getEntityFactory()
+ .orElseThrow(() -> new DataAccessException("ATFX EntityFactory not found!"));
+
+ Map<ContextType, ContextRoot> returnVal = contextRoots;
+
+ for (ExtSystemAttribute extSystemAttr : extSystemAttrList) {
+
+ String compName = getExtAttrComp(extSystemAttr.getName());
+ String attrName = getExtAttrAttr(extSystemAttr.getName());
+
+ if (!Strings.isNullOrEmpty(compName) && !Strings.isNullOrEmpty(attrName)) {
+ for (ContextRoot root : returnVal.values()) {
+ Optional<ContextComponent> contextComponentExt = root.getContextComponent(compName);
+
+ if (contextComponentExt.isPresent()) {
+
+ Value value = contextComponentExt.get().getValues().get(attrName);
+
+ if (value != null) {
+ for (MDMAttribute mdmAttr : extSystemAttr.getAttributes()) {
+ ContextRoot contextRootMDMAttr = returnVal
+ .get(ContextType.valueOf(mdmAttr.getComponentType().toUpperCase()));
+
+ if (contextRootMDMAttr != null) {
+ Optional<ContextComponent> contextComponentOptional = contextRootMDMAttr
+ .getContextComponent(mdmAttr.getComponentName());
+
+ ContextComponent contextComponent = null;
+
+ if (contextComponentOptional.isPresent()) {
+ contextComponent = contextComponentOptional.get();
+ } else {
+ contextComponent = entityFactory
+ .createContextComponent(mdmAttr.getComponentName(), contextRootMDMAttr);
+ }
+
+ Value valueMDMAttr = value.getValueType().create(mdmAttr.getAttributeName());
+ valueMDMAttr.set(value.extract(value.getValueType()));
+ ODSEntityFactory.extract(contextComponent).getValues()
+ .put(mdmAttr.getAttributeName(), valueMDMAttr);
+ }
+
+ }
+
+ break;
+ }
+
+ }
+
+ }
+ }
+ }
+
+ return returnVal;
+ }
+
+ private void writeValueToMDMAttribute(Map<ContextType, ContextRoot> contextRoots, Value value,
+ MDMAttribute mdmAttr) {
+ EntityFactory entityFactory = this.context.getEntityFactory()
+ .orElseThrow(() -> new DataAccessException("ATFX EntityFactory not found!"));
+
+ ContextRoot contextRootMDMAttr = contextRoots
+ .get(ContextType.valueOf(mdmAttr.getComponentType().toUpperCase()));
+
+ if (contextRootMDMAttr != null) {
+ Optional<ContextComponent> contextComponentOptional = contextRootMDMAttr
+ .getContextComponent(mdmAttr.getComponentName());
+
+ ContextComponent contextComponent = null;
+
+ if (contextComponentOptional.isPresent()) {
+ contextComponent = contextComponentOptional.get();
+ } else {
+
+ contextComponent = entityFactory.createContextComponent(mdmAttr.getComponentName(), contextRootMDMAttr);
+ }
+
+ Value valueMDMAttr = value.getValueType().create(mdmAttr.getAttributeName());
+ valueMDMAttr.set(value.extract(value.getValueType()));
+ ODSEntityFactory.extract(contextComponent).getValues().put(mdmAttr.getAttributeName(), valueMDMAttr);
+ }
+ }
+
/**
* {@inheritDoc}
*/
@@ -435,4 +568,24 @@
public Optional<TemplateTestStep> loadTemplate(TestStep testStep) {
return Optional.of(ODSEntityFactory.extract(testStep).getMutableStore().get(TemplateTestStep.class));
}
+
+ private static String getExtAttrComp(final String str) {
+ String returnVal = null;
+
+ Matcher matcher = EXTSYSTEMCOMP_REGEX.matcher(str);
+ if (matcher.matches()) {
+ returnVal = matcher.group(1);
+ }
+ return returnVal;
+ }
+
+ private static String getExtAttrAttr(final String str) {
+ String returnVal = null;
+
+ Matcher matcher = EXTSYSTEMATTR_REGEX.matcher(str);
+ if (matcher.matches()) {
+ returnVal = matcher.group(1);
+ }
+ return returnVal;
+ }
}
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/NameHelper.java b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/NameHelper.java
new file mode 100644
index 0000000..97a3967
--- /dev/null
+++ b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/NameHelper.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package org.eclipse.mdm.api.atfxadapter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.asam.ods.AoException;
+import org.asam.ods.AoSession;
+import org.asam.ods.ApplicationElement;
+import org.asam.ods.InstanceElement;
+import org.asam.ods.InstanceElementIterator;
+import org.asam.ods.Relationship;
+
+/**
+ * @author akn
+ *
+ */
+public class NameHelper {
+
+ private static final Pattern PATTERN_TESTSTEP_ASAM_PATH = Pattern.compile(
+ "\\/\\[Environment\\].+\\/\\[Project\\](.+)\\/\\[StructureLevel\\](.+)\\/\\[Test\\](.+)\\/\\[TestStep\\](.+)");
+
+ private final AoSession aoSession;
+ private final String compName;
+ private final String attrName;
+
+ private Map<String, String> asamAttrCache = new HashMap<>();
+
+ /**
+ * @param aoSession
+ * @param property
+ * @throws AoException
+ */
+ public NameHelper(AoSession aoSession, String compName, String attrName) throws AoException {
+ super();
+ this.aoSession = aoSession;
+ this.compName = compName;
+ this.attrName = attrName;
+ initCache();
+
+ }
+
+ private void initCache() throws AoException {
+ ApplicationElement testStep = this.aoSession.getApplicationStructure().getElementByName("TestStep");
+
+ InstanceElementIterator testStepInstances = testStep.getInstances("*");
+
+ List<InstanceElement> relatedIE = new ArrayList<>();
+
+ for (InstanceElement ie : testStepInstances.nextN(testStepInstances.getCount())) {
+ relatedIE.add(ie);
+ relatedIE.addAll(getParentIntances(ie));
+ }
+
+ int i = 0;
+
+ }
+
+ private List<InstanceElement> getParentIntances(InstanceElement ie) throws AoException {
+ List<InstanceElement> returnVal = new ArrayList<>();
+
+ InstanceElementIterator ieIterator = ie.getRelatedInstancesByRelationship(Relationship.FATHER, "*");
+
+ if (ieIterator != null && ieIterator.getCount() > 0) {
+ for (InstanceElement ieParent : ieIterator.nextN(ieIterator.getCount())) {
+ returnVal.add(ie);
+ returnVal.addAll(getParentIntances(ie));
+ }
+ }
+
+ return returnVal;
+ }
+
+}
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/filetransfer/ATFXFileService.java b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/filetransfer/ATFXFileService.java
new file mode 100644
index 0000000..5a00ee6
--- /dev/null
+++ b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/filetransfer/ATFXFileService.java
@@ -0,0 +1,229 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package org.eclipse.mdm.api.atfxadapter.filetransfer;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.time.LocalTime;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+
+import org.eclipse.mdm.api.base.file.FileService;
+import org.eclipse.mdm.api.base.model.Entity;
+import org.eclipse.mdm.api.base.model.FileLink;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author akn
+ *
+ */
+public class ATFXFileService implements FileService {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ATFXFileService.class);
+
+ private final Path parentDirectory;
+
+ public ATFXFileService(File parentDirectory) {
+ this.parentDirectory = parentDirectory.toPath();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.api.base.file.FileService#downloadSequential(org.eclipse.mdm.
+ * api.base.model.Entity, java.nio.file.Path, java.util.Collection,
+ * org.eclipse.mdm.api.base.file.FileService.ProgressListener)
+ */
+ @Override
+ public void downloadSequential(Entity entity, Path target, Collection<FileLink> fileLinks,
+ ProgressListener progressListener) throws IOException {
+ Map<String, List<FileLink>> groups = fileLinks.stream().filter(FileLink::isRemote)
+ .collect(Collectors.groupingBy(FileLink::getRemotePath));
+
+ long totalSize = calculateDownloadSize(groups);
+ final AtomicLong transferred = new AtomicLong();
+ LocalTime start = LocalTime.now();
+ UUID id = UUID.randomUUID();
+ LOGGER.debug("Sequential download of {} file(s) with id '{}' started.", groups.size(), id);
+ for (List<FileLink> group : groups.values()) {
+ FileLink fileLink = group.get(0);
+
+ download(entity, target, fileLink, (b, p) -> {
+ double tranferredBytes = transferred.addAndGet(b);
+ if (progressListener != null) {
+ progressListener.progress(b, (float) (tranferredBytes / totalSize));
+ }
+ });
+
+ for (FileLink other : group.subList(1, group.size())) {
+ other.setLocalStream(fileLink.getLocalStream());
+ }
+ }
+ LOGGER.debug("Sequential download with id '{}' finished in {}.", id, Duration.between(start, LocalTime.now()));
+
+ }
+
+ private long calculateDownloadSize(Map<String, List<FileLink>> groups) {
+ List<FileLink> links = groups.values().stream().map(l -> l.get(0)).collect(Collectors.toList());
+ long totalSize = 0;
+ for (FileLink fileLink : links) {
+ File f = new File(fileLink.getRemotePath());
+ // overflow may occur in case of total size exceeds 9223 PB!
+ totalSize = Math.addExact(totalSize, f.length());
+ }
+
+ return totalSize;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.api.base.file.FileService#downloadParallel(org.eclipse.mdm.
+ * api.base.model.Entity, java.nio.file.Path, java.util.Collection,
+ * org.eclipse.mdm.api.base.file.FileService.ProgressListener)
+ */
+ @Override
+ public void downloadParallel(Entity entity, Path target, Collection<FileLink> fileLinks,
+ ProgressListener progressListener) throws IOException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.api.base.file.FileService#download(org.eclipse.mdm.api.base.
+ * model.Entity, java.nio.file.Path, org.eclipse.mdm.api.base.model.FileLink,
+ * org.eclipse.mdm.api.base.file.FileService.ProgressListener)
+ */
+ @Override
+ public void download(Entity entity, Path target, FileLink fileLink, ProgressListener progressListener)
+ throws IOException {
+ if (Files.exists(target)) {
+ if (!Files.isDirectory(target)) {
+ throw new IllegalArgumentException("Target path is not a directory.");
+ }
+ } else {
+ Files.createDirectory(target);
+ }
+
+ try (InputStream inputStream = openStream(entity, fileLink)) {
+ Path absolutePath = target.resolve(fileLink.getFileName()).toAbsolutePath();
+ String remotePath = fileLink.getRemotePath();
+ LOGGER.debug("Starting download of file '{}' to '{}'.", remotePath, absolutePath);
+ LocalTime start = LocalTime.now();
+ Files.copy(inputStream, absolutePath);
+ LOGGER.debug("File '{}' successfully downloaded in {} to '{}'.", remotePath,
+ Duration.between(start, LocalTime.now()), absolutePath);
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.api.base.file.FileService#openStream(org.eclipse.mdm.api.base
+ * .model.Entity, org.eclipse.mdm.api.base.model.FileLink,
+ * org.eclipse.mdm.api.base.file.FileService.ProgressListener)
+ */
+ @Override
+ public InputStream openStream(Entity entity, FileLink fileLink, ProgressListener progressListener)
+ throws IOException {
+
+ return new FileInputStream(parentDirectory.resolve(fileLink.getRemotePath()).toFile());
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.api.base.file.FileService#loadSize(org.eclipse.mdm.api.base.
+ * model.Entity, org.eclipse.mdm.api.base.model.FileLink)
+ */
+ @Override
+ public void loadSize(Entity entity, FileLink fileLink) throws IOException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.api.base.file.FileService#uploadSequential(org.eclipse.mdm.
+ * api.base.model.Entity, java.util.Collection,
+ * org.eclipse.mdm.api.base.file.FileService.ProgressListener)
+ */
+ @Override
+ public void uploadSequential(Entity entity, Collection<FileLink> fileLinks, ProgressListener progressListener)
+ throws IOException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.api.base.file.FileService#uploadParallel(org.eclipse.mdm.api.
+ * base.model.Entity, java.util.Collection,
+ * org.eclipse.mdm.api.base.file.FileService.ProgressListener)
+ */
+ @Override
+ public void uploadParallel(Entity entity, Collection<FileLink> fileLinks, ProgressListener progressListener)
+ throws IOException {
+ // TODO Auto-generated method stub
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.api.base.file.FileService#delete(org.eclipse.mdm.api.base.
+ * model.Entity, java.util.Collection)
+ */
+ @Override
+ public void delete(Entity entity, Collection<FileLink> fileLinks) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.api.base.file.FileService#delete(org.eclipse.mdm.api.base.
+ * model.Entity, org.eclipse.mdm.api.base.model.FileLink)
+ */
+ @Override
+ public void delete(Entity entity, FileLink fileLink) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
diff --git a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/InsertStatement.java b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/InsertStatement.java
index 730f09e..f71916c 100644
--- a/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/InsertStatement.java
+++ b/org.eclipse.mdm.api.atfxadapter/src/main/java/org/eclipse/mdm/api/atfxadapter/transaction/InsertStatement.java
@@ -245,8 +245,7 @@
Filter filter = Filter.idsOnly(parentRelation, sortIndexTestSteps.keySet());
for (Result result : query.fetch(filter)) {
Record record = result.getRecord(testStep);
- int sortIndex = (Integer) record.getValues()
- .get(ODSConverter.getColumnName(attrSortIndex, Aggregation.MAXIMUM)).extract();
+ int sortIndex = result.getValue(attrSortIndex, Aggregation.MAXIMUM).extract();
sortIndexTestSteps.remove(record.getID(parentRelation).get()).setIndices(sortIndex + 1);
}
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdaperTest.java b/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdaperTest.java
index 750a792..10aec8a 100644
--- a/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdaperTest.java
+++ b/org.eclipse.mdm.api.atfxadapter/src/test/java/org/eclipse/mdm/api/atfxadapter/AtfxAdaperTest.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*
- ********************************************************************************/
+ ********************************************************************************/
package org.eclipse.mdm.api.atfxadapter;
import static org.assertj.core.api.Assertions.assertThat;
@@ -19,14 +19,17 @@
import java.util.Map;
import org.assertj.core.api.Assertions;
+import org.assertj.core.groups.Tuple;
import org.eclipse.mdm.api.base.ConnectionException;
import org.eclipse.mdm.api.base.massdata.ReadRequest;
import org.eclipse.mdm.api.base.model.Channel;
import org.eclipse.mdm.api.base.model.ChannelGroup;
import org.eclipse.mdm.api.base.model.ContextRoot;
import org.eclipse.mdm.api.base.model.ContextType;
+import org.eclipse.mdm.api.base.model.FileLink;
import org.eclipse.mdm.api.base.model.MeasuredValues;
import org.eclipse.mdm.api.base.model.Measurement;
+import org.eclipse.mdm.api.base.model.MimeType;
import org.eclipse.mdm.api.base.model.Test;
import org.eclipse.mdm.api.base.model.TestStep;
import org.eclipse.mdm.api.base.model.ValueType;
@@ -97,6 +100,17 @@
}
@org.junit.Test
+ public void testLoadTestStepWithExtRef() {
+
+ EntityManager em = context.getEntityManager().get();
+
+ assertThat(em.load(TestStep.class, "1").getFileLinks())
+ .extracting(FileLink::getFileName, FileLink::getDescription, FileLink::getMimeType)
+ .contains(Tuple.tuple("extref.txt", "a simple text file", new MimeType("text/plain")),
+ Tuple.tuple("openmdm.png", "openMDM Logo", new MimeType("image/png")));
+ }
+
+ @org.junit.Test
public void testLoadAllMeasurements() {
EntityManager em = context.getEntityManager().get();
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/resources/Right_Acc.atfx b/org.eclipse.mdm.api.atfxadapter/src/test/resources/Right_Acc.atfx
index a044f4f..f9594cc 100644
--- a/org.eclipse.mdm.api.atfxadapter/src/test/resources/Right_Acc.atfx
+++ b/org.eclipse.mdm.api.atfxadapter/src/test/resources/Right_Acc.atfx
@@ -2679,6 +2679,18 @@
<DateCreated>20140314170908</DateCreated>
<Optional>true</Optional>
<Sortindex>40</Sortindex>
+ <MDMLinks>
+ <external_reference>
+ <description>a simple text file</description>
+ <mimetype>text/plain</mimetype>
+ <location>extref.txt</location>
+ </external_reference>
+ <external_reference>
+ <description>openMDM Logo</description>
+ <mimetype>image/png</mimetype>
+ <location>openmdm.png</location>
+ </external_reference>
+ </MDMLinks>
<Test>1</Test>
<MeaResults>1</MeaResults>
</TestStep>
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/resources/extref.txt b/org.eclipse.mdm.api.atfxadapter/src/test/resources/extref.txt
new file mode 100644
index 0000000..9097b52
--- /dev/null
+++ b/org.eclipse.mdm.api.atfxadapter/src/test/resources/extref.txt
@@ -0,0 +1 @@
+This is a external reference file.
\ No newline at end of file
diff --git a/org.eclipse.mdm.api.atfxadapter/src/test/resources/openmdm.png b/org.eclipse.mdm.api.atfxadapter/src/test/resources/openmdm.png
new file mode 100644
index 0000000..437bb58
--- /dev/null
+++ b/org.eclipse.mdm.api.atfxadapter/src/test/resources/openmdm.png
Binary files differ
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyService.java b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyService.java
index dc13035..bbac60e 100644
--- a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyService.java
+++ b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyService.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -19,4 +19,5 @@
ApiCopyTask newApiCopyTask(ApplicationContext src, ApplicationContext dst);
ApiCopyTask newApiCopyTask(ApplicationContext src, ApplicationContext dst, TemplateManager templateManager);
+
}
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyServiceImpl.java b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyServiceImpl.java
index 8da8a4e..b05e47a 100644
--- a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyServiceImpl.java
+++ b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyServiceImpl.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -22,11 +22,12 @@
@Override
public ApiCopyTask newApiCopyTask(ApplicationContext src, ApplicationContext dst) {
- return newApiCopyTask(src, dst, new DefaultTemplateManager());
+ return newApiCopyTask(src, dst, new DefaultTemplateManager());
}
@Override
public ApiCopyTask newApiCopyTask(ApplicationContext src, ApplicationContext dst, TemplateManager templateManager) {
return new ImportTask(src, dst, templateManager);
}
+
}
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyTask.java b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyTask.java
index de569b8..b6e61b0 100644
--- a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyTask.java
+++ b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ApiCopyTask.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -14,9 +14,33 @@
package org.eclipse.mdm.apicopy.control;
import java.util.List;
+import java.util.Map;
import org.eclipse.mdm.api.base.model.Entity;
public interface ApiCopyTask {
+
void copy(List<? extends Entity> entities);
+
+ /**
+ * Setting a optional mapping of source unit names to target unit names
+ *
+ * @param unitMapping key = source unit name, value = target unit name
+ */
+ void setUnitMapping(Map<String, String> unitMapping);
+
+ /**
+ * Setting a optional mapping of source quantity names to target quantity names
+ *
+ * @param quantityMapping key = source quantity name, value = target quantity
+ * name
+ */
+ void setQuantityMapping(Map<String, String> quantityMapping);
+
+ /**
+ * setting a map with properties to configure the transfer task
+ *
+ * @param properties
+ */
+ void setProperties(Map<String, String> properties);
}
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/EntityHolder.java b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/EntityHolder.java
index 12d711a..01d4eac 100644
--- a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/EntityHolder.java
+++ b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/EntityHolder.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -136,4 +136,8 @@
return true;
}
+ @Override
+ public String toString() {
+ return String.format("%s.%s.%s", getEntity().getSourceName(), getEntity().getTypeName(), getEntity().getID());
+ }
}
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ExportTask.java b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ExportTask.java
index c35ebd7..43261e4 100644
--- a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ExportTask.java
+++ b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ExportTask.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -108,7 +108,7 @@
LOG.trace("Exporting Project '{}'", projectSrc.getName());
Project projectDst = entityFactoryDst.createProject(projectSrc.getName());
- copyValues(projectSrc, projectDst, Arrays.asList("Id", "Name"));
+ copyValues(projectSrc, projectDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, projectDst);
@@ -137,7 +137,7 @@
Pool poolDst = entityFactoryDst.createPool(poolSrc.getName(), projectParentDst);
- copyValues(poolSrc, poolDst, Arrays.asList("Id", "Name"));
+ copyValues(poolSrc, poolDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, poolDst);
@@ -166,7 +166,7 @@
Test testDst = entityFactoryDst.createTest(testSrc.getName(), poolParentDst);
- copyValues(testSrc, testDst, Arrays.asList("Id", "Name"));
+ copyValues(testSrc, testDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, testDst);
@@ -195,7 +195,7 @@
TestStep testStepDst = entityFactoryDst.createTestStep(testStepSrc.getName(), testParentDst);
- copyValues(testStepSrc, testStepDst, Arrays.asList("Id", "Name"));
+ copyValues(testStepSrc, testStepDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, testStepDst);
@@ -231,7 +231,7 @@
Measurement measurementDst = entityFactoryDst.createMeasurement(measurementSrc.getName(),
testStepParentDst);
- copyValues(measurementSrc, measurementDst, Arrays.asList("Id", "Name"));
+ copyValues(measurementSrc, measurementDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, measurementDst);
@@ -296,13 +296,13 @@
throw new ApiCopyException("ContextDescribable must be of instance TestStep or Measurement!");
}
- copyValues(root, rootDst, Arrays.asList("Id", "Name"));
+ copyValues(root, rootDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, rootDst);
for (ContextComponent comp : root.getContextComponents()) {
LOG.trace("Exporting ContextComponent '{}'", comp.getName());
rootDst.getContextComponent(comp.getName()).ifPresent(c -> {
- copyValues(comp, c, Arrays.asList("Id", "Name"));
+ copyValues(comp, c, Arrays.asList("Id", "Name"), false, false);
persist(transaction, c);
});
}
@@ -315,7 +315,7 @@
ContextSensor sensorDst = parentDst.getContextSensor(sensor.getName()).orElseThrow(
() -> new ApiCopyException("ContextSensor '" + sensor.getName() + "' not found in target!"));
- copyValues(sensor, sensorDst, Arrays.asList("Id", "Name"));
+ copyValues(sensor, sensorDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, sensorDst);
}
}
@@ -344,7 +344,7 @@
.orElseGet(() -> entityFactoryDst.createPhysicalDimension(physicalDimensionSrc.getName()));
if (isNewEntity(physicalDimensionDst)) {
- copyValues(physicalDimensionSrc, physicalDimensionDst, Arrays.asList("Id", "Name"));
+ copyValues(physicalDimensionSrc, physicalDimensionDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, physicalDimensionDst);
}
@@ -352,7 +352,7 @@
.orElseGet(() -> entityFactoryDst.createUnit(unitSrc.getName(), physicalDimensionDst));
if (isNewEntity(unitDst)) {
- copyValues(unitSrc, unitDst, Arrays.asList("Id", "Name"));
+ copyValues(unitSrc, unitDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, unitDst);
}
@@ -360,14 +360,14 @@
.orElseGet(() -> entityFactoryDst.createQuantity(quantitySrc.getName(), unitDst));
if (isNewEntity(quantityDst)) {
- copyValues(quantitySrc, quantityDst, Arrays.asList("Id", "Name"));
+ copyValues(quantitySrc, quantityDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, quantityDst);
}
Channel channelDst = entityFactoryDst.createChannel(channelSrc.getName(), measurementParentDst,
quantityDst);
- copyValues(channelSrc, channelDst, Arrays.asList("Id", "Name"));
+ copyValues(channelSrc, channelDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, channelDst);
@@ -393,7 +393,7 @@
ChannelGroup channelGroupDst = entityFactoryDst.createChannelGroup(channelGroupSrc.getName(),
channelGroupSrc.getNumberOfValues(), measurementParentDst);
- copyValues(channelGroupSrc, channelGroupDst, Arrays.asList("Id", "Name"));
+ copyValues(channelGroupSrc, channelGroupDst, Arrays.asList("Id", "Name"), false, false);
persist(transaction, channelGroupDst);
@@ -457,4 +457,28 @@
}
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.apicopy.control.ApiCopyTask#setUnitMapping(java.util.Map)
+ */
+ @Override
+ public void setUnitMapping(Map<String, String> unitMapping) {
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.apicopy.control.ApiCopyTask#setQuantityMapping(java.util.Map)
+ */
+ @Override
+ public void setQuantityMapping(Map<String, String> quantityMapping) {
+ }
+
+ @Override
+ public void setProperties(Map<String, String> properties) {
+ }
+
}
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ImportTask.java b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ImportTask.java
index eb56de8..698518d 100644
--- a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ImportTask.java
+++ b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/ImportTask.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -15,8 +15,10 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -31,7 +33,6 @@
import org.eclipse.mdm.api.base.model.Channel;
import org.eclipse.mdm.api.base.model.ChannelGroup;
import org.eclipse.mdm.api.base.model.ContextComponent;
-import org.eclipse.mdm.api.base.model.ContextDescribable;
import org.eclipse.mdm.api.base.model.ContextRoot;
import org.eclipse.mdm.api.base.model.ContextType;
import org.eclipse.mdm.api.base.model.Entity;
@@ -61,12 +62,66 @@
import com.google.common.collect.ListMultimap;
public class ImportTask extends TransferBase implements ApiCopyTask {
+
+ /**
+ * Property to configure to overwrite the existing test step
+ *
+ * Default: false
+ *
+ * If true and the matching target test step exists, context data will be
+ * overwriten and the measurements will be imported as childs of the existing
+ * teststep.
+ *
+ * Otherwise a new test step will be created
+ */
+ private static final String PROPERTY_OVERWRITE_EXISTING_ELEMENTS = "overwriteExistingElements";
+ private static final String DEFAULT_OVERWRITE_EXISTING_ELEMENTS = "false";
+
+ /**
+ * Property to configure that existing measured values will be appended
+ *
+ * Default: false
+ *
+ * If true the measured value of the import data set will be appended to the
+ * existing. That means, if the target measurement already exists the importer
+ * will add the measured values of the source column to the target column. If at
+ * the the target measurement the column not exists, the importer create a new
+ * one, add first invalid values with the count of the target submatrix size,
+ * and add there the source values.
+ *
+ * If false and the target measurement already exists, the import task will be
+ * canceled
+ */
+ private static final String PROPERTY_APPEND = "append";
+ private static final String DEFAULT_APPEND = "false";
+
+ /**
+ * Property to configure that existing file links will be replaced
+ *
+ * Default: false
+ *
+ * If true, file links of the target entities will be replaced, if in the source
+ * the file link exists
+ *
+ * Otherwise new file links will be added to the existing sequence.
+ */
+ private static final String PROPERTY_REPLACE_FILELINKS = "replaceFileLinks";
+ private static final String DEFAULT_REPLACE_FILES = "false";
+
private static final Logger LOG = LoggerFactory.getLogger(ImportTask.class);
private SearchService searchServiceDst;
private ClassificationUtil classificationUtil;
private TemplateManager templateManager;
+ private Map<String, String> quantityMapping = new HashMap<>();
+
+ private Map<String, String> unitMapping = new HashMap<>();
+
+ private Map<String, String> properties = new HashMap<>();
+
+ private boolean replaceFileLinks = false;
+
public ImportTask(ApplicationContext src, ApplicationContext dst, TemplateManager templateManager) {
super(src, dst);
@@ -78,7 +133,28 @@
} else {
this.templateManager = templateManager;
}
+ }
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.apicopy.control.ApiCopyTask#setUnitMapping(java.util.Map)
+ */
+ @Override
+ public void setUnitMapping(Map<String, String> unitMapping) {
+ this.unitMapping = unitMapping;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.mdm.apicopy.control.ApiCopyTask#setQuantityMapping(java.util.Map)
+ */
+ @Override
+ public void setQuantityMapping(Map<String, String> quantityMapping) {
+ this.quantityMapping = quantityMapping;
}
@Override
@@ -95,16 +171,20 @@
LOG.trace("Export entities: {}", entities);
entities.forEach(e -> copyEntity(e, true, transaction));
transaction.commit();
+ deleteFilesOfReplacedFileLinks();
} catch (Exception exc) {
try {
transaction.abort();
} catch (Exception exc2) {
LOG.error("Could not abort transaction!");
}
+ deleteFilesOfUploadedFileLinks();
- throw new ApiCopyException("Could not copy data.", exc);
+ throw new ApiCopyException("Could not copy data: " + exc.getMessage(), exc);
} finally {
classificationUtil.clearCache();
+ clearReplacedFileLinkCache();
+ clearUploadedFileLinkCache();
}
}
@@ -138,7 +218,7 @@
Project projectDst = fetchOne(searchServiceDst, Project.class, filter)
.orElseGet(() -> entityFactoryDst.createProject(projectSrc.getName()));
- copyValues(projectSrc, projectDst, Arrays.asList("Id", "Name"));
+ copyValues(projectSrc, projectDst, Arrays.asList("Id", "Name"), false, replaceFileLinks);
persist(transaction, projectDst);
@@ -179,7 +259,7 @@
Pool poolDst = fetchOne(searchServiceDst, Pool.class, filter)
.orElseGet(() -> entityFactoryDst.createPool(poolSrc.getName(), projectParentDst));
- copyValues(poolSrc, poolDst, Arrays.asList("Id", "Name"));
+ copyValues(poolSrc, poolDst, Arrays.asList("Id", "Name"), false, replaceFileLinks);
persist(transaction, poolDst);
@@ -236,7 +316,7 @@
classificationUtil.getClassification(rootProjectName), false));
}
- copyValues(testSrc, testDst, Arrays.asList("Id", "Name"));
+ copyValues(testSrc, testDst, Arrays.asList("Id", "Name"), true, replaceFileLinks);
// copy responsible person:
Optional<User> userSrc = testSrc.getResponsiblePerson();
@@ -298,25 +378,37 @@
TestStep testStepDst = fetchOne(searchServiceDst, TestStep.class, filter).orElseGet(() -> {
if (templateTestStep.isPresent() && hasContextData(testStepSrc)) {
+ LOG.trace("Importing TestStep '{}' using TestStepTemplate '{}' and create context roots",
+ testStepSrc.getName(), templateTestStep.get().getName());
+ return entityFactoryDst.createTestStep(testDst, templateTestStep.get(),
+ classificationUtil.getClassification(rootProjectName));
+ } else if (templateTestStep.isPresent()) {
LOG.trace("Importing TestStep '{}' using TestStepTemplate '{}'", testStepSrc.getName(),
templateTestStep.get().getName());
- return entityFactoryDst.createTestStep(testDst, templateTestStep.get(),
+ return entityFactoryDst.createTestStepWithOutContextRoots(testDst, templateTestStep.get(),
classificationUtil.getClassification(rootProjectName));
} else {
LOG.trace("Importing TestStep '{}' using no TestStepTemplate", testStepSrc.getName());
- return entityFactoryDst.createTestStep(testStepSrc.getName(), testDst,
+ TestStep createdTestStep = entityFactoryDst.createTestStep(testStepSrc.getName(), testDst,
classificationUtil.getClassification(rootProjectName));
+ Value value = createdTestStep.getValue("TplTestStep");
+ return createdTestStep;
}
});
- copyValues(testStepSrc, testStepDst, Arrays.asList("Id"));
+ copyValues(testStepSrc, testStepDst, Arrays.asList("Id"), true, replaceFileLinks);
persist(transaction, testStepDst);
ehDst = new EntityHolder(testStepDst, entityManagerDst);
mapSrcDstEntities.put(ehSrc, ehDst);
- copyContext(testStepSrc, testStepDst, templateTestStep, transaction);
+ Map<ContextType, ContextRoot> mapContextRootsSrc = testStepSrc.loadContexts(entityManagerSrc,
+ ContextType.values());
+ Map<ContextType, ContextRoot> mapContextRootsDst = testStepDst.loadContexts(entityManagerDst,
+ ContextType.values());
+
+ copyContext(mapContextRootsSrc, mapContextRootsDst, templateTestStep, transaction);
if (recursive) {
List<ContextRoot> listContextRoots = new ArrayList<>();
@@ -396,19 +488,36 @@
String rootProjectName = getProjectName(testStepSrc);
+ Filter filter = Filter.nameOnly(etTestStep, testStepSrc.getName()).id(relTest, testDst.getID());
+ Optional<TestStep> oTestSTepDst = fetchOne(searchServiceDst, TestStep.class, filter);
+
TestStep testStepDst;
- if (templateTestStep.isPresent() && hasContextData(testStepSrc)) {
- LOG.trace("Importing TestStep '{}' using TestStepTemplate '{}'", testStepSrc.getName(),
- templateTestStep.get().getName());
- testStepDst = entityFactoryDst.createTestStep(testDst, templateTestStep.get(),
- classificationUtil.getClassification(rootProjectName));
+
+ boolean overwriteExistingElements = Boolean.valueOf(
+ properties.getOrDefault(PROPERTY_OVERWRITE_EXISTING_ELEMENTS, DEFAULT_OVERWRITE_EXISTING_ELEMENTS));
+
+ if (!overwriteExistingElements || (overwriteExistingElements && !oTestSTepDst.isPresent())) {
+ if (templateTestStep.isPresent() && hasContextData(testStepSrc)) {
+ LOG.trace("Importing TestStep '{}' using TestStepTemplate '{}' and create context roots",
+ testStepSrc.getName(), templateTestStep.get().getName());
+ testStepDst = entityFactoryDst.createTestStep(testDst, templateTestStep.get(),
+ classificationUtil.getClassification(rootProjectName));
+ testStepDst.setName(testStepSrc.getName());
+ } else if (templateTestStep.isPresent()) {
+ LOG.trace("Importing TestStep '{}' using TestStepTemplate '{}' and create context roots",
+ testStepSrc.getName(), templateTestStep.get().getName());
+ testStepDst = entityFactoryDst.createTestStepWithOutContextRoots(testDst, templateTestStep.get(),
+ classificationUtil.getClassification(rootProjectName));
+ } else {
+ LOG.trace("Importing TestStep '{}' using no TestStepTemplate", testStepSrc.getName());
+ testStepDst = entityFactoryDst.createTestStep(testStepSrc.getName(), testDst,
+ classificationUtil.getClassification(rootProjectName));
+ }
} else {
- LOG.trace("Importing TestStep '{}' using no TestStepTemplate", testStepSrc.getName());
- testStepDst = entityFactoryDst.createTestStep(testSrc.getName(), testDst,
- classificationUtil.getClassification(rootProjectName));
+ testStepDst = oTestSTepDst.get();
}
- copyValues(testStepSrc, testStepDst, Arrays.asList("Id"));
+ copyValues(testStepSrc, testStepDst, Arrays.asList("Id"), true, replaceFileLinks);
listTestStepsDst.add(testStepDst);
@@ -421,7 +530,11 @@
.filter(n -> n.getName().equals(testStepSrc.getName())).findFirst();
if (testStepDst.isPresent()) {
- copyContext(testStepSrc, testStepDst.get(), loadTemplateTestStep(testStepSrc), transaction);
+ Map<ContextType, ContextRoot> mapContextRootsSrc = testStepSrc.loadContexts(entityManagerSrc,
+ ContextType.values());
+ Map<ContextType, ContextRoot> mapContextRootsDst = testStepDst.get().loadContexts(entityManagerDst,
+ ContextType.values());
+ copyContext(mapContextRootsSrc, mapContextRootsDst, loadTemplateTestStep(testStepSrc), transaction);
}
}
@@ -438,18 +551,16 @@
return listTestStepsDst;
}
- private void copyContext(ContextDescribable contextDescribableSrc, ContextDescribable contextDescribableDst,
- Optional<TemplateTestStep> optTemplateTestStep, Transaction transaction) {
- Map<ContextType, ContextRoot> mapContextRootsDst = contextDescribableDst.loadContexts(entityManagerDst,
- ContextType.values());
+ private void copyContext(Map<ContextType, ContextRoot> mapContextRootsSrc,
+ Map<ContextType, ContextRoot> mapContextRootsDst, Optional<TemplateTestStep> optTemplateTestStep,
+ Transaction transaction) {
- for (Map.Entry<ContextType, ContextRoot> me : contextDescribableSrc
- .loadContexts(entityManagerSrc, ContextType.values()).entrySet()) {
+ for (Map.Entry<ContextType, ContextRoot> me : mapContextRootsSrc.entrySet()) {
LOG.trace("Importing ContextRoot '{}'", me.getKey());
ContextRoot contextRootDst = mapContextRootsDst.get(me.getKey());
if (null != contextRootDst && contextRootDst.getName().equals(me.getValue().getName())) {
ContextRoot contextRootSrc = me.getValue();
- copyValues(contextRootSrc, contextRootDst, Arrays.asList("Id", "Name"));
+ copyValues(contextRootSrc, contextRootDst, Arrays.asList("Id", "Name"), false, replaceFileLinks);
TemplateRoot templateRootDst = null;
@@ -467,7 +578,8 @@
if (o.isPresent()) {
ContextComponent contextComponentDst = o.get();
- copyValues(contextComponentSrc, contextComponentDst, Arrays.asList("Id", "Name"));
+ copyValues(contextComponentSrc, contextComponentDst, Arrays.asList("Id", "Name"), true,
+ replaceFileLinks);
} else if (null != templateRootDst) {
Optional<TemplateComponent> optTemplateComponent = templateRootDst
@@ -479,7 +591,8 @@
ContextComponent contextComponentDst = entityFactoryDst
.createContextComponent(contextComponentSrc.getName(), contextRootDst);
- copyValues(contextComponentSrc, contextComponentDst, Arrays.asList("Id", "Name"));
+ copyValues(contextComponentSrc, contextComponentDst, Arrays.asList("Id", "Name"), true,
+ replaceFileLinks);
persist(transaction, contextComponentDst);
}
@@ -496,6 +609,8 @@
EntityHolder ehDst = mapSrcDstEntities.get(ehSrc);
+ boolean append = Boolean.valueOf(properties.getOrDefault(PROPERTY_APPEND, DEFAULT_APPEND));
+
if (null == ehDst) {
LOG.trace("Importing Measurement '{}'", measurementSrc.getName());
TestStep testStepSrs = entityManagerSrc.loadParent(measurementSrc, TestStep.class).get();
@@ -514,6 +629,18 @@
Filter filter = Filter.nameOnly(etMeasurement, measurementSrc.getName()).id(relTestStep,
testStepParentDst.getID());
+ Optional<Measurement> optMeasurement = fetchOne(searchServiceDst, Measurement.class, filter);
+ Measurement measurementDst = null;
+
+ if (optMeasurement.isPresent() && !append) {
+ throw new ApiCopyException(String.format("TestStep '%s' has already a measurement with name '%s'!",
+ testStepParentDst.getName(), measurementSrc.getName()));
+ } else if (optMeasurement.isPresent()) {
+ measurementDst = optMeasurement.get();
+ } else {
+ append = false;
+ }
+
Optional<TemplateTestStep> optTemplateTestStep = loadTemplateTestStep(testStepSrs);
// If no ContextRoots to use with the newly created Measurement are passed into
@@ -555,31 +682,68 @@
.forEach(tr -> listContextRootsDst.add(entityFactoryDst.createContextRoot(tr)));
}
- Measurement measurementDst = fetchOne(searchServiceDst, Measurement.class, filter)
- .orElseGet(() -> entityFactoryDst.createMeasurement(measurementSrc.getName(), testStepParentDst,
- listContextRootsDst.toArray(new ContextRoot[listContextRootsDst.size()])));
+ if (measurementDst == null) {
+ measurementDst = entityFactoryDst.createMeasurement(measurementSrc.getName(), testStepParentDst,
+ listContextRootsDst.toArray(new ContextRoot[listContextRootsDst.size()]));
+ }
- copyValues(measurementSrc, measurementDst, Arrays.asList("Id", "Name"));
+ copyValues(measurementSrc, measurementDst, Arrays.asList("Id", "Name"), true, replaceFileLinks);
ehDst = new EntityHolder(measurementDst, entityManagerDst);
mapSrcDstEntities.put(ehSrc, ehDst);
- copyContext(measurementSrc, measurementDst, optTemplateTestStep, transaction);
+ Map<ContextType, ContextRoot> mapContextRootsSrc = testStepParentDst.loadContexts(entityManagerDst,
+ ContextType.values());
+ Map<ContextType, ContextRoot> mapContextRootsDst = measurementDst.loadContexts(entityManagerDst,
+ ContextType.values());
+
+ copyContext(mapContextRootsSrc, mapContextRootsDst, optTemplateTestStep, transaction);
+
+ mapContextRootsSrc = measurementSrc.loadContexts(entityManagerSrc, ContextType.values());
+ mapContextRootsDst = measurementDst.loadContexts(entityManagerDst, ContextType.values());
+ copyContext(mapContextRootsSrc, mapContextRootsDst, optTemplateTestStep, transaction);
persist(transaction, measurementDst);
+ Iterator<ContextRoot> contextRootIter = mapContextRootsDst.values().iterator();
+
+ while (contextRootIter.hasNext()) {
+ ContextRoot contextRootForUpdate = contextRootIter.next();
+ persist(transaction, contextRootForUpdate);
+ }
+
if (recursive) {
List<WriteRequest> listWriteRequests = new ArrayList<>();
Map<String, Channel> mapChannels = new HashMap<>();
+ if (append && !isSrcChannelsValid(entityManagerSrc.loadChildren(measurementSrc, Channel.class),
+ entityManagerDst.loadChildren(measurementDst, Channel.class))) {
+ throw new ApiCopyException(
+ "Appending not possible. All channels of existing measurement have to be in the source measurement");
+ }
+
for (Channel channel : entityManagerSrc.loadChildren(measurementSrc, Channel.class)) {
Channel channelDst = copyChannel(channel, transaction);
mapChannels.put(channel.getName(), channelDst);
}
for (ChannelGroup channelGroup : entityManagerSrc.loadChildren(measurementSrc, ChannelGroup.class)) {
- ChannelGroup channelGroupDst = copyChannelGroup(channelGroup, transaction);
+ Map<String, MeasuredValues> existingMeasValuesToAppend = new HashMap<>();
+
+ Integer numberOfValues = 0;
+ if (append) {
+ Optional<ChannelGroup> optChannelGroup = fetchOneChannelGroup(channelGroup);
+
+ if (optChannelGroup.isPresent()) {
+ numberOfValues = optChannelGroup.get().getNumberOfValues();
+ existingMeasValuesToAppend = getMeasurementValuesMap(entityManagerDst,
+ optChannelGroup.get());
+ }
+
+ }
+
+ ChannelGroup channelGroupDst = copyChannelGroup(channelGroup, transaction, append);
for (MeasuredValues measuredValues : entityManagerSrc.readMeasuredValues(ReadRequest
.create(channelGroup).valuesMode(ValuesMode.STORAGE).allChannels().allValues())) {
@@ -591,7 +755,34 @@
Channel channelDst = mapChannels.get(measuredValues.getName());
+ String mappedUnit = unitMapping.get(measuredValues.getUnit());
+
+ if (!Strings.isNullOrEmpty(mappedUnit)) {
+ measuredValues = MeasuredValuesHelper.mapUnitOfMeasuredValues(measuredValues, mappedUnit);
+ }
+
+ if (append) {
+
+ channelDst = replaceChannelDst(channelDst, measurementDst, ehSrc, transaction);
+
+ MeasuredValues measuredValuesOld = existingMeasValuesToAppend.get(channelDst.getName());
+
+ if (measuredValuesOld == null) {
+ measuredValuesOld = MeasuredValuesHelper.createEmptyValues(measuredValues.getName(),
+ measuredValues.getScalarType(), measuredValues.getUnit(),
+ measuredValues.getSequenceRepresentation(),
+ measuredValues.getGenerationParameters(), measuredValues.isIndependent(),
+ measuredValues.getAxisType(), numberOfValues);
+
+ }
+
+ measuredValues = MeasuredValuesHelper.appenMeasuredValues(measuredValuesOld,
+ measuredValues);
+
+ }
+
listWriteRequests.add(createWriteRequest(channelGroupDst, channelDst, measuredValues));
+
}
}
@@ -602,6 +793,47 @@
return (Measurement) ehDst.getEntity();
}
+ private boolean isSrcChannelsValid(List<Channel> channelsSrc, List<Channel> channelsDst) {
+ boolean isSrcChannelsValid = true;
+
+ Map<String, Channel> sourceMap = new HashMap<>();
+ channelsSrc.forEach(srcChannel -> sourceMap.put(srcChannel.getName(), srcChannel));
+
+ for (Channel channelDst : channelsDst) {
+ if (sourceMap.get(channelDst.getName()) == null) {
+ isSrcChannelsValid = false;
+ break;
+ }
+ }
+
+ return isSrcChannelsValid;
+ }
+
+ private Channel replaceChannelDst(Channel channelDst, Measurement measurementDst, EntityHolder ehSrc,
+ Transaction transaction) {
+ Channel channelNew = entityFactoryDst.createChannel(channelDst.getName(), measurementDst,
+ channelDst.getQuantity());
+
+ copyValues(channelDst, channelNew, Arrays.asList("Id"), false, replaceFileLinks);
+ persist(transaction, channelNew);
+ mapSrcDstEntities.put(ehSrc, new EntityHolder(channelNew, entityManagerDst));
+
+ transaction.delete(Collections.singletonList(channelDst));
+ return channelNew;
+ }
+
+ private Map<String, MeasuredValues> getMeasurementValuesMap(EntityManager entityManager,
+ ChannelGroup channelGroup) {
+
+ Map<String, MeasuredValues> returnVal = new HashMap<>();
+
+ for (MeasuredValues measuredValues : entityManager.readMeasuredValues(
+ ReadRequest.create(channelGroup).valuesMode(ValuesMode.STORAGE).allChannels().allValues())) {
+ returnVal.put(measuredValues.getName(), measuredValues);
+ }
+ return returnVal;
+ }
+
private Channel copyChannel(Channel channelSrc, Transaction transaction) {
EntityHolder ehSrc = new EntityHolder(channelSrc, entityManagerSrc);
@@ -629,11 +861,16 @@
* org.eclipse.mdm.api.dflt.EntityManager.loadLatestValid(Class<T>, String) Bug:
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=553368
*/
- Quantity quantity = entityManagerDst.loadAll(Quantity.class, channelSrc.getQuantity().getName()).stream()
- .filter(q -> q.getValue(Versionable.ATTR_VERSION_STATE).extract() == VersionState.VALID)
+
+ Quantity quantity = entityManagerDst
+ .loadAll(Quantity.class,
+ quantityMapping.getOrDefault(channelSrc.getQuantity().getName(),
+ channelSrc.getQuantity().getName()))
+ .stream().filter(q -> q.getValue(Versionable.ATTR_VERSION_STATE).extract() == VersionState.VALID)
.sorted(Comparator.comparing(q -> Integer.valueOf(q.getValue(Versionable.ATTR_VERSION).extract())))
.findFirst().orElseThrow(() -> new ApiCopyException(String
- .format("Cannot find Quantity %s in destination!", channelSrc.getQuantity().getName())));
+ .format("Cannot find Quantity with name '%s' in destination!",
+ channelSrc.getQuantity().getName())));
Filter filter = Filter.nameOnly(etChannel, channelSrc.getName()).id(relMeasurement,
measurementParentDst.getID());
@@ -641,7 +878,7 @@
Channel channelDst = fetchOne(searchServiceDst, Channel.class, filter).orElseGet(
() -> entityFactoryDst.createChannel(channelSrc.getName(), measurementParentDst, quantity));
- copyValues(channelSrc, channelDst, Arrays.asList("Id"));
+ copyValues(channelSrc, channelDst, Arrays.asList("Id"), false, replaceFileLinks);
persist(transaction, channelDst);
@@ -652,7 +889,27 @@
return (Channel) ehDst.getEntity();
}
- private ChannelGroup copyChannelGroup(ChannelGroup channelGroupSrc, Transaction transaction) {
+ private Optional<ChannelGroup> fetchOneChannelGroup(ChannelGroup channelGroupSrc) {
+ Measurement measurementParentDst = (Measurement) mapSrcDstEntities
+ .get(new EntityHolder(entityManagerSrc.loadParent(channelGroupSrc, Measurement.class).get(),
+ entityManagerSrc))
+ .getEntity();
+ EntityType etChannelGroup = modelManagerDst.getEntityType(ChannelGroup.class);
+ EntityType etMeasurement = modelManagerDst.getEntityType(Measurement.class);
+
+ Relation relMeasurement = etChannelGroup.getRelation(etMeasurement);
+
+ if (null == relMeasurement) {
+ throw new ApiCopyException("No relation to MeaResult found at SubMatrix!");
+ }
+
+ Filter filter = Filter.nameOnly(etChannelGroup, channelGroupSrc.getName()).id(relMeasurement,
+ measurementParentDst.getID());
+
+ return fetchOne(searchServiceDst, ChannelGroup.class, filter);
+ }
+
+ private ChannelGroup copyChannelGroup(ChannelGroup channelGroupSrc, Transaction transaction, boolean append) {
EntityHolder ehSrc = new EntityHolder(channelGroupSrc, entityManagerSrc);
EntityHolder ehDst = mapSrcDstEntities.get(ehSrc);
@@ -673,14 +930,21 @@
throw new ApiCopyException("No relation to MeaResult found at SubMatrix!");
}
- Filter filter = Filter.nameOnly(etChannelGroup, channelGroupSrc.getName()).id(relMeasurement,
- measurementParentDst.getID());
+ Optional<ChannelGroup> channelGroupOptional = fetchOneChannelGroup(channelGroupSrc);
- ChannelGroup channelGroupDst = fetchOne(searchServiceDst, ChannelGroup.class, filter)
- .orElseGet(() -> entityFactoryDst.createChannelGroup(channelGroupSrc.getName(),
- channelGroupSrc.getNumberOfValues(), measurementParentDst));
+ ChannelGroup channelGroupDst = null;
- copyValues(channelGroupSrc, channelGroupDst, Arrays.asList("Id"));
+ if (append && channelGroupOptional.isPresent()) {
+ transaction.delete(Collections.singletonList(channelGroupOptional.get()));
+ channelGroupDst = entityFactoryDst.createChannelGroup(channelGroupSrc.getName(),
+ channelGroupSrc.getNumberOfValues(), measurementParentDst);
+ } else {
+ channelGroupDst = channelGroupOptional
+ .orElseGet(() -> entityFactoryDst.createChannelGroup(channelGroupSrc.getName(),
+ channelGroupSrc.getNumberOfValues(), measurementParentDst));
+ }
+
+ copyValues(channelGroupSrc, channelGroupDst, Arrays.asList("Id"), false, replaceFileLinks);
persist(transaction, channelGroupDst);
@@ -774,4 +1038,17 @@
}
return returnVal;
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.mdm.apicopy.control.ApiCopyTask#setProperties(java.util.Map)
+ */
+ @Override
+ public void setProperties(Map<String, String> properties) {
+ this.properties = properties;
+ this.replaceFileLinks = Boolean
+ .valueOf(this.properties.getOrDefault(PROPERTY_REPLACE_FILELINKS, DEFAULT_REPLACE_FILES));
+ }
+
}
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/MeasuredValuesDTO.java b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/MeasuredValuesDTO.java
new file mode 100644
index 0000000..abfece9
--- /dev/null
+++ b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/MeasuredValuesDTO.java
@@ -0,0 +1,51 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+package org.eclipse.mdm.apicopy.control;
+
+/**
+ * DTO Object which holds the pair of values and the corresponding flags
+ *
+ * @author Alexander Knoblauch
+ *
+ */
+public class MeasuredValuesDTO {
+
+ private final Object values;
+ private final boolean[] flags;
+
+ /**
+ * @param values
+ * @param flags
+ */
+ public MeasuredValuesDTO(Object values, boolean[] flags) {
+ super();
+ this.values = values;
+ this.flags = flags;
+ }
+
+ /**
+ * @return the values
+ */
+ public Object getValues() {
+ return values;
+ }
+
+ /**
+ * @return the flags
+ */
+ public boolean[] getFlags() {
+ return flags;
+ }
+
+}
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/MeasuredValuesHelper.java b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/MeasuredValuesHelper.java
new file mode 100644
index 0000000..eb12338
--- /dev/null
+++ b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/MeasuredValuesHelper.java
@@ -0,0 +1,514 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+package org.eclipse.mdm.apicopy.control;
+
+import java.time.LocalDateTime;
+import java.util.Arrays;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.eclipse.mdm.api.base.model.AxisType;
+import org.eclipse.mdm.api.base.model.DoubleComplex;
+import org.eclipse.mdm.api.base.model.FileLink;
+import org.eclipse.mdm.api.base.model.FloatComplex;
+import org.eclipse.mdm.api.base.model.MeasuredValues;
+import org.eclipse.mdm.api.base.model.MeasuredValues.ValueIterator;
+import org.eclipse.mdm.api.base.model.ScalarType;
+import org.eclipse.mdm.api.base.model.SequenceRepresentation;
+
+/**
+ * Helper class for measured values operations
+ *
+ * @author Alexander Knoblauch
+ *
+ */
+public class MeasuredValuesHelper {
+
+ /**
+ * Map measurement values to given unit
+ *
+ * @param measuredValues
+ * @param unitNew
+ * @return
+ */
+ public static MeasuredValues mapUnitOfMeasuredValues(MeasuredValues measuredValues, String unitNew) {
+
+ ScalarType scalarType = measuredValues.getScalarType();
+
+ MeasuredValuesDTO values = null;
+
+ if (scalarType.isString()) {
+ values = getStringValues(measuredValues);
+ } else if (scalarType.isDate()) {
+ values = getDateValues(measuredValues);
+ } else if (scalarType.isBoolean()) {
+ values = getBooleanValues(measuredValues);
+ } else if (scalarType.isByte()) {
+ values = getByteValues(measuredValues);
+ } else if (scalarType.isShort()) {
+ values = getShortValues(measuredValues);
+ } else if (scalarType.isInteger()) {
+ values = getIntegerValues(measuredValues);
+ } else if (scalarType.isLong()) {
+ values = getLongValues(measuredValues);
+ } else if (scalarType.isFloat()) {
+ values = getFloatValues(measuredValues);
+ } else if (scalarType.isDouble()) {
+ values = getDoubleValues(measuredValues);
+ } else if (scalarType.isByteStream()) {
+ values = getByteStreamValues(measuredValues);
+ } else if (scalarType.isFloatComplex()) {
+ values = getFloatComplexValues(measuredValues);
+ } else if (scalarType.isDoubleComplex()) {
+ values = getDoubleComplexValues(measuredValues);
+ } else if (scalarType.isFileLink()) {
+ values = getFileLinkValues(measuredValues);
+ } else if (scalarType.isBlob()) {
+ values = getBlobValues(measuredValues);
+ } else {
+ throw new IllegalStateException(
+ String.format("Unsupported ScalarType %s in MeasuredValues!", scalarType.name()));
+ }
+
+ return scalarType.createMeasuredValues(measuredValues.getName(), unitNew,
+ measuredValues.getSequenceRepresentation(), measuredValues.getGenerationParameters(),
+ measuredValues.isIndependent(), measuredValues.getAxisType(), values.getValues(), values.getFlags());
+
+ }
+
+ /**
+ * appending two measured values
+ *
+ * @param measuredValues1
+ * @param measuredValues2
+ * @return appended measured values
+ * @throws ApiCopyException if the {@link ScalarType}s or units are different
+ */
+ public static MeasuredValues appenMeasuredValues(MeasuredValues measuredValues1, MeasuredValues measuredValues2) {
+ ScalarType scalarType = measuredValues1.getScalarType();
+
+ if (!scalarType.equals(measuredValues2.getScalarType())) {
+ throw new ApiCopyException("Error at appending measured values, ScalarType is different!");
+ }
+
+ if (!measuredValues1.getUnit().equals(measuredValues2.getUnit())) {
+ throw new ApiCopyException("Error at appending measured values, Unit is different!");
+ }
+
+ Object valuesNew = null;
+ boolean[] flagsNew = new boolean[0];
+
+ if (scalarType.isString()) {
+ MeasuredValuesDTO values1 = getStringValues(measuredValues1);
+ MeasuredValuesDTO values2 = getStringValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((String[]) values1.getValues(), (String[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isDate()) {
+ MeasuredValuesDTO values1 = getDateValues(measuredValues1);
+ MeasuredValuesDTO values2 = getDateValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((LocalDateTime[]) values1.getValues(), (LocalDateTime[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isBoolean()) {
+ MeasuredValuesDTO values1 = getBooleanValues(measuredValues1);
+ MeasuredValuesDTO values2 = getBooleanValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((boolean[]) values1.getValues(), (boolean[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isByte()) {
+ MeasuredValuesDTO values1 = getByteValues(measuredValues1);
+ MeasuredValuesDTO values2 = getByteValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((byte[]) values1.getValues(), (byte[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isShort()) {
+ MeasuredValuesDTO values1 = getShortValues(measuredValues1);
+ MeasuredValuesDTO values2 = getShortValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((short[]) values1.getValues(), (short[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isInteger()) {
+ MeasuredValuesDTO values1 = getIntegerValues(measuredValues1);
+ MeasuredValuesDTO values2 = getIntegerValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((int[]) values1.getValues(), (int[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isLong()) {
+ MeasuredValuesDTO values1 = getLongValues(measuredValues1);
+ MeasuredValuesDTO values2 = getLongValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((long[]) values1.getValues(), (long[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isFloat()) {
+ MeasuredValuesDTO values1 = getFloatValues(measuredValues1);
+ MeasuredValuesDTO values2 = getFloatValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((float[]) values1.getValues(), (float[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isDouble()) {
+ MeasuredValuesDTO values1 = getDoubleValues(measuredValues1);
+ MeasuredValuesDTO values2 = getDoubleValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((double[]) values1.getValues(), (double[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isByteStream()) {
+ MeasuredValuesDTO values1 = getByteStreamValues(measuredValues1);
+ MeasuredValuesDTO values2 = getByteStreamValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((byte[][]) values1.getValues(), (byte[][]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isFloatComplex()) {
+ MeasuredValuesDTO values1 = getFloatComplexValues(measuredValues1);
+ MeasuredValuesDTO values2 = getFloatComplexValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((FloatComplex[]) values1.getValues(), (FloatComplex[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isDoubleComplex()) {
+ MeasuredValuesDTO values1 = getDoubleComplexValues(measuredValues1);
+ MeasuredValuesDTO values2 = getDoubleComplexValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((DoubleComplex[]) values1.getValues(), (DoubleComplex[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else if (scalarType.isFileLink()) {
+ MeasuredValuesDTO values1 = getFileLinkValues(measuredValues1);
+ MeasuredValuesDTO values2 = getFileLinkValues(measuredValues2);
+
+ valuesNew = ArrayUtils.addAll((FileLink[]) values1.getValues(), (FileLink[]) values2.getValues());
+ flagsNew = ArrayUtils.addAll(values1.getFlags(), values2.getFlags());
+ } else {
+ throw new IllegalStateException(
+ String.format("Unsupported ScalarType %s in MeasuredValues!", scalarType.name()));
+ }
+
+ return scalarType.createMeasuredValues(measuredValues1.getName(), measuredValues1.getUnit(),
+ measuredValues1.getSequenceRepresentation(), measuredValues1.getGenerationParameters(),
+ measuredValues1.isIndependent(), measuredValues1.getAxisType(), valuesNew, flagsNew);
+ }
+
+ /**
+ * Creating MeasueredValues with only invalid values
+ *
+ * @param name of the column
+ * @param scalarType the {@link ScalarType}
+ * @param unit of the values
+ * @param sequenceRepresentation the {@link SequenceRepresentation}
+ * @param generationParameters
+ * @param independent
+ * @param axisType the {@link AxisType}
+ * @param numberOfValues the number of the measured values
+ * @return {@link MeasuredValues} object, which includes only invalid values
+ */
+ public static MeasuredValues createEmptyValues(String name, ScalarType scalarType, String unit,
+ SequenceRepresentation sequenceRepresentation, double[] generationParameters, boolean independent,
+ AxisType axisType, int numberOfValues) {
+ boolean[] flags = new boolean[numberOfValues];
+ Arrays.fill(flags, false);
+
+ Object values = null;
+
+ if (scalarType.isString()) {
+ values = new String[numberOfValues];
+ } else if (scalarType.isDate()) {
+ values = new LocalDateTime[numberOfValues];
+ } else if (scalarType.isBoolean()) {
+ values = new boolean[numberOfValues];
+ } else if (scalarType.isByte()) {
+ values = new byte[numberOfValues];
+ } else if (scalarType.isShort()) {
+ values = new short[numberOfValues];
+ } else if (scalarType.isInteger()) {
+ values = new int[numberOfValues];
+ } else if (scalarType.isLong()) {
+ values = new long[numberOfValues];
+ } else if (scalarType.isFloat()) {
+ values = new float[numberOfValues];
+ } else if (scalarType.isDouble()) {
+ values = new double[numberOfValues];
+ } else if (scalarType.isByteStream()) {
+ values = new byte[numberOfValues][];
+ } else if (scalarType.isFloatComplex()) {
+ values = new FloatComplex[numberOfValues];
+ } else if (scalarType.isDoubleComplex()) {
+ values = new DoubleComplex[numberOfValues];
+ } else if (scalarType.isFileLink()) {
+ values = new FileLink[numberOfValues];
+ } else {
+ throw new IllegalStateException(
+ String.format("Unsupported ScalarType %s in MeasuredValues!", scalarType.name()));
+ }
+
+ return scalarType.createMeasuredValues(name, unit, sequenceRepresentation, generationParameters, independent,
+ axisType, values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType
+ * {@link String}
+ */
+ private static MeasuredValuesDTO getStringValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ String[] values = new String[length];
+ boolean[] flags = new boolean[length];
+
+ ValueIterator<String> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType
+ * {@link LocalDateTime}
+ */
+ private static MeasuredValuesDTO getDateValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ LocalDateTime[] values = new LocalDateTime[length];
+ boolean[] flags = new boolean[length];
+ ValueIterator<LocalDateTime> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType boolean
+ */
+ private static MeasuredValuesDTO getBooleanValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ boolean[] values = new boolean[length];
+ boolean[] flags = new boolean[length];
+ ValueIterator<Boolean> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType byte
+ */
+ private static MeasuredValuesDTO getByteValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ byte[] values = new byte[length];
+ boolean[] flags = new boolean[length];
+ ValueIterator<Byte> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType short
+ */
+ private static MeasuredValuesDTO getShortValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ short[] values = new short[length];
+ boolean[] flags = new boolean[length];
+ ValueIterator<Short> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType long
+ */
+ private static MeasuredValuesDTO getLongValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ long[] values = new long[length];
+ boolean[] flags = new boolean[length];
+ ValueIterator<Long> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType float
+ */
+ private static MeasuredValuesDTO getFloatValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ float[] values = new float[length];
+ boolean[] flags = new boolean[length];
+ ValueIterator<Float> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType int
+ */
+ private static MeasuredValuesDTO getIntegerValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ int[] values = new int[length];
+ boolean[] flags = new boolean[length];
+ ValueIterator<Integer> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType double
+ */
+ private static MeasuredValuesDTO getDoubleValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ double[] values = new double[length];
+ boolean[] flags = new boolean[length];
+ ValueIterator<Double> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType byte[]
+ */
+ private static MeasuredValuesDTO getByteStreamValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ byte[][] values = new byte[length][];
+ boolean[] flags = new boolean[length];
+ ValueIterator<byte[]> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType
+ * {@link FloatComplex}
+ */
+ private static MeasuredValuesDTO getFloatComplexValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ boolean[] flags = new boolean[length];
+ FloatComplex[] values = new FloatComplex[length];
+
+ ValueIterator<FloatComplex> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType
+ * {@link DoubleComplex}
+ */
+ private static MeasuredValuesDTO getDoubleComplexValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ boolean[] flags = new boolean[length];
+ DoubleComplex[] values = new DoubleComplex[length];
+
+ ValueIterator<DoubleComplex> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ /**
+ *
+ * @param measuredValues
+ * @return {@link MeasuredValuesDTO} values is an array of DataType
+ * {@link FileLink}
+ */
+ private static MeasuredValuesDTO getFileLinkValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ boolean[] flags = new boolean[length];
+ FileLink[] values = new FileLink[length];
+
+ ValueIterator<FileLink> iter = measuredValues.iterator();
+ int count = 0;
+ while (iter.hasNext()) {
+ flags[count] = iter.isValid();
+ values[count++] = iter.next();
+ }
+
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+ private static MeasuredValuesDTO getBlobValues(MeasuredValues measuredValues) {
+ int length = measuredValues.getLength();
+ boolean[] flags = new boolean[length];
+ ValueIterator<Object> iter = measuredValues.iterator();
+ Object values = null;
+ while (iter.hasNext()) {
+ values = iter.next();
+ }
+
+ return new MeasuredValuesDTO(values, flags);
+ }
+
+}
diff --git a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TransferBase.java b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TransferBase.java
index d69066e..d4f0b1e 100644
--- a/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TransferBase.java
+++ b/org.eclipse.mdm.apicopy/src/main/java/org/eclipse/mdm/apicopy/control/TransferBase.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -13,9 +13,12 @@
********************************************************************************/
package org.eclipse.mdm.apicopy.control;
+import java.io.IOException;
+import java.nio.file.Path;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -23,9 +26,11 @@
import java.util.Set;
import java.util.stream.Collectors;
+import org.apache.commons.lang3.ArrayUtils;
import org.eclipse.mdm.api.base.ServiceNotProvidedException;
import org.eclipse.mdm.api.base.Transaction;
import org.eclipse.mdm.api.base.adapter.ModelManager;
+import org.eclipse.mdm.api.base.file.FileService;
import org.eclipse.mdm.api.base.massdata.AnyTypeValuesBuilder;
import org.eclipse.mdm.api.base.massdata.ComplexNumericalValuesBuilder;
import org.eclipse.mdm.api.base.massdata.NumericalValuesBuilder;
@@ -45,6 +50,7 @@
import org.eclipse.mdm.api.base.model.Test;
import org.eclipse.mdm.api.base.model.TestStep;
import org.eclipse.mdm.api.base.model.Value;
+import org.eclipse.mdm.api.base.model.ValueType;
import org.eclipse.mdm.api.base.query.Filter;
import org.eclipse.mdm.api.base.search.SearchService;
import org.eclipse.mdm.api.dflt.ApplicationContext;
@@ -57,6 +63,7 @@
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
+import com.google.common.io.Files;
public abstract class TransferBase {
List<Class<? extends Entity>> supportedRootEntities = Arrays.asList(Project.class, Pool.class, Test.class,
@@ -69,8 +76,12 @@
EntityManager entityManagerDst;
EntityFactory entityFactoryDst;
ModelManager modelManagerDst;
+ FileService fileServiceDst;
+ FileService fileServiceSrc;
Map<EntityHolder, EntityHolder> mapSrcDstEntities = new HashMap<>();
+ Map<Entity, List<FileLink>> mapFileLinksReplaced = new HashMap<>();
+ Map<Entity, List<FileLink>> mapFileLinksUploaded = new HashMap<>();
public TransferBase(ApplicationContext src, ApplicationContext dst) {
contextSrc = src;
@@ -84,6 +95,15 @@
.orElseThrow(() -> new ServiceNotProvidedException(EntityFactory.class));
modelManagerDst = contextDst.getModelManager()
.orElseThrow(() -> new ServiceNotProvidedException(ModelManager.class));
+
+ if (contextDst.getFileService().isPresent()) {
+ fileServiceDst = contextDst.getFileService().get();
+ }
+
+ if (contextSrc.getFileService().isPresent()) {
+ fileServiceSrc = contextSrc.getFileService().get();
+ }
+
}
ListMultimap<Class<? extends Entity>, Entity> loadParents(List<? extends Entity> entities) {
@@ -163,20 +183,123 @@
transaction.update(updateEntities);
}
- void copyValues(Entity srcEntity, Entity dstEntity, List<String> ignoredAttributes) {
+ void copyValues(Entity srcEntity, Entity dstEntity, List<String> ignoredAttributes, boolean replaceFileLinks) {
+ copyValues(srcEntity, dstEntity, ignoredAttributes, false, replaceFileLinks);
+ }
+
+ void copyValues(Entity srcEntity, Entity dstEntity, List<String> ignoredAttributes, boolean onlyValid,
+ boolean replaceFileLinks) {
Set<String> valueNamesDst = dstEntity.getValues().keySet();
for (Map.Entry<String, Value> me : srcEntity.getValues().entrySet()) {
String key = me.getKey();
if (!ignoredAttributes.contains(key) && valueNamesDst.contains(key)) {
- dstEntity.getValue(me.getKey()).set(me.getValue().extract());
+ Value valueSrc = me.getValue();
+
+ if (onlyValid && !valueSrc.isValid()) {
+ continue;
+ }
Value value = dstEntity.getValue(me.getKey());
- value.set(me.getValue().extract());
- value.setValid(me.getValue().isValid());
+
+ if (isFileLinkDataType(valueSrc.getValueType())) {
+ collectReplacedFileLinks(dstEntity, value, replaceFileLinks);
+
+ uploadFiles(srcEntity, dstEntity, valueSrc);
+
+ if (ValueType.FILE_LINK_SEQUENCE.equals(valueSrc.getValueType()) && !replaceFileLinks) {
+ FileLink[] existingFileLinks = value.extract(ValueType.FILE_LINK_SEQUENCE);
+ FileLink[] newFileLinks = valueSrc.extract(ValueType.FILE_LINK_SEQUENCE);
+ valueSrc.set(ArrayUtils.addAll(existingFileLinks, newFileLinks));
+ }
+
+ }
+
+ try {
+ value.set(valueSrc.extract());
+ } catch (IllegalArgumentException e) {
+ throw new ApiCopyException(
+ "Cannot set value for " + dstEntity.getName() + "." + me.getKey() + ": " + e.getMessage(),
+ e);
+ }
+ value.setValid(valueSrc.isValid());
}
}
}
+ private void collectReplacedFileLinks(Entity dstEntity, Value value, boolean replaceFileLinks) {
+ if (ValueType.FILE_LINK.equals(value.getValueType()) && value.isValid()) {
+ FileLink fileToDelete = value.extract();
+ mapFileLinksReplaced.put(dstEntity, Collections.singletonList(fileToDelete));
+ } else if (ValueType.FILE_LINK_SEQUENCE.equals(value.getValueType()) && replaceFileLinks) {
+ FileLink[] fileLinksToDelete = value.extract();
+ mapFileLinksReplaced.put(dstEntity, Arrays.asList(fileLinksToDelete));
+ }
+ }
+
+ /**
+ *
+ * @param valueType
+ * @return
+ */
+ private boolean isFileLinkDataType(ValueType<?> valueType) {
+ boolean isFileDataType = false;
+
+ if (ValueType.FILE_LINK_SEQUENCE.equals(valueType) || ValueType.FILE_LINK.equals(valueType)) {
+ isFileDataType = true;
+ }
+ return isFileDataType;
+ }
+
+ /**
+ * Uploading file of srcEntity and set the filelink to the dstEntity. Collect
+ * additionally the uploaded FileLinks in a map
+ *
+ * @param srcEntity
+ * @param dstEntity
+ * @param valueSrc
+ */
+ private void uploadFiles(Entity srcEntity, Entity dstEntity, Value valueSrc) {
+ try {
+ if (fileServiceSrc != null && fileServiceDst != null) {
+
+ if (ValueType.FILE_LINK_SEQUENCE.equals(valueSrc.getValueType())) {
+
+ List<FileLink> fileLinkList = downloadSourceFiles(srcEntity,
+ Arrays.asList(valueSrc.extract(ValueType.FILE_LINK_SEQUENCE)));
+ fileServiceDst.uploadSequential(dstEntity, fileLinkList, null);
+ valueSrc.set(fileLinkList.toArray(new FileLink[fileLinkList.size()]));
+ mapFileLinksUploaded.put(dstEntity, fileLinkList);
+ } else if (ValueType.FILE_LINK.equals(valueSrc.getValueType())) {
+ FileLink fileLink = downloadSourceFile(srcEntity, valueSrc.extract(ValueType.FILE_LINK));
+ fileServiceDst.uploadSequential(dstEntity, Collections.singletonList(fileLink), null);
+ valueSrc.set(fileLink);
+ mapFileLinksUploaded.put(dstEntity, Collections.singletonList(fileLink));
+ }
+ }
+
+ } catch (IOException e) {
+ throw new ApiCopyException(e.getLocalizedMessage(), e);
+ }
+
+ }
+
+ private List<FileLink> downloadSourceFiles(Entity srcEntity, List<FileLink> fileLinkList) throws IOException {
+ List<FileLink> returnList = new ArrayList<FileLink>();
+
+ for (FileLink fileLink : fileLinkList) {
+ returnList.add(downloadSourceFile(srcEntity, fileLink));
+ }
+
+ return returnList;
+ }
+
+ private FileLink downloadSourceFile(Entity srcEntity, FileLink fileLinkSrc) throws IOException {
+ Path targetPath = Files.createTempDir().toPath();
+ Path filePathAbsolute = targetPath.resolve(fileLinkSrc.getFileName());
+ fileServiceSrc.download(srcEntity, targetPath, fileLinkSrc);
+ return FileLink.newLocal(filePathAbsolute);
+ }
+
WriteRequest createWriteRequest(ChannelGroup channelGroupDst, Channel channelDst, MeasuredValues measuredValues) {
WriteRequestBuilder wrb = WriteRequest.create(channelGroupDst, channelDst, measuredValues.getAxisType());
NumericalValuesBuilder builder = null;
@@ -393,4 +516,30 @@
return cls.cast(builder);
}
+ /**
+ * Delete all replaced file links
+ */
+ void deleteFilesOfReplacedFileLinks() {
+ mapFileLinksReplaced.forEach((entity, fileLinkList) -> {
+ fileServiceDst.delete(entity, fileLinkList);
+ });
+ }
+
+ void clearReplacedFileLinkCache() {
+ mapFileLinksReplaced.clear();
+ }
+
+ /**
+ * Delete all uploaded files, is necessary if the Import will be canceled
+ */
+ void deleteFilesOfUploadedFileLinks() {
+ mapFileLinksUploaded.forEach((entity, fileLinkList) -> {
+ fileServiceDst.delete(entity, fileLinkList);
+ });
+ }
+
+ void clearUploadedFileLinkCache() {
+ mapFileLinksUploaded.clear();
+ }
+
}
diff --git a/org.eclipse.mdm.application/src/main/webapp/.vscode/launch.json b/org.eclipse.mdm.application/src/main/webapp/.vscode/launch.json
new file mode 100644
index 0000000..1348ba4
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+ // Use IntelliSense to learn about possible attributes.
+ // Hover to view descriptions of existing attributes.
+ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "type": "chrome",
+ "request": "launch",
+ "name": "Launch Chrome against localhost",
+ "url": "http://localhost:4200",
+ "webRoot": "${workspaceFolder}"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/angular.json b/org.eclipse.mdm.application/src/main/webapp/angular.json
index 6717b76..40981c4 100644
--- a/org.eclipse.mdm.application/src/main/webapp/angular.json
+++ b/org.eclipse.mdm.application/src/main/webapp/angular.json
@@ -7,7 +7,7 @@
"root": "",
"sourceRoot": "src",
"projectType": "application",
- "prefix": "app",
+ "prefix": "mdm5",
"schematics": {},
"architect": {
"build": {
@@ -26,11 +26,14 @@
"node_modules/primeicons/primeicons.css",
"node_modules/primeng/resources/themes/nova-light/theme.css",
"node_modules/primeng/resources/primeng.min.css",
+ "node_modules/primeflex/primeflex.css",
"node_modules/font-awesome/css/font-awesome.min.css",
"node_modules/bootstrap/dist/css/bootstrap.min.css",
"src/styles.css"
],
- "scripts": [],
+ "scripts": [
+ "node_modules/chart.js/dist/Chart.js"
+ ],
"es5BrowserSupport": true
},
"configurations": {
diff --git a/org.eclipse.mdm.application/src/main/webapp/package-lock.json b/org.eclipse.mdm.application/src/main/webapp/package-lock.json
index ea11b62..315531b 100644
--- a/org.eclipse.mdm.application/src/main/webapp/package-lock.json
+++ b/org.eclipse.mdm.application/src/main/webapp/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "openMDM-Web",
- "version": "1.0.0",
+ "version": "5.1.0M8",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -950,7 +950,7 @@
},
"@types/q": {
"version": "0.0.32",
- "resolved": "http://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
+ "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
"integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
"dev": true
},
@@ -1302,6 +1302,7 @@
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
"requires": {
"color-convert": "^1.9.0"
}
@@ -1470,7 +1471,7 @@
},
"util": {
"version": "0.10.3",
- "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
+ "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
"dev": true,
"requires": {
@@ -1885,7 +1886,7 @@
"bootstrap": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz",
- "integrity": "sha1-DrNxryyESOjCEEEdDLgkpkCaEr4="
+ "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w=="
},
"brace-expansion": {
"version": "1.1.11",
@@ -1971,7 +1972,7 @@
},
"browserify-rsa": {
"version": "4.0.1",
- "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
"dev": true,
"requires": {
@@ -2025,7 +2026,7 @@
},
"buffer": {
"version": "4.9.1",
- "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
"integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
"dev": true,
"requires": {
@@ -2151,7 +2152,7 @@
},
"camelcase-keys": {
"version": "2.1.0",
- "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
"dev": true,
"optional": true,
@@ -2182,6 +2183,7 @@
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
"integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=",
+ "dev": true,
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
@@ -2194,6 +2196,32 @@
"integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4=",
"dev": true
},
+ "chart.js": {
+ "version": "2.9.3",
+ "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.3.tgz",
+ "integrity": "sha512-+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw==",
+ "requires": {
+ "chartjs-color": "^2.1.0",
+ "moment": "^2.10.2"
+ }
+ },
+ "chartjs-color": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz",
+ "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==",
+ "requires": {
+ "chartjs-color-string": "^0.6.0",
+ "color-convert": "^1.9.3"
+ }
+ },
+ "chartjs-color-string": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
+ "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
+ "requires": {
+ "color-name": "^1.0.0"
+ }
+ },
"cheerio": {
"version": "1.0.0-rc.2",
"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
@@ -2967,7 +2995,7 @@
"dependencies": {
"globby": {
"version": "6.1.0",
- "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
"dev": true,
"requires": {
@@ -2980,7 +3008,7 @@
"dependencies": {
"pify": {
"version": "2.3.0",
- "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
}
@@ -3371,7 +3399,8 @@
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "dev": true
},
"eslint-scope": {
"version": "4.0.0",
@@ -3505,7 +3534,7 @@
},
"expand-range": {
"version": "0.1.1",
- "resolved": "http://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
"integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
"dev": true,
"requires": {
@@ -3564,7 +3593,7 @@
},
"expand-range": {
"version": "1.8.2",
- "resolved": "http://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+ "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
"dev": true,
"requires": {
@@ -3574,7 +3603,7 @@
"fill-range": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
- "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+ "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
"dev": true,
"requires": {
"is-number": "^2.1.0",
@@ -3653,7 +3682,7 @@
"dependencies": {
"array-flatten": {
"version": "1.1.1",
- "resolved": "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
"dev": true
}
@@ -4687,12 +4716,11 @@
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
- "dev": true,
- "optional": true
+ "dev": true
},
"get-stream": {
"version": "3.0.0",
- "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
"dev": true
},
@@ -4906,7 +4934,8 @@
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
},
"has-unicode": {
"version": "2.0.1",
@@ -5052,7 +5081,7 @@
},
"http-errors": {
"version": "1.6.3",
- "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
"dev": true,
"requires": {
@@ -6195,6 +6224,7 @@
"version": "2.2.5",
"resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz",
"integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=",
+ "dev": true,
"requires": {
"chalk": "^2.1.0",
"log-symbols": "^2.1.0",
@@ -6204,12 +6234,14 @@
"ansi-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
- "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
},
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "dev": true,
"requires": {
"ansi-regex": "^3.0.0"
}
@@ -6342,7 +6374,7 @@
},
"load-json-file": {
"version": "1.1.0",
- "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true,
"requires": {
@@ -6355,7 +6387,7 @@
"dependencies": {
"pify": {
"version": "2.3.0",
- "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
}
@@ -6419,6 +6451,7 @@
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
"integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+ "dev": true,
"requires": {
"chalk": "^2.0.1"
}
@@ -6629,8 +6662,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
- "dev": true,
- "optional": true
+ "dev": true
},
"map-visit": {
"version": "1.0.0",
@@ -6660,7 +6692,7 @@
},
"media-typer": {
"version": "0.3.0",
- "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
"integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
"dev": true
},
@@ -6687,7 +6719,7 @@
},
"meow": {
"version": "3.7.0",
- "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+ "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
"dev": true,
"optional": true,
@@ -6912,7 +6944,7 @@
},
"mkdirp": {
"version": "0.5.1",
- "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"requires": {
@@ -6927,6 +6959,11 @@
}
}
},
+ "moment": {
+ "version": "2.24.0",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+ "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+ },
"move-concurrently": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -7007,11 +7044,6 @@
"integrity": "sha1-udFeTXHGdikIZUtRg+04t1M0CDU=",
"dev": true
},
- "ng2-split-pane": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/ng2-split-pane/-/ng2-split-pane-1.3.1.tgz",
- "integrity": "sha1-FF2uiG6DPVVC4Y8vRaabotXtxEc="
- },
"ngx-bootstrap": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-3.1.2.tgz",
@@ -7063,7 +7095,7 @@
"dependencies": {
"semver": {
"version": "5.3.0",
- "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
"dev": true,
"optional": true
@@ -7155,7 +7187,7 @@
},
"chalk": {
"version": "1.1.3",
- "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"optional": true,
@@ -7485,13 +7517,13 @@
},
"os-homedir": {
"version": "1.0.2",
- "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
"dev": true
},
"os-locale": {
"version": "1.4.0",
- "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"dev": true,
"optional": true,
@@ -7501,7 +7533,7 @@
},
"os-tmpdir": {
"version": "1.0.2",
- "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true
},
@@ -7832,7 +7864,7 @@
},
"path-browserify": {
"version": "0.0.0",
- "resolved": "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
"integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
"dev": true
},
@@ -8093,6 +8125,11 @@
"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
"dev": true
},
+ "primeflex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/primeflex/-/primeflex-1.0.0.tgz",
+ "integrity": "sha512-/K9iHXm5wu6gZycQDP/gsfX7BpJKSNVhxTOZAJBLH88idPtC2lMgUXm28qfXFqsbxaTI49oBuMYBFlg/DBmUMg=="
+ },
"primeicons": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/primeicons/-/primeicons-1.0.0.tgz",
@@ -8194,7 +8231,7 @@
},
"chalk": {
"version": "1.1.3",
- "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
@@ -8222,7 +8259,7 @@
},
"globby": {
"version": "5.0.0",
- "resolved": "http://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
"integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
"dev": true,
"requires": {
@@ -8253,7 +8290,7 @@
},
"pify": {
"version": "2.3.0",
- "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
},
@@ -8524,7 +8561,7 @@
},
"pify": {
"version": "2.3.0",
- "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
}
@@ -8882,7 +8919,7 @@
},
"safe-regex": {
"version": "1.1.0",
- "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
"dev": true,
"requires": {
@@ -8974,7 +9011,7 @@
"dependencies": {
"source-map": {
"version": "0.4.4",
- "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"dev": true,
"optional": true,
@@ -9697,6 +9734,11 @@
"extend-shallow": "^3.0.0"
}
},
+ "split.js": {
+ "version": "1.5.11",
+ "resolved": "https://registry.npmjs.org/split.js/-/split.js-1.5.11.tgz",
+ "integrity": "sha512-ec0sAbWnaMGpNHWo1ZgIlF3Mx7GzSyaO0GlcEBZGIFZQwYPPkbDV6JRpDmpzIshVig7USREuEPudy0ygQaskXg=="
+ },
"sprintf-js": {
"version": "1.0.3",
"resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -9883,7 +9925,7 @@
},
"strip-eof": {
"version": "1.0.0",
- "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
"dev": true
},
@@ -9950,7 +9992,7 @@
},
"source-map": {
"version": "0.1.43",
- "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
"dev": true,
"requires": {
@@ -9987,6 +10029,7 @@
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
+ "dev": true,
"requires": {
"has-flag": "^3.0.0"
}
@@ -10005,7 +10048,7 @@
},
"tar": {
"version": "2.2.1",
- "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
"dev": true,
"optional": true,
@@ -10365,9 +10408,9 @@
}
},
"tslib": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz",
- "integrity": "sha1-43qG/ajLuvI6BX9HPJ9Nxk5fwug="
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+ "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
},
"tslint": {
"version": "5.11.0",
@@ -10411,7 +10454,7 @@
},
"tty-browserify": {
"version": "0.0.0",
- "resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
"dev": true
},
@@ -10715,7 +10758,7 @@
},
"vm-browserify": {
"version": "0.0.4",
- "resolved": "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+ "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
"dev": true,
"requires": {
@@ -11270,7 +11313,7 @@
},
"wrap-ansi": {
"version": "2.1.0",
- "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
"dev": true,
"requires": {
@@ -11315,7 +11358,7 @@
},
"xmlbuilder": {
"version": "9.0.7",
- "resolved": "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+ "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
"dev": true
},
diff --git a/org.eclipse.mdm.application/src/main/webapp/package.json b/org.eclipse.mdm.application/src/main/webapp/package.json
index 30546c8..c49e299 100644
--- a/org.eclipse.mdm.application/src/main/webapp/package.json
+++ b/org.eclipse.mdm.application/src/main/webapp/package.json
@@ -30,17 +30,19 @@
"@ngx-translate/core": "11.0.1",
"@ngx-translate/http-loader": "4.0.0",
"bootstrap": "4.1.3",
+ "chart.js": "2.9.3",
"class-transformer": "0.1.6",
"core-js": "2.6.0",
"file-saver": "1.3.3",
"font-awesome": "4.7.0",
- "ng2-split-pane": "1.3.1",
"ngx-bootstrap": "3.1.2",
+ "primeflex": "^1.0.0",
"primeicons": "1.0.0",
"primeng": "7.0.1",
"rxjs": "6.3.3",
"rxjs-compat": "6.3.3",
- "tslib": "1.9.0",
+ "split.js": "1.5.11",
+ "tslib": "^1.10.0",
"zone.js": "0.8.26"
},
"devDependencies": {
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.css b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.css
new file mode 100644
index 0000000..ea615fe
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.css
@@ -0,0 +1,20 @@
+@charset "ISO-8859-1";
+
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+.navbar-vertical {}
+.navbar-vertical .navbar-nav {}
+.navbar-vertical .navbar-nav .navbar-brand {display:block;}
+.navbar-vertical .navbar-nav .nav-item {display:block;}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.html
index 5e60c97..495a99d 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.html
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.html
@@ -11,20 +11,29 @@
* SPDX-License-Identifier: EPL-2.0
*
********************************************************************************-->
-
-<nav class="navbar navbar-default navbar-expand bg-light">
- <div class="container-fluid">
- <div class="collapse navbar-collapse" id="bs-admin-navbar">
- <a class="navbar-brand" style="font-weight: 500;">{{'administration.admin-modules.scope' | translate }}</a>
- <ul class="nav navbar-nav mdm-link-list">
- <li *ngFor="let m of links" [routerLinkActive]="['active']" class="nav-item">
- <a routerLink="{{m.path}}" class="nav-link" style="cursor:pointer;">
- {{m.name | translate}}
- </a>
- </li>
- </ul>
- </div>
-
+ <div class="mainnavigation">
+ <div id="leftsidenav" class="split">
+ <nav class="navbar navbar-default navbar-vertical bg-light">
+ <div class="container-fluid">
+ <div class="" id="bs-admin-navbar">
+ <a class="navbar-brand" style="font-weight: 500;">{{'administration.admin-modules.modules' | translate }}</a>
+ <ul class="nav navbar-nav mdm-link-list">
+ <li *ngFor="let m of links" [routerLinkActive]="['active']" class="nav-item">
+ <a routerLink="{{m.path}}" class="nav-link" style="cursor:pointer;">
+ {{m.name | translate}}
+ </a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </nav>
</div>
-</nav>
-<router-outlet></router-outlet>
+ <div id="rightsidenav" class="split">
+ <div class="navigator-content" (scroll)=onScroll($event)>
+ <router-outlet></router-outlet>
+ <div *ngIf="scrollBtnVisible" style="position: fixed; bottom: 30px; right: 35px;">
+ <button class="btn btn-default" (click)="onScrollTop()" style="z-index: 10000;"><span class="fa fa-arrow-up" style="z-index: 10000;" title="{{ 'navigator-view.mdm-navigator-view.tooltip-scroll-up' | translate }}"></span></button>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.ts
index 57392a8..ff7d906 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-modules.component.ts
@@ -13,22 +13,69 @@
********************************************************************************/
-import {Component} from '@angular/core';
+import {Component, AfterViewInit} from '@angular/core';
import {Router} from '@angular/router';
-
+import Split from 'split.js';
import { TRANSLATE } from '../core/mdm-core.module';
@Component({
selector: 'admin-modules',
templateUrl: 'admin-modules.component.html',
+ styleUrls: ['./admin-modules.component.css'],
providers: []
})
-export class AdminModulesComponent {
+export class AdminModulesComponent implements AfterViewInit {
+
+ div: any;
+ scrollBtnVisible = false;
+
+ split: Split;
links = [
- { name: TRANSLATE('administration.admin-modules.system'), path: 'system'},
- { name: TRANSLATE('administration.admin-modules.source'), path: 'source'},
- { name: TRANSLATE('administration.admin-modules.user'), path: 'user'}
+ { name: TRANSLATE('administration.admin-modules.preferences'), path: 'preferences'},
+ { name: TRANSLATE('administration.admin-modules.extsystems'), path: 'extsystems'}
];
- constructor(private router: Router) {}
+ constructor(private router: Router) { }
+
+
+ minWidthLeft() {
+ return 180;
+ }
+
+ minWidthRight() {
+ return 0.20 * window.innerWidth;
+ }
+
+ initRatio() {
+ return Math.floor(Math.max(250 / window.innerWidth, 0.20) * 100);
+ }
+ initRatioRight() {
+ return 100 - this.initRatio();
+ }
+ ngAfterViewInit(): void {
+ this.split = Split(['#leftsidenav', '#rightsidenav'], {
+ sizes: [this.initRatio(), this.initRatioRight()],
+ minSize: this.minWidthLeft(),
+ gutterSize: 10,
+ gutterStyle: function (dimension, gutterSize) {
+ return {
+ 'width': gutterSize + 'px',
+ 'height': (document.getElementById('leftsidenav').clientHeight - 5) + 'px'
+ };
+ },
+ });
+ }
+
+ onScrollTop() {
+ this.div.scrollTop = 0;
+ }
+
+ onScroll(event: any) {
+ if (event.target.scrollTop > 0) {
+ this.scrollBtnVisible = true;
+ } else {
+ this.scrollBtnVisible = false;
+ }
+ this.div = event.target;
+ }
}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-routing.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-routing.module.ts
index 2d7ecf3..f29aa38 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-routing.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin-routing.module.ts
@@ -16,15 +16,17 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
-import { PreferenceComponent } from './preference.component';
import { AdminModulesComponent } from './admin-modules.component';
+import { ExtSystemComponent } from './extsystem.component';
+import { PreferenceRoutingModule } from './preference-routing.module';
const moduleRoutes: Routes = [
{
path: '', component: AdminModulesComponent,
children: [
- { path: ':scope', component: PreferenceComponent },
- { path: '', redirectTo: 'system', pathMatch: 'full' }
+ { path: 'preferences', loadChildren: './preference.module#PreferenceModule' },
+ { path: 'extsystems', component: ExtSystemComponent },
+ { path: '', redirectTo: 'preferences', pathMatch: 'full' }
]
}
];
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin.module.ts
index a0f393f..d63d0cc 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/admin.module.ts
@@ -17,32 +17,46 @@
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ComponentLoaderFactory } from 'ngx-bootstrap/component-loader';
-import { PreferenceService } from '../core/preference.service';
import { MDMCoreModule } from '../core/mdm-core.module';
+import { ExtSystemComponent } from './extsystem.component';
+import { ExtSystemViewerComponent } from './extsystem-viewer.component';
+import { ExtSystemEditorComponent } from './extsystem-editor.component';
import { AdminModulesComponent } from './admin-modules.component';
import { AdminRoutingModule } from './admin-routing.module';
-import { PreferenceComponent } from './preference.component';
-import { EditPreferenceComponent } from './edit-preference.component';
+import { ExtSystemService } from './extsystem.service';
+import { PreferenceModule } from './preference.module';
+import { TableModule } from 'primeng/table';
+import { ContextMenuModule } from 'primeng/contextmenu';
+import { DialogModule } from 'primeng/dialog';
+import { CatalogService } from './catalog.service';
+import { AutoCompleteModule } from 'primeng/autocomplete';
@NgModule( {
imports: [
AdminRoutingModule,
MDMCoreModule,
FormsModule,
- ReactiveFormsModule
+ ReactiveFormsModule,
+ PreferenceModule,
+ TableModule,
+ ContextMenuModule,
+ DialogModule,
+ AutoCompleteModule
],
declarations: [
- PreferenceComponent,
- EditPreferenceComponent,
AdminModulesComponent,
+ ExtSystemComponent,
+ ExtSystemViewerComponent,
+ ExtSystemEditorComponent
],
exports: [
AdminModulesComponent,
],
providers: [
ComponentLoaderFactory,
- PreferenceService
+ ExtSystemService,
+ CatalogService
],
})
export class AdminModule { }
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/catalog.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/catalog.service.ts
new file mode 100644
index 0000000..c497c0f
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/catalog.service.ts
@@ -0,0 +1,78 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+
+import { Injectable } from '@angular/core';
+import { Http, Response, Headers, RequestOptions } from '@angular/http';
+
+import { PropertyService } from '../core/property.service';
+
+import { plainToClass } from 'class-transformer';
+import { HttpErrorHandler } from '../core/http-error-handler';
+import { throwError as observableThrowError, Observable } from 'rxjs';
+import { map, catchError } from 'rxjs/operators';
+import { Node } from '../navigator/node';
+
+@Injectable()
+export class CatalogService {
+
+ private prefEndpoint: string;
+
+ constructor(private http: Http,
+ private httpErrorHandler: HttpErrorHandler,
+ private _prop: PropertyService) {
+ this.prefEndpoint = _prop.getUrl('mdm/environments/');
+ }
+
+ getTplRootsForType(scope: string, type: string): Observable<Node[]> {
+ return this.http.get(this.prefEndpoint + scope + '/tplroots/' + type).pipe(
+ map(response => plainToClass(Node, response.json().data)),
+ catchError(this.handleError));
+ }
+
+ getTplCompForRoot(scope: string, type: string, rootId: string): Observable<Node[]> {
+ return this.http.get(this.prefEndpoint + scope + '/tplroots/' + type + '/' + rootId + '/tplcomps').pipe(
+ map(response => plainToClass(Node, response.json().data)),
+ catchError(this.handleError));
+ }
+
+ getTplAttrsForComp(scope: string, type: string, rootId: string, tplCompId: string): Observable<Node[]> {
+ return this.http.get(this.prefEndpoint + scope + '/tplroots/' + type + '/' + rootId + '/tplcomps/' + tplCompId + '/tplattrs').pipe(
+ map(response => plainToClass(Node, response.json().data)),
+ catchError(this.handleError));
+ }
+
+ getCatCompsForType(scope: string, type: string): Observable<Node[]> {
+ return this.http.get(this.prefEndpoint + scope + '/catcomps/' + type).pipe(
+ map(response => plainToClass(Node, response.json().data)),
+ catchError(this.handleError));
+ }
+
+ getCatAttrsForComp(scope: string, type: string, catCompId: string): Observable<Node[]> {
+ return this.http.get(this.prefEndpoint + scope + '/catcomps/' + type + '/' + catCompId + '/catattrs').pipe(
+ map(response => plainToClass(Node, response.json().data)),
+ catchError(this.handleError));
+ }
+
+ private handleError(e: Error | any) {
+ if (e instanceof Response) {
+ let response = <Response> e;
+ if (response.status !== 200) {
+ return observableThrowError('Could not request catalog element! '
+ + 'Please check if application server is running and database is configured correctly.');
+ }
+ }
+ return this.httpErrorHandler.handleError(e);
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-editor.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-editor.component.html
new file mode 100644
index 0000000..6701cd1
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-editor.component.html
@@ -0,0 +1,106 @@
+<!-- ********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ******************************************************************************** -->
+
+ <div class="mdm-extsystem-editor-container">
+
+ <p-table class="ext-system-table" [value]="tableExtSystems" *ngIf="selectedEnvironment && extSystems" styleClass="table-hover">
+ <ng-template pTemplate="header">
+ <tr>
+ <th>{{ 'administration.extsystem.name' | translate }}</th>
+ <th>{{ 'administration.extsystem.description' | translate }}</th>
+ </tr>
+ </ng-template>
+ <ng-template pTemplate="body" let-rowData let-rowIndex="rowIndex">
+ <tr>
+ <td>
+ <input required type="text" [(ngModel)]="rowData.name" />
+ </td>
+ <td>
+ <input type="text" *ngIf="getAttributeFromNode(rowData,'Description')" [(ngModel)]="getAttributeFromNode(rowData,'Description').value" />
+ </td>
+ </tr>
+ </ng-template>
+ </p-table>
+ <div class="commands">
+ <button type="button" class="btn btn-default pull-right" (click)="saveExtSystem()">
+ <span class="fa fa-plus"></span> {{'administration.extsystem.btn-save' | translate }}
+ </button>
+ </div>
+
+ <div *ngIf="selectedExtSystem">
+ <div class="custom-split-pane">
+ <div class="custom-split-pane-content custom-split-pane-left">
+ <div>{{ 'administration.extsystem.ext-system-attributes' | translate }}</div>
+ <p-table class="ext-system-attr-table" [value]="getExternalSystemAttributes()" selectionMode="single" [(selection)]="selectedExtSystemAttr" (onRowSelect)="onExtSystemAttrSelect($event)">
+ <ng-template pTemplate="header">
+ <tr>
+ <th style="width: 3em"></th>
+ <th>{{ 'administration.extsystem.name' | translate }}</th>
+ <th>{{ 'administration.extsystem.description' | translate }}</th>
+ <th class="actioncol"></th>
+ </tr>
+ </ng-template>
+ <ng-template pTemplate="body" let-rowData let-rowIndex="rowIndex">
+ <tr [pSelectableRow]="rowData" [pSelectableRowIndex]="rowIndex">
+ <td><p-tableRadioButton [value]="rowData"></p-tableRadioButton></td>
+ <td><input required type="text" [(ngModel)]="rowData.name" (change)="updateSystemAttrModel(rowData)" /></td>
+ <td><input type="text" *ngIf="getAttributeFromNode(rowData,'Description')" [(ngModel)]="getAttributeFromNode(rowData,'Description').value" (change)="updateSystemAttrModel(rowData)" /></td>
+ <td class="actioncol"><button type="button" class="btn btn-default" (click)="removeExtSystemAttr(rowData)" title="{{ 'administration.extsystem.btn-del' | translate }}">
+ <span class="fa fa-times"></span>
+ </button></td>
+ </tr>
+ </ng-template>
+ </p-table>
+ <div *ngIf="loadingExtSystemAttr">{{ 'administration.extsystem.loading-attributes' | translate }}</div>
+
+ <div class="commands">
+ <button type="button" class="btn btn-default pull-right" (click)="addExtSystemAttr()">
+ <span class="fa fa-plus"></span> {{'administration.extsystem.btn-add' | translate }}
+ </button>
+ </div>
+
+ </div>
+ <div class="custom-split-pane-content custom-split-pane-right">
+ <div>{{ 'administration.extsystem.mdm-attributes' | translate }}</div>
+ <p-table class="ext-system-mdmattr-table" *ngIf="selectedExtSystemAttr" [value]="getMDMAttributes()">
+ <ng-template pTemplate="header">
+ <tr>
+ <th>{{ 'administration.extsystem.component-type' | translate }}</th>
+ <th>{{ 'administration.extsystem.component-name' | translate }}</th>
+ <th>{{ 'administration.extsystem.attribute-name' | translate }}</th>
+ <th class="actioncol"></th>
+ </tr>
+ </ng-template>
+ <ng-template pTemplate="body" let-rowData let-rowIndex="rowIndex">
+ <tr>
+ <td class="dropdowncol"><div><p-dropdown *ngIf="getAttributeFromNode(rowData,'CompType')" styleClass="drpdwn" [autoWidth]="false" [style]="{'width':'100%'}" [options]="mdmCompTypes" [(ngModel)]="getAttributeFromNode(rowData,'CompType').value" (onChange)="handleCompTypeSelect($event, rowData)" required="true"></p-dropdown></div></td>
+ <td class="dropdowncol"><div><p-dropdown *ngIf="getAttributeFromNode(rowData,'CompName')" styleClass="drpdwn" [autoWidth]="false" [style]="{'width':'100%'}" [options]="availableCatalogComps(rowData)" [(ngModel)]="getAttributeFromNode(rowData,'CompName').value" (onChange)="handleCompSelect($event, rowData)" editable="true"></p-dropdown></div></td>
+ <td class="dropdowncol"><div><p-dropdown *ngIf="getAttributeFromNode(rowData,'AttrName')" styleClass="drpdwn" [autoWidth]="false" [style]="{'width':'100%'}" [options]="availableAttributeComps(rowData)" [(ngModel)]="getAttributeFromNode(rowData,'AttrName').value" (onChange)="handleAttrCompSelect($event, rowData)" editable="true"></p-dropdown></div></td>
+ <td class="actioncol"><button type="button" class="btn btn-default" (click)="removeExtSystemMDMAttr(rowData)" title="{{ 'administration.extsystem.btn-del' | translate }}">
+ <span class="fa fa-times"></span>
+ </button></td>
+ </tr>
+ </ng-template>
+ </p-table>
+
+ <div class="commands">
+ <button *ngIf="selectedExtSystemAttr" type="button" class="btn btn-default pull-right" (click)="addExtSystemMDMAttr()">
+ <span class="fa fa-plus"></span> {{'administration.extsystem.btn-add' | translate }}
+ </button>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-editor.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-editor.component.ts
new file mode 100644
index 0000000..55f6d18
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-editor.component.ts
@@ -0,0 +1,615 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+
+import { Component, OnInit, ViewChild, Input, OnDestroy, Output, EventEmitter } from '@angular/core';
+import { FormGroup, FormControl, FormBuilder, FormArray, Validators } from '@angular/forms';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { DropdownModule } from 'primeng/dropdown';
+import { TreeTableModule } from 'primeng/treetable';
+import { TreeNode, MenuItem, SelectItem } from 'primeng/api';
+import { ContextMenuModule } from 'primeng/contextmenu';
+import { TreeTable, TreeTableToggler, DataTable } from 'primeng/primeng';
+import { Observable, BehaviorSubject, of, forkJoin } from 'rxjs';
+import 'rxjs/add/operator/toPromise';
+
+import { MDMNotificationService } from '../core/mdm-notification.service';
+import { ExtSystemService } from './extsystem.service';
+import { Node, Attribute, Relation } from '../navigator/node';
+import { plainToClass } from 'class-transformer';
+import { CatalogService } from './catalog.service';
+import { mergeMap, flatMap, map } from 'rxjs/operators';
+
+@Component( {
+ selector: 'mdm-extsystem-editor',
+ templateUrl: './extsystem-editor.component.html',
+ styleUrls: ['./extsystem.component.css']
+})
+export class ExtSystemEditorComponent implements OnInit, OnDestroy {
+
+ // passed down from parent
+ @Input() extSystems: Node[];
+ @Input() selectedEnvironment: Node;
+ @Input() selectedES: string;
+
+ @Output() editMode = new EventEmitter<boolean>();
+
+ // table selection
+ selectedExtSystem: Node;
+ selectedExtSystemAttr: Node;
+ tableExtSystems: Node[] = new Array();
+
+ // dropdown for table edit
+ mdmCompTypes: SelectItem[];
+ mdmCompNames: Node[];
+ mdmAttrNames: Node[];
+
+ // external system attributes
+ extSystemAttrs: Node[];
+ bsExtSystemAttrs: BehaviorSubject<Node[]> = new BehaviorSubject<Node[]>(undefined);
+
+ // loading states
+ loadingExtSystemAttr = false;
+
+ // for immediate creation only
+ tmpExtSystemAttr: Node;
+ tmpExtSystemMDMAttr: Node;
+
+ // dropdown boxes
+ availableSlctCtlgComps: any[][] = [];
+ availableSlctAttrComps: any[][] = [];
+
+ loadedTemplateRoots: any[][] = [];
+ loadedCatalogComps: any[][] = [];
+ loadedAttributeComps: any[][] = [];
+
+ constructor(private extSystemService: ExtSystemService,
+ private notificationService: MDMNotificationService,
+ private translateService: TranslateService,
+ private catalogService: CatalogService) {
+
+ this.bsExtSystemAttrs.subscribe(value => {
+ this.extSystemAttrs = value;
+ });
+
+ this.mdmCompTypes = [
+ { label: this.translateService.instant('administration.extsystem.dropdown-please-select'), value: '' },
+ { label: this.translateService.instant('administration.extsystem.unit-under-test'), value: 'UnitUnderTest' },
+ { label: this.translateService.instant('administration.extsystem.test-equipment'), value: 'TestEquipment' },
+ { label: this.translateService.instant('administration.extsystem.test-sequence'), value: 'TestSequence' },
+ { label: this.translateService.instant('administration.extsystem.sensor'), value: 'Sensor' }
+ ];
+ }
+
+ ngOnInit() {
+ for (let extSystem of this.extSystems) {
+ if (extSystem.type === 'ExtSystem' && extSystem.id === this.selectedES) {
+ this.selectedExtSystem = extSystem;
+ this.tableExtSystems.push(this.selectedExtSystem);
+ break;
+ }
+ }
+
+ this.loadingExtSystemAttr = true;
+ this.extSystemService.getExtSystemAttributesForScope(this.selectedEnvironment.sourceName, this.selectedExtSystem.id)
+ .subscribe(attrs => {
+ this.bsExtSystemAttrs.next(attrs);
+ this.loadingExtSystemAttr = false;
+ });
+ }
+
+ ngOnDestroy() {
+ }
+
+ getExternalSystemAttributes() {
+ if (!this.extSystemAttrs) {
+ return new Array();
+ }
+ return this.extSystemAttrs.filter(attr => attr.type === 'ExtSystemAttribute');
+ }
+ getMDMAttributes() {
+ let ids = new Array();
+ if (this.selectedExtSystemAttr.relations) {
+ for (let relation of this.selectedExtSystemAttr.relations) {
+ if (relation.entityType === 'MDMAttribute') {
+ for (let relationid of relation.ids) {
+ ids.push(relationid);
+ }
+ }
+ }
+ }
+ let data = new Array();
+ for (let attr of this.extSystemAttrs) {
+ if (attr.type === 'MDMAttribute' && ids.find(el => el === attr.id)) {
+ data.push(attr);
+ }
+ }
+ return data;
+ }
+
+ getAttributeValueFromNode(node: Node, attribute: string) {
+ if (node && node.attributes !== undefined) {
+ for (let attr of node.attributes) {
+ if (attr.name === attribute) {
+ return attr.value;
+ }
+ }
+ }
+ return '';
+ }
+
+ getAttributeFromNode(node: Node, attribute: string) {
+ if (node && node.attributes !== undefined) {
+ for (let attr of node.attributes) {
+ if (attr.name === attribute) {
+ return attr;
+ }
+ }
+ }
+ return undefined;
+ }
+
+ getNextTemporaryId() {
+ let id = -1;
+ for (let extSystem of this.extSystems) {
+ if (parseInt(extSystem.id, 10) < id) {
+ id = parseInt(extSystem.id, 10);
+ }
+ }
+ return --id;
+ }
+
+ createAttribute(name: string, value?: string) {
+ let attr = new Attribute();
+ attr.dataType = 'STRING';
+ attr.unit = '';
+ attr.value = value !== undefined ? value : '';
+ attr.name = name;
+ return attr;
+ }
+
+ getIndicesForIds(ids: string[]) {
+ let indices = new Array();
+ for (let id of ids) {
+ for (let extSystem of this.extSystems) {
+ if (extSystem.id === ids[id]) {
+ indices.push(this.extSystems.indexOf(extSystem));
+ }
+ }
+ }
+ return indices;
+ }
+
+ /**
+ * Save the external system
+ */
+ saveExtSystem() {
+ this.getAttributeFromNode(this.selectedExtSystem, 'Name').value = this.selectedExtSystem.name;
+ this.extSystemService.saveExtSystem(this.selectedEnvironment.sourceName, this.selectedExtSystem)
+ .subscribe(
+ response => { /* discard */ },
+ error => this.notificationService.notifyError(
+ this.translateService.instant('administration.extsystem.err-cannot-update-ext-system'), error)
+ );
+ }
+
+ addExtSystemAttr() {
+ // initialze the node
+ this.tmpExtSystemAttr = new Node();
+ this.tmpExtSystemAttr.type = 'ExtSystemAttribute';
+ this.tmpExtSystemAttr.sourceType = 'ExtSystemAttr';
+ this.tmpExtSystemAttr.sourceName = this.selectedEnvironment.sourceName;
+ this.tmpExtSystemAttr.attributes = new Array();
+ this.tmpExtSystemAttr.attributes.push(this.createAttribute('Description'));
+ this.tmpExtSystemAttr.attributes.push(this.createAttribute('Name'));
+ this.tmpExtSystemAttr.attributes.push(this.createAttribute('ConverterClassname'));
+ this.tmpExtSystemAttr.attributes.push(this.createAttribute('ConverterParameter'));
+ this.tmpExtSystemAttr.attributes.push(this.createAttribute('MimeType', 'application/x-asam.aoany.extsystemattr'));
+
+ // Initialize relations on the external system if it is not defined yet
+ if (this.selectedExtSystem.relations === undefined || this.selectedExtSystem.relations.length === 0) {
+ this.selectedExtSystem.relations = new Array();
+ let relation = new Relation();
+ relation.entityType = 'ExtSystemAttribute';
+ relation.type = 'CHILDREN';
+ relation.ids = new Array();
+ this.selectedExtSystem.relations.push(relation);
+ }
+ if (this.selectedExtSystem.relations[0].ids === undefined) {
+ this.selectedExtSystem.relations[0].ids = new Array();
+ }
+
+ // Set initial name to persist the attribute
+ this.tmpExtSystemAttr.name = 'Attribut';
+ this.getAttributeFromNode(this.tmpExtSystemAttr, 'Name').value = this.tmpExtSystemAttr.name;
+ this.saveExtSystemAttr(this.tmpExtSystemAttr);
+ }
+
+ /**
+ * Remove the external system attribute
+ */
+ removeExtSystemAttr(extSystemAttr?: Node) {
+ if (extSystemAttr != undefined) {
+
+ if (extSystemAttr.id !== undefined && parseInt(extSystemAttr.id, 10) > 0 && this.extSystemAttrs.indexOf(extSystemAttr) !== -1) {
+ this.extSystemService.deleteExtSystemAttr(this.selectedEnvironment.sourceName, extSystemAttr.id).subscribe();
+ let idxES: number = this.extSystemAttrs.indexOf(extSystemAttr);
+ if (idxES !== -1) {
+ this.extSystemAttrs.splice(idxES, 1);
+ if (extSystemAttr.relations !== undefined && extSystemAttr.relations.length > 0) {
+ // remove all children
+ let indices = new Array<number>();
+ for (let h of extSystemAttr.relations) {
+ // the mdm attributes
+ indices = indices.concat(this.getIndicesForIds(h.ids));
+ }
+ indices.sort((a, b) => b - a);
+ for (let i of indices) {
+ this.extSystemAttrs.splice(indices[i], 1);
+ }
+ }
+ }
+ }
+ }
+ this.selectedExtSystemAttr = undefined;
+ }
+
+ /**
+ * Change listener on the name and description of the table element
+ */
+ updateSystemAttrModel(rowData: Node) {
+ // update the name attribute
+ this.getAttributeFromNode(rowData, 'Name').value = rowData.name;
+ // persist the change
+ this.saveExtSystemAttr(rowData);
+ }
+
+ /**
+ * Method invoked only if the save of the external system attribute succeeded
+ * This method is additional only successful if the node is a new node
+ */
+ saveExtSystemAttrSuccess(nodes: Node[]) {
+ if (this.tmpExtSystemAttr) {
+ for (let node of nodes) {
+ if (node.name === this.tmpExtSystemAttr.name && this.tmpExtSystemAttr.id === undefined) {
+ this.tmpExtSystemAttr.id = node.id;
+ }
+ }
+ this.extSystemAttrs.push(this.tmpExtSystemAttr);
+ this.tmpExtSystemAttr = undefined;
+ }
+ }
+
+ /**
+ * Save the external system attribute
+ */
+ saveExtSystemAttr(tmpAttr: Node) {
+ this.extSystemService.saveExtSystemAttr(this.selectedEnvironment.sourceName, tmpAttr, this.selectedExtSystem)
+ .subscribe(
+ response => this.saveExtSystemAttrSuccess(plainToClass(Node, response.json().data)),
+ error => {
+ this.tmpExtSystemAttr = undefined;
+ this.notificationService.notifyError(
+ this.translateService.instant('administration.extsystem.err-cannot-save-ext-system-attr'), error);
+ }
+ );
+ }
+
+ onExtSystemAttrSelect(event) {
+ let mdmAttrs = this.getMDMAttributes();
+ for (let attr of mdmAttrs) {
+ this.getCatalogComponentStr(attr);
+ this.getAttributeComponentStr(attr);
+ }
+ }
+
+ addExtSystemMDMAttr() {
+ this.tmpExtSystemMDMAttr = new Node();
+ this.tmpExtSystemMDMAttr.type = 'MDMAttribute';
+ this.tmpExtSystemMDMAttr.sourceType = 'MDMAttr';
+ this.tmpExtSystemMDMAttr.sourceName = this.selectedEnvironment.sourceName;
+ this.tmpExtSystemMDMAttr.attributes = new Array();
+ this.tmpExtSystemMDMAttr.attributes.push(this.createAttribute('AttrName'));
+ this.tmpExtSystemMDMAttr.attributes.push(this.createAttribute('CompName'));
+ this.tmpExtSystemMDMAttr.attributes.push(this.createAttribute('CompType'));
+ this.tmpExtSystemMDMAttr.attributes.push(this.createAttribute('MimeType', 'application/x-asam.aoany.mdmattr'));
+ // the name is the hierarchy from the parent elements appended with the name, set in save method
+ this.tmpExtSystemMDMAttr.attributes.push(this.createAttribute('Name'));
+
+ // add relation
+ if (this.selectedExtSystemAttr.relations === undefined || this.selectedExtSystemAttr.relations.length === 0) {
+ this.selectedExtSystemAttr.relations = new Array();
+ let relation = new Relation();
+ relation.entityType = 'MDMAttribute';
+ relation.type = 'CHILDREN';
+ relation.ids = new Array();
+ this.selectedExtSystemAttr.relations.push(relation);
+ }
+ if (this.selectedExtSystemAttr.relations[0].ids === undefined) {
+ this.selectedExtSystemAttr.relations[0].ids = new Array();
+ }
+
+ // Set initial name to persist the attribute
+ this.getAttributeFromNode(this.tmpExtSystemMDMAttr, 'CompType').value = 'UnitUnderTest';
+ this.getAttributeFromNode(this.tmpExtSystemMDMAttr, 'CompName').value = 'Komponente';
+ this.getAttributeFromNode(this.tmpExtSystemMDMAttr, 'AttrName').value = 'Attribut';
+
+ this.saveExtSystemMDMAttr(this.tmpExtSystemMDMAttr);
+ }
+
+ removeExtSystemMDMAttr(extSystemMDMAttr?: Node) {
+ if (extSystemMDMAttr != undefined) {
+ if (this.extSystemAttrs.indexOf(extSystemMDMAttr) !== -1) {
+ if (extSystemMDMAttr.id !== undefined && parseInt(extSystemMDMAttr.id, 10) > 0) {
+ this.extSystemService.deleteExtSystemMDMAttr(this.selectedEnvironment.sourceName, extSystemMDMAttr.id).subscribe();
+ }
+ this.extSystemAttrs.splice(this.extSystemAttrs.indexOf(extSystemMDMAttr), 1);
+ }
+ }
+ }
+
+ saveExtSystemMDMAttrSuccess(nodes: Node[]) {
+ if (this.tmpExtSystemMDMAttr) {
+ for (let node of nodes) {
+ if (node.name === this.tmpExtSystemMDMAttr.name && this.tmpExtSystemMDMAttr.id === undefined) {
+ this.tmpExtSystemMDMAttr.id = node.id;
+ for (let relation of this.selectedExtSystemAttr.relations) {
+ if (relation.entityType === 'MDMAttribute') {
+ if (relation.ids === undefined) {
+ relation.ids = new Array();
+ }
+ relation.ids.push(node.id);
+ }
+ }
+ }
+ }
+ this.extSystemAttrs.push(this.tmpExtSystemMDMAttr);
+ this.tmpExtSystemMDMAttr = undefined;
+ }
+ }
+
+ saveExtSystemMDMAttr(tmpAttr: Node) {
+ // update the name attribute with the hierarchy
+ tmpAttr.name = this.getAttributeValueFromNode(tmpAttr, 'CompType')
+ + '.' + this.getAttributeValueFromNode(tmpAttr, 'CompName')
+ + '.' + this.getAttributeValueFromNode(tmpAttr, 'AttrName');
+ this.getAttributeFromNode(tmpAttr, 'Name').value = tmpAttr.name;
+
+ this.extSystemService.saveExtSystemMDMAttr(this.selectedEnvironment.sourceName, tmpAttr, this.selectedExtSystemAttr)
+ .subscribe(
+ response => this.saveExtSystemMDMAttrSuccess(plainToClass(Node, response.json().data)),
+ error => {
+ this.tmpExtSystemMDMAttr = undefined;
+ this.notificationService.notifyError(
+ this.translateService.instant('administration.extsystem.err-cannot-save-ext-mdm-attr'), error);
+ }
+ );
+ }
+
+ async loadCatalogComps(type: string) {
+ if (type !== undefined && type != null && type.length > 0) {
+
+ // load the template roots if not available
+ if (this.loadedTemplateRoots[type] === undefined) {
+ this.loadedTemplateRoots[type] = [];
+ try {
+ const response = await this.catalogService.getTplRootsForType(this.selectedEnvironment.sourceName, type).toPromise();
+ this.loadedTemplateRoots[type] = response;
+ } catch (error) {
+ this.notificationService.notifyError(
+ this.translateService.instant('administration.extsystem.err-cannot-load-comp-types'), error);
+ }
+ }
+
+ // load the catalog components if not already triggered
+ if (this.loadedTemplateRoots[type] !== undefined && this.loadedTemplateRoots[type].length > 0
+ && this.loadedCatalogComps[type] === undefined) {
+ this.loadedCatalogComps[type] = [];
+ let tmpIds = this.loadedTemplateRoots[type].map(tr => tr.id);
+
+ of(tmpIds).pipe(
+ flatMap(q => forkJoin(...q.map(id => this.catalogService.getTplCompForRoot(this.selectedEnvironment.sourceName, type, id)))),
+ map(nested => [].concat(...nested))
+ ).subscribe(
+ templateComponentWithDuplicateVersions => {
+ const groupedByName = templateComponentWithDuplicateVersions.reduce((group: any[], templateComponent: any) => {
+ group[templateComponent.name] = group[templateComponent.name] || [];
+ group[templateComponent.name].push(templateComponent);
+ return group;
+ }, {});
+ let templateComponents = [];
+ for (const name of Object.keys(groupedByName)) {
+ templateComponents.push(groupedByName[name].reduce((g: any, templateComponent: any) =>
+ g.id <= templateComponent.id ? templateComponent : g,
+ { id: -1 }
+ ));
+ }
+ this.loadedCatalogComps[type] = templateComponents;
+ },
+ error => this.notificationService.notifyError(
+ this.translateService.instant('administration.extsystem.err-cannot-load-comp-types'), error)
+ );
+
+ return true;
+ }
+ }
+ return false;
+ }
+
+ async loadAttributeComps(type: string, comp: string) {
+ if (type !== undefined && type != null && type.length > 0 && comp !== undefined && comp != null && comp.length > 0
+ && this.loadedAttributeComps[type + comp] === undefined) {
+ let compId = '';
+ let rootId = '0';
+ if (this.loadedCatalogComps && this.loadedCatalogComps[type]) {
+ for (let catalogComp of this.loadedCatalogComps[type]) {
+ if (catalogComp.name === comp) {
+ compId = catalogComp.id;
+ break;
+ }
+ }
+ }
+ if (this.loadedTemplateRoots && this.loadedTemplateRoots[type]) {
+ for (let templateRoot of this.loadedTemplateRoots[type]) {
+ if (templateRoot.relations !== undefined) {
+ for (let relation of templateRoot.relations) {
+ if (relation.entityType === 'TemplateComponent'
+ && relation.ids !== undefined) {
+ for (let id of relation.ids) {
+ if (id === compId) {
+ rootId = templateRoot.id;
+ break;
+ }
+ }
+ if (rootId !== '0') {
+ break;
+ }
+ }
+ }
+ if (rootId !== '0') {
+ break;
+ }
+ }
+ }
+ }
+ if (rootId !== '0' && compId !== '') {
+ this.loadedAttributeComps[type + comp] = [];
+ try {
+ const response = await this.catalogService.
+ getTplAttrsForComp(this.selectedEnvironment.sourceName, type, rootId, compId).toPromise();
+ for (let t of response) {
+ this.loadedAttributeComps[type + comp].push(t);
+ }
+ } catch (error) {
+ this.notificationService.notifyError(
+ this.translateService.instant('administration.extsystem.err-cannot-load-comp-types'), error);
+ }
+ return true;
+ }
+ } else {
+ return false;
+ }
+ }
+
+ getCatalogComponentStr(rowData: Node) {
+ let type: string = <string> this.getAttributeValueFromNode(rowData, 'CompType');
+ let data: string[] = new Array();
+ // sensor does not have catalog elements
+ if (type !== undefined && type !== 'Sensor') {
+ let components = this.getCatalogComponents(type);
+ if (components) {
+ for (let component of components) {
+ data.push(component.name);
+ }
+ }
+ }
+ return data;
+ }
+
+ getAttributeComponentStr(rowData: Node) {
+ let type: string = <string> this.getAttributeValueFromNode(rowData, 'CompType');
+ let comp: string = <string> this.getAttributeValueFromNode(rowData, 'CompName');
+ let data: string[] = new Array();
+ if (type !== undefined && comp !== undefined) {
+ let components = this.getAttributeComponents(type, comp);
+ if (components) {
+ for (let component of components) {
+ data.push(component.name);
+ }
+ }
+ }
+ return data;
+ }
+
+ getCatalogComponents(type: string) {
+ let data: Node[] = this.loadedCatalogComps[type];
+ if (data === undefined || data == null || data.length === 0) {
+ if (this.loadCatalogComps(type)) {
+ data = this.loadedCatalogComps[type];
+ }
+ }
+ return data;
+ }
+
+ getAttributeComponents(type: string, comp: string) {
+ let data: Node[] = this.loadedAttributeComps[type + comp];
+ if (data === undefined || data == null || data.length === 0) {
+ if (this.loadAttributeComps(type, comp)) {
+ data = this.loadedAttributeComps[type + comp];
+ }
+ }
+ return data;
+ }
+
+ /**
+ *
+ */
+ availableCatalogComps(rowData: Node) {
+ let result = this.availableSlctCtlgComps[rowData.id];
+ if (result === undefined) {
+ result = [];
+ result.push({ label: this.translateService.instant('administration.extsystem.dropdown-please-select'), value: '' });
+ let items = this.getCatalogComponentStr(rowData);
+ for (let item of items) {
+ if (item !== undefined) {
+ result.push({ label: item, value: item});
+ }
+ }
+ if (result.length > 1) {
+ this.availableSlctCtlgComps[rowData.id] = result;
+ }
+ }
+ return result;
+ }
+
+ availableAttributeComps(rowData: Node) {
+ let result = this.availableSlctAttrComps[rowData.id];
+ if (result === undefined) {
+ result = [];
+ result.push({ label: this.translateService.instant('administration.extsystem.dropdown-please-select'), value: '' });
+ let items = this.getAttributeComponentStr(rowData);
+ for (let item of items) {
+ if (item !== undefined) {
+ result.push({ label: item, value: item});
+ }
+ }
+ if (result.length > 1) {
+ this.availableSlctAttrComps[rowData.id] = result;
+ }
+ }
+ return result;
+ }
+
+ handleCompTypeSelect(event, rowData: Node) {
+ this.availableSlctCtlgComps[rowData.id] = undefined;
+ this.availableSlctAttrComps[rowData.id] = undefined;
+ this.getAttributeFromNode(rowData, 'CompName').value = 'Komponente';
+ this.getAttributeFromNode(rowData, 'AttrName').value = 'Attribut';
+ this.getCatalogComponentStr(rowData);
+ this.saveExtSystemMDMAttr(rowData);
+ }
+
+ handleCompSelect(event, rowData: Node) {
+ this.availableSlctAttrComps[rowData.id] = undefined;
+ this.getAttributeFromNode(rowData, 'AttrName').value = 'Attribut';
+ this.getAttributeComponentStr(rowData);
+ this.saveExtSystemMDMAttr(rowData);
+ }
+
+ handleAttrCompSelect(event, rowData: Node) {
+ this.saveExtSystemMDMAttr(rowData);
+ }
+
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-viewer.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-viewer.component.html
new file mode 100644
index 0000000..543a87e
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-viewer.component.html
@@ -0,0 +1,127 @@
+<!-- ********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ******************************************************************************** -->
+
+ <div class="mdm-extsystem-viewer-container">
+
+ <p-table class="ext-system-table" [value]="getExternalSystems()" *ngIf="selectedEnvironment && extSystems" styleClass="table-hover"
+ (onRowSelect)="onExtSystemRowSelect($event)" (onRowUnselect)="onExtSystemRowUnselect($event)"
+ selectionMode="single" [(selection)]="selectedExtSystem">
+ <ng-template pTemplate="header">
+ <tr>
+ <th>{{ 'administration.extsystem.name' | translate }}</th>
+ <th>{{ 'administration.extsystem.description' | translate }}</th>
+ <th class="button-col"></th>
+ <th class="button-col"></th>
+ </tr>
+ </ng-template>
+ <ng-template pTemplate="body" let-rowData let-rowIndex="rowIndex">
+ <tr [pSelectableRow]="rowData" [pSelectableRowIndex]="rowIndex" [pContextMenuRow]="rowData">
+ <td>
+ <span>{{rowData.name}}</span>
+ </td>
+ <td>
+ <span>{{getAttributeValueFromNode(rowData,'Description')}}</span>
+ </td>
+ <td>
+ <button type="button" class="btn btn-default pull-right" (click)="editExtSystem(rowData)" title="{{'administration.extsystem.btn-edit' | translate }}">
+ <span class="fa fa-pencil-square-o"></span>
+ </button>
+ </td>
+ <td>
+ <button type="button" class="btn btn-default pull-right" (click)="removeExtSystem(rowData)" title="{{'administration.extsystem.btn-del' | translate }}">
+ <span class="fa fa-times"></span>
+ </button>
+ </td>
+ </tr>
+ </ng-template>
+ </p-table>
+
+ <p-dialog header="{{ 'administration.extsystem.dialog-ext-system-delete-title' | translate }}" [(visible)]="dialogExtSystemDelete">
+ <div class="text">
+ <span>{{ 'administration.extsystem.dialog-ext-system-delete-text' | translate }}</span>
+ </div>
+ <div class="dialogcommands">
+ <button type="button" class="btn btn-default pull-right" (click)="confirmRemoveExtSystem()">
+ <span class="fa fa-plus"></span> {{'administration.extsystem.btn-del' | translate }}
+ </button>
+ <button type="button" class="btn btn-default pull-right" (click)="cancelRemoveExtSystem()">
+ <span class="fa fa-times"></span> {{'administration.extsystem.btn-cancel' | translate }}
+ </button>
+ </div>
+ </p-dialog>
+
+ <p-dialog header="{{ 'administration.extsystem.dialog-ext-system-title' | translate}}" [(visible)]="dialogExtSystemCreate">
+ <table *ngIf="tmpExtSystemCreate">
+ <tr>
+ <td>{{ 'administration.extsystem.name' | translate}}</td>
+ <td><input required type="text" [(ngModel)]="tmpExtSystemCreate.name" /></td>
+ </tr>
+ </table>
+ <div class="dialogcommands">
+ <button type="button" class="btn btn-default pull-right" (click)="saveDialogExtSystem()">
+ <span class="fa fa-plus"></span> {{'administration.extsystem.btn-save' | translate }}
+ </button>
+ <button type="button" class="btn btn-default pull-right" (click)="cancelDialogExtSystem()">
+ <span class="fa fa-times"></span> {{'administration.extsystem.btn-cancel' | translate }}
+ </button>
+ </div>
+ </p-dialog>
+
+ <div *ngIf="selectedEnvironment" class="commands">
+ <button type="button" class="btn btn-default pull-right" (click)="addExtSystem()">
+ <span class="fa fa-plus"></span> {{'administration.extsystem.btn-add' | translate }}
+ </button>
+ </div>
+
+ <div class="custom-split-pane" *ngIf="selectedExtSystem">
+ <div class="custom-split-pane-content custom-split-pane-left">
+ <div>{{ 'administration.extsystem.ext-system-attributes' | translate }}</div>
+ <p-table [value]="getExternalSystemAttributes()" selectionMode="single" [(selection)]="selectedExtSystemAttr">
+ <ng-template pTemplate="header">
+ <tr>
+ <th>{{ 'administration.extsystem.name' | translate }}</th>
+ <th>{{ 'administration.extsystem.description' | translate }}</th>
+ </tr>
+ </ng-template>
+ <ng-template pTemplate="body" let-rowData let-rowIndex="rowIndex">
+ <tr [pSelectableRow]="rowData" [pSelectableRowIndex]="rowIndex" [pContextMenuRow]="rowData">
+ <td>{{rowData.name}}</td>
+ <td>{{getAttributeValueFromNode(rowData,'Description')}}</td>
+ </tr>
+ </ng-template>
+ </p-table>
+ <div *ngIf="loadingExtSystemAttr">{{ 'administration.extsystem.loading-attributes' | translate }}</div>
+ </div>
+ <div class="custom-split-pane-content custom-split-pane-right">
+ <div>{{ 'administration.extsystem.mdm-attributes' | translate }}</div>
+ <p-table *ngIf="selectedExtSystemAttr" [value]="getMDMAttributes()">
+ <ng-template pTemplate="header">
+ <tr>
+ <th>{{ 'administration.extsystem.component-type' | translate }}</th>
+ <th>{{ 'administration.extsystem.component-name' | translate }}</th>
+ <th>{{ 'administration.extsystem.attribute-name' | translate }}</th>
+ </tr>
+ </ng-template>
+ <ng-template pTemplate="body" let-rowData let-rowIndex="rowIndex">
+ <tr>
+ <td>{{getAttributeValueFromNode(rowData,'CompType')}}</td>
+ <td>{{getAttributeValueFromNode(rowData,'CompName')}}</td>
+ <td>{{getAttributeValueFromNode(rowData,'AttrName')}}</td>
+ </tr>
+ </ng-template>
+ </p-table>
+ </div>
+ </div>
+
+ </div>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-viewer.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-viewer.component.ts
new file mode 100644
index 0000000..6e3a0db
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem-viewer.component.ts
@@ -0,0 +1,260 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+
+import { Component, OnInit, ViewChild, Input, OnDestroy, Output, EventEmitter } from '@angular/core';
+import { FormGroup, FormControl, FormBuilder, FormArray, Validators } from '@angular/forms';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { DropdownModule } from 'primeng/dropdown';
+import { TreeTableModule } from 'primeng/treetable';
+import { TreeNode, MenuItem } from 'primeng/api';
+import { ContextMenuModule } from 'primeng/contextmenu';
+import { TreeTable, TreeTableToggler, DataTable } from 'primeng/primeng';
+import { DialogModule } from 'primeng/dialog';
+import { Observable, BehaviorSubject } from 'rxjs';
+
+import { MDMNotificationService } from '../core/mdm-notification.service';
+import { ExtSystemService } from './extsystem.service';
+import { Node, Attribute } from '../navigator/node';
+import { plainToClass } from 'class-transformer';
+
+@Component( {
+ selector: 'mdm-extsystem-viewer',
+ templateUrl: './extsystem-viewer.component.html',
+ styleUrls: ['./extsystem.component.css']
+})
+export class ExtSystemViewerComponent implements OnInit, OnDestroy {
+
+ // passed down from parent
+ @Input() extSystems: Node[];
+ @Input() selectedEnvironment: Node;
+
+ @Output() editMode = new EventEmitter<boolean>();
+ @Output() selectedES = new EventEmitter<string>();
+
+ // dialog and loading states
+ dialogExtSystemCreate = false;
+ dialogExtSystemDelete = false;
+ loadingExtSystemAttr = false;
+
+ // temporary data for dialogs
+ tmpExtSystemCreate: Node;
+ tmpExtSystemDelete: Node;
+
+ // external system attributes
+ extSystemAttrs: Node[];
+ bsExtSystemAttrs: BehaviorSubject<Node[]> = new BehaviorSubject<Node[]>(undefined);
+
+ // table selection
+ selectedExtSystem: Node;
+ selectedExtSystemAttr: Node;
+
+ constructor(private extSystemService: ExtSystemService,
+ private notificationService: MDMNotificationService,
+ private translateService: TranslateService) {
+
+ this.bsExtSystemAttrs.subscribe(value => {
+ this.extSystemAttrs = value;
+ });
+ }
+
+ ngOnInit() {
+ this.bsExtSystemAttrs.next(undefined);
+ }
+
+
+ ngOnDestroy() {
+ }
+
+ getExternalSystems() {
+ let data = new Array();
+ for (let i in this.extSystems) {
+ if (this.extSystems[i].type === 'ExtSystem') {
+ data.push(this.extSystems[i]);
+ }
+ }
+ return data;
+ }
+
+ getExternalSystemAttributes() {
+ if (!this.extSystemAttrs) {
+ return new Array();
+ }
+ return this.extSystemAttrs.filter(attr => attr.type === 'ExtSystemAttribute');
+ }
+
+ getMDMAttributes() {
+ let ids = new Array();
+ // need double forEach as the map function transfers the array into another array
+ this.selectedExtSystemAttr.relations.filter(rel => rel.entityType === 'MDMAttribute').map(rel => rel.ids)
+ .forEach(i => i.forEach(id => ids.push(id)));
+ return this.extSystemAttrs.filter(attr => attr.type === 'MDMAttribute' && ids.find(i => i === attr.id));
+ }
+
+ getAttributeValueFromNode(node: Node, attribute: string) {
+ for (let attr of node.attributes) {
+ if (attr.name === attribute) {
+ return attr.value;
+ }
+ }
+ return '';
+ }
+
+ getAttributeFromNode(node: Node, attribute: string) {
+ if (node.attributes !== undefined) {
+ for (let attr of node.attributes) {
+ if (attr.name === attribute) {
+ return attr;
+ }
+ }
+ }
+ return undefined;
+ }
+
+ onExtSystemRowSelect(event: any) {
+ this.selectedExtSystemAttr = undefined;
+ this.bsExtSystemAttrs.next(undefined);
+ this.loadingExtSystemAttr = true;
+ this.selectedExtSystem = event.data;
+ this.extSystemService.getExtSystemAttributesForScope(this.selectedEnvironment.sourceName, this.selectedExtSystem.id)
+ .subscribe(attrs => {
+ this.bsExtSystemAttrs.next(attrs);
+ this.loadingExtSystemAttr = false;
+ });
+ }
+
+ onExtSystemRowUnselect(event: any) {
+ this.selectedExtSystem = undefined;
+ this.bsExtSystemAttrs.next(undefined);
+ }
+
+
+ createAttribute(name: string, value?: string) {
+ let attr = new Attribute();
+ attr.dataType = 'STRING';
+ attr.unit = '';
+ attr.value = value !== undefined ? value : '';
+ attr.name = name;
+ return attr;
+ }
+
+ getIndicesForIds(ids: string[]) {
+ let indices = new Array();
+ for (let id of ids) {
+ for (let extSystem of this.extSystems) {
+ if (extSystem.id === id) {
+ indices.push(this.extSystems.indexOf(extSystem));
+ }
+ }
+ }
+ return indices;
+ }
+
+ addExtSystem() {
+ this.tmpExtSystemCreate = new Node();
+ this.tmpExtSystemCreate.type = 'ExtSystem';
+ this.tmpExtSystemCreate.sourceType = 'ExtSystem';
+ this.tmpExtSystemCreate.sourceName = this.selectedEnvironment.sourceName;
+ this.tmpExtSystemCreate.attributes = new Array();
+ this.tmpExtSystemCreate.attributes.push(this.createAttribute('Description'));
+ this.tmpExtSystemCreate.attributes.push(this.createAttribute('Name'));
+ this.tmpExtSystemCreate.attributes.push(this.createAttribute('MimeType', 'application/x-asam.aoany.extsystem'));
+ this.dialogExtSystemCreate = true;
+ }
+
+ editExtSystem(extSystem?: Node) {
+ if (extSystem != undefined) {
+ this.tmpExtSystemCreate = extSystem;
+ // this.dialogExtSystem = true;
+ this.selectedES.next(extSystem.id);
+ this.editMode.next(true);
+ }
+ }
+
+ removeExtSystem(extSystem?: Node) {
+ this.tmpExtSystemDelete = extSystem;
+ this.dialogExtSystemDelete = true;
+ }
+
+ cancelRemoveExtSystem() {
+ this.tmpExtSystemDelete = undefined;
+ this.dialogExtSystemDelete = false;
+ }
+
+ confirmRemoveExtSystem() {
+ if (this.tmpExtSystemDelete != undefined) {
+ let idxES: number = this.extSystems.indexOf(this.tmpExtSystemDelete);
+ if (idxES !== -1) {
+ this.extSystems.splice(idxES, 1);
+ if (this.tmpExtSystemDelete.relations !== undefined && this.tmpExtSystemDelete.relations.length > 0) {
+ // remove all children
+ let indices = new Array<number>();
+ for (let relation of this.tmpExtSystemDelete.relations) {
+ // the ext system attributes
+ let indicesESA = this.getIndicesForIds(relation.ids);
+ for (let ind of indicesESA) {
+ for (let r of this.extSystems[ind].relations) {
+ // the mdm attributes
+ indices = indices.concat(this.getIndicesForIds(r.ids));
+ }
+ }
+ indices = indices.concat(indicesESA);
+ }
+ indices.sort((a, b) => b - a);
+ for (let i of indices) {
+ this.extSystems.splice(i, 1);
+ }
+ }
+ }
+ if (this.tmpExtSystemDelete.id !== undefined && parseInt(this.tmpExtSystemDelete.id, 10) > 0) {
+ this.extSystemService.deleteExtSystem(this.selectedEnvironment.sourceName, this.tmpExtSystemDelete.id).subscribe();
+ }
+ }
+ this.selectedExtSystem = undefined;
+ this.tmpExtSystemDelete = undefined;
+ this.dialogExtSystemDelete = false;
+ }
+
+ // for new external systems only
+ saveDialogExtSystem() {
+ // update the name attribute
+ this.getAttributeFromNode(this.tmpExtSystemCreate, 'Name').value = this.tmpExtSystemCreate.name;
+ this.extSystemService.saveExtSystem(this.selectedEnvironment.sourceName, this.tmpExtSystemCreate)
+ .subscribe(
+ response => this.patchResponse(plainToClass(Node, response.json().data)),
+ error => this.notificationService.notifyError(
+ this.translateService.instant('administration.extsystem.err-cannot-save-ext-system'), error)
+ );
+ this.dialogExtSystemCreate = false;
+ }
+
+ cancelDialogExtSystem() {
+ this.dialogExtSystemCreate = false;
+ this.tmpExtSystemCreate = undefined;
+ }
+
+ patchResponse(nodes: Node[]) {
+ for (let node of nodes) {
+ if (node.name === this.tmpExtSystemCreate.name) {
+ if (this.tmpExtSystemCreate.id === undefined) {
+ this.extSystems.push(this.tmpExtSystemCreate);
+ }
+ this.tmpExtSystemCreate.id = node.id;
+ }
+ }
+ this.tmpExtSystemCreate = undefined;
+ }
+
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.component.css b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.component.css
new file mode 100644
index 0000000..3c5823d
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.component.css
@@ -0,0 +1,60 @@
+@charset "ISO-8859-1";
+
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+.mdm-extsystem-viewer-container,
+.mdm-extsystem-editor-container{display:block;margin-bottom:8px;}
+
+.mdm-extsystem-editor-container .commands,
+.mdm-extsystem-viewer-container .commands,
+.extsystem-comp .commands,
+.extsystem-comp .commands {
+ min-height: 30px;
+ display: block;
+ margin-bottom: 10px;
+ margin-top:6px;
+ width: 100%;
+}
+.mdm-extsystem-editor-container .commands button,
+.mdm-extsystem-viewer-container .commands button,
+.extsystem-comp .commands button,
+.extsystem-comp .commands button {
+ margin-left: 10px;
+}
+
+.custom-split-pane {
+ display: block;
+ margin-top: 20px;
+}
+.custom-split-pane-content{display: inline-block;}
+.custom-split-pane-left{width:38%;vertical-align:top;}
+.custom-split-pane-right {
+ margin-left: 1%;
+ width: 58%;
+ vertical-align: top;
+}
+
+.ext-system-table {
+ margin-top: 10px;
+}
+.ext-system-table .button-col{
+ width:60px;
+}
+
+.ext-system-table input{width:100%;}
+.ext-system-attr-table input{width:100%;}
+.ext-system-mdmattr-table .drpdwn{width:100%!important;}
+
+.actioncol{width: 65px;}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.component.html
new file mode 100644
index 0000000..a03a9ba
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.component.html
@@ -0,0 +1,35 @@
+<!-- ********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ******************************************************************************** -->
+
+<div class="extsystem-comp">
+ <div *ngIf="!environments">{{ 'administration.extsystem.loading' | translate }}</div>
+
+ <div class="system-selector">
+ <div *ngIf="!selectedEnvironment" style="display:inline;">{{ 'administration.extsystem.select-system' | translate }}:</div>
+ <div *ngIf="selectedEnvironment" style="display:inline;">{{ 'administration.extsystem.selected-system' | translate }}:</div>
+ <p-dropdown [options]="environments" [(ngModel)]="selectedEnvironment" optionLabel="sourceName" (onChange)="onChangeExtSystem($event)" placeholder="{{ 'administration.extsystem.dropdown-please-select' | translate }}"></p-dropdown>
+ </div>
+
+ <div *ngIf="selectedEnvironment && extSystems">
+
+ <div class="commands">
+ <button *ngIf="editorMode" type="button" class="btn btn-default pull-right" (click)="onPageBack()">
+ <span class="fa fa-reply"></span> {{'administration.extsystem.btn-back' | translate }}
+ </button>
+ </div>
+
+ <mdm-extsystem-editor *ngIf="editorMode" [selectedEnvironment]="selectedEnvironment" [extSystems]="extSystems" (editMode)="onEditModeChange($event)" [selectedES]="selectedExtSystem"></mdm-extsystem-editor>
+ <mdm-extsystem-viewer *ngIf="!editorMode" [selectedEnvironment]="selectedEnvironment" [extSystems]="extSystems" (editMode)="onEditModeChange($event)" (selectedES)="onChangeSelectedExtSystem($event)"></mdm-extsystem-viewer>
+ </div>
+</div>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.component.ts
new file mode 100644
index 0000000..189356f
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.component.ts
@@ -0,0 +1,101 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+
+import { Component, OnInit, ViewChild, Input, OnDestroy } from '@angular/core';
+import { FormGroup, FormControl, FormBuilder, FormArray, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { DropdownModule } from 'primeng/dropdown';
+import { TreeTableModule } from 'primeng/treetable';
+import { TreeNode, MenuItem } from 'primeng/api';
+import { ContextMenuModule } from 'primeng/contextmenu';
+import { TreeTable, TreeTableToggler, DataTable } from 'primeng/primeng';
+import { DialogModule } from 'primeng/dialog';
+import { Observable, BehaviorSubject } from 'rxjs';
+
+import { MDMNotificationService } from '../core/mdm-notification.service';
+import { ExtSystemService } from './extsystem.service';
+import { Node } from '../navigator/node';
+import { NodeService } from '../navigator/node.service';
+
+@Component( {
+ selector: 'mdm-extsystem',
+ templateUrl: './extsystem.component.html',
+ styleUrls: ['./extsystem.component.css']
+})
+export class ExtSystemComponent implements OnInit, OnDestroy {
+
+ // available external systems
+ extSystems: Node[];
+ bsExtSystems: BehaviorSubject<Node[]> = new BehaviorSubject<Node[]>(undefined);
+ selectedEnvironment: Node;
+
+ editorMode = false;
+ selectedExtSystem: string = undefined;
+
+ // dropdown selection
+ environments: Node[];
+
+ // unknown -> remove
+ scope: string;
+
+ constructor(private extSystemService: ExtSystemService,
+ private notificationService: MDMNotificationService,
+ private translateService: TranslateService,
+ private nodeService: NodeService) {
+
+ this.bsExtSystems.subscribe(value => {
+ this.extSystems = value;
+ });
+ }
+
+ ngOnInit() {
+ this.nodeService.getRootNodes().subscribe(
+ envs => this.environments = envs,
+ error => this.translateService.instant('basket.mdm-basket.err-cannot-load-sources')
+ .subscribe(msg => this.notificationService.notifyError(msg, error)
+ ));
+
+ this.bsExtSystems.next(undefined);
+ }
+
+ ngOnDestroy() {
+ }
+
+ onEditModeChange(editMode: boolean) {
+ this.editorMode = editMode;
+ }
+
+ onChangeSelectedExtSystem(extSystem: string) {
+ this.selectedExtSystem = extSystem;
+ }
+
+ onChangeExtSystem(event: any) {
+ this.extSystems = undefined;
+ if (this.selectedEnvironment !== undefined) {
+ this.scope = this.selectedEnvironment.sourceName;
+ }
+ this.extSystemService.getExtSystemForScope(this.scope).subscribe(es => this.bsExtSystems.next(es));
+ }
+
+
+ onPageSwitchToEdit() {
+ this.onEditModeChange(true);
+ }
+
+ onPageBack() {
+ this.onEditModeChange(false);
+ }
+
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.service.ts
new file mode 100644
index 0000000..91eccd1
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/extsystem.service.ts
@@ -0,0 +1,170 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+
+import { Injectable } from '@angular/core';
+import { Http, Response, Headers, RequestOptions } from '@angular/http';
+
+import { PropertyService } from '../core/property.service';
+
+import { plainToClass } from 'class-transformer';
+import { HttpErrorHandler } from '../core/http-error-handler';
+import { throwError as observableThrowError, Observable } from 'rxjs';
+import { map, catchError } from 'rxjs/operators';
+import { Node } from '../navigator/node';
+
+@Injectable()
+export class ExtSystemService {
+
+ private prefEndpoint: string;
+
+ constructor(private http: Http,
+ private httpErrorHandler: HttpErrorHandler,
+ private _prop: PropertyService) {
+ this.prefEndpoint = _prop.getUrl('mdm/administration/');
+ }
+
+ getExtSystemForScope(scope: string, key?: string): Observable<Node[]> {
+ if (key == null) {
+ key = '';
+ }
+
+ return this.http.get(this.prefEndpoint + scope + '/externalsystems').pipe(
+ map(response => plainToClass(Node, response.json().data)),
+ catchError(this.handleError));
+ }
+
+ getExtSystemAttributesForScope(scope: string, id: string, key?: string): Observable<Node[]> {
+ if (key == null) {
+ key = '';
+ }
+
+ return this.http.get(this.prefEndpoint + scope + '/externalsystems/attributes/' + id).pipe(
+ map(response => plainToClass(Node, response.json().data)),
+ catchError(this.handleError));
+ }
+
+ getExtSystem(key?: string) {
+ if (key == null) {
+ key = '';
+ }
+ return this.http.get(this.prefEndpoint + '?key=' + key).pipe(
+ map(response => plainToClass(Node, response.json().data)),
+ catchError(this.handleError));
+ }
+
+ getAttributeValueFromNode(node: Node, attribute: string) {
+ if (node.attributes !== undefined) {
+ for (let i in node.attributes) {
+ if (node.attributes[i].name === attribute) {
+ return node.attributes[i].value;
+ }
+ }
+ }
+ return '';
+ }
+
+ saveExtSystemAttr(scope: string, extSystemAttr: Node, extSystem: Node) {
+ let headers = new Headers({ 'Content-Type': 'application/json' });
+ let options = new RequestOptions({ headers: headers });
+
+ let structure = {};
+ structure['Name'] = extSystemAttr.name;
+
+ if (parseInt(extSystemAttr.id, 10) > 0) {
+ structure['Description'] = this.getAttributeValueFromNode(extSystemAttr, 'Description');
+ // update
+ return this.http.put(this.prefEndpoint + scope + '/externalsystems/attribute/' + extSystemAttr.id,
+ JSON.stringify(structure), options).pipe(
+ catchError(this.handleError)
+ );
+ } else {
+ structure['ExtSystemAttribute'] = extSystemAttr;
+ // only provide the ID as the backend will evaluate the whole json string
+ structure['ExtSystem'] = extSystem.id;
+ // create
+ return this.http.post(this.prefEndpoint + scope + '/externalsystems/attribute', JSON.stringify(structure), options).pipe(
+ catchError(this.handleError));
+ }
+ }
+
+ saveExtSystemMDMAttr(scope: string, extSystemMDMAttr: Node, extSystemAttr: Node) {
+ let headers = new Headers({ 'Content-Type': 'application/json' });
+ let options = new RequestOptions({ headers: headers });
+
+ let structure = {};
+ structure['Name'] = extSystemMDMAttr.name;
+
+ if (parseInt(extSystemMDMAttr.id, 10) > 0) {
+ structure['CompType'] = this.getAttributeValueFromNode(extSystemMDMAttr, 'CompType');
+ structure['CompName'] = this.getAttributeValueFromNode(extSystemMDMAttr, 'CompName');
+ structure['AttrName'] = this.getAttributeValueFromNode(extSystemMDMAttr, 'AttrName');
+ // update
+ return this.http.put(this.prefEndpoint + scope + '/externalsystems/mdmattribute/' + extSystemMDMAttr.id,
+ JSON.stringify(structure), options).pipe(
+ catchError(this.handleError)
+ );
+ } else {
+ structure['MDMAttribute'] = extSystemMDMAttr;
+ structure['ExtSystemAttribute'] = extSystemAttr.id;
+ // create
+ return this.http.post(this.prefEndpoint + scope + '/externalsystems/mdmattribute', JSON.stringify(structure), options).pipe(
+ catchError(this.handleError));
+ }
+ }
+
+ saveExtSystem(scope: string, extSystem: Node) {
+ let headers = new Headers({ 'Content-Type': 'application/json' });
+ let options = new RequestOptions({ headers: headers });
+
+ let structure = {};
+ structure['Name'] = extSystem.name;
+
+ if (parseInt(extSystem.id, 10) > 0) {
+ // update
+ structure['Description'] = this.getAttributeValueFromNode(extSystem, 'Description');
+ return this.http.put(this.prefEndpoint + scope + '/externalsystems/' + extSystem.id, JSON.stringify(structure), options).pipe(
+ catchError(this.handleError));
+ } else {
+ structure['ExtSystem'] = extSystem;
+ // create
+ return this.http.post(this.prefEndpoint + scope + '/externalsystems', JSON.stringify(structure), options).pipe(
+ catchError(this.handleError));
+ }
+ }
+
+ deleteExtSystem(scope: string, id: string) {
+ return this.http.delete(this.prefEndpoint + scope + '/externalsystems/' + id).pipe(
+ catchError(this.handleError));
+ }
+ deleteExtSystemAttr(scope: string, id: string) {
+ return this.http.delete(this.prefEndpoint + scope + '/externalsystems/attribute/' + id).pipe(
+ catchError(this.handleError));
+ }
+ deleteExtSystemMDMAttr(scope: string, id: string) {
+ return this.http.delete(this.prefEndpoint + scope + '/externalsystems/mdmattribute/' + id).pipe(
+ catchError(this.handleError));
+ }
+
+ private handleError(e: Error | any) {
+ if (e instanceof Response) {
+ let response = <Response> e;
+ if (response.status !== 200) {
+ return observableThrowError('Could not request extSystems! '
+ + 'Please check if application server is running and extSystem database is configured correctly.');
+ }
+ }
+ return this.httpErrorHandler.handleError(e);
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference-module.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference-module.component.html
new file mode 100644
index 0000000..e818119
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference-module.component.html
@@ -0,0 +1,30 @@
+<!--/********************************************************************************
+* Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Eclipse Public License v. 2.0 which is available at
+* http://www.eclipse.org/legal/epl-2.0.
+*
+* SPDX-License-Identifier: EPL-2.0
+*
+********************************************************************************/-->
+
+<nav class="navbar navbar-default navbar-expand bg-light">
+ <div class="container-fluid">
+ <div class="collapse navbar-collapse" id="bs-admin-navbar">
+ <a class="navbar-brand" style="font-weight: 500;">{{'administration.admin-modules.scope' | translate }}</a>
+ <ul class="nav navbar-nav mdm-link-list">
+ <li *ngFor="let m of links" [routerLinkActive]="['active']" class="nav-item">
+ <a (click)="onScopeChange(m.path)" routerLink="{{m.path}}" class="nav-link" style="cursor:pointer;">
+ {{m.name | translate}}
+ </a>
+ </li>
+ </ul>
+ </div>
+
+ </div>
+</nav>
+<mdm-preference [scope]="scope" [preferences]="preferences"></mdm-preference>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference-module.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference-module.component.ts
new file mode 100644
index 0000000..ab14b0a
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference-module.component.ts
@@ -0,0 +1,52 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+
+import {Component, OnInit} from '@angular/core';
+import {Router} from '@angular/router';
+
+import { TRANSLATE } from '../core/mdm-core.module';
+import { PreferenceService, Preference } from '../core/preference.service';
+
+@Component({
+ selector: 'preference-module',
+ templateUrl: 'preference-module.component.html',
+ providers: []
+})
+export class PreferenceModuleComponent implements OnInit {
+
+ preferences: Preference[];
+ scope: string;
+ sub: any;
+
+ links = [
+ { name: TRANSLATE('administration.admin-modules.system'), path: 'system'},
+ { name: TRANSLATE('administration.admin-modules.source'), path: 'source'},
+ { name: TRANSLATE('administration.admin-modules.user'), path: 'user'}
+ ];
+ constructor(private router: Router,
+ private preferenceService: PreferenceService) { }
+
+ ngOnInit() {
+ this.onScopeChange('system');
+ }
+
+ onScopeChange(path: string) {
+ this.scope = path.toUpperCase();
+ if (this.scope !== undefined) {
+ this.preferenceService.getPreferenceForScope(this.scope)
+ .subscribe(pref => this.preferences = pref);
+ }
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference-routing.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference-routing.module.ts
new file mode 100644
index 0000000..b36bfc4
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference-routing.module.ts
@@ -0,0 +1,41 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+
+import { PreferenceComponent } from './preference.component';
+import { PreferenceModuleComponent } from './preference-module.component';
+
+const moduleRoutes: Routes = [
+ {
+ path: '', component: PreferenceModuleComponent,
+ children: [
+ { path: ':scope', component: PreferenceComponent },
+ { path: '', redirectTo: 'system', pathMatch: 'full' }
+ ]
+ }
+];
+
+@NgModule({
+ imports: [
+ RouterModule.forChild(moduleRoutes)
+ ],
+ exports: [
+ RouterModule
+ ]
+})
+
+export class PreferenceRoutingModule { }
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.ts
index 65ef991..409b20c 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.component.ts
@@ -20,7 +20,7 @@
import { PreferenceService, Preference, Scope } from '../core/preference.service';
import { EditPreferenceComponent } from './edit-preference.component';
-import {MDMNotificationService} from '../core/mdm-notification.service';
+import { MDMNotificationService } from '../core/mdm-notification.service';
import { TranslateService } from '@ngx-translate/core';
@@ -32,7 +32,7 @@
export class PreferenceComponent implements OnInit, OnDestroy {
@Input() preferences: Preference[];
- scope: string;
+ @Input() scope: string;
subscription: any;
sub: any;
@@ -46,21 +46,9 @@
private translateService: TranslateService) { }
ngOnInit() {
- this.sub = this.route.params.subscribe(
- params => this.onScopeChange(params),
- error => this.notificationService.notifyError(
- this.translateService.instant('administration.edit-preference.err-cannot-load-scope'), error)
- );
}
ngOnDestroy() {
- this.sub.unsubscribe();
- }
-
- onScopeChange(params: any) {
- this.scope = params['scope'].toUpperCase();
- this.preferenceService.getPreferenceForScope(this.scope)
- .subscribe(pref => this.preferences = pref);
}
editPreference( preference?: Preference ) {
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.module.ts
new file mode 100644
index 0000000..49becfa
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/administration/preference.module.ts
@@ -0,0 +1,45 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { NgModule } from '@angular/core';
+import { PreferenceRoutingModule } from './preference-routing.module';
+import { PreferenceModuleComponent } from './preference-module.component';
+import { PreferenceComponent } from './preference.component';
+import { EditPreferenceComponent } from './edit-preference.component';
+import { MDMCoreModule } from '../core/mdm-core.module';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { PreferenceService } from '../core/preference.service';
+import { ComponentLoaderFactory } from 'ngx-bootstrap';
+
+
+@NgModule({
+ imports: [
+ MDMCoreModule,
+ FormsModule,
+ ReactiveFormsModule,
+ PreferenceRoutingModule
+ ],
+ declarations: [
+ EditPreferenceComponent,
+ PreferenceModuleComponent,
+ PreferenceComponent
+ ],
+ exports: [
+ ],
+ providers: [
+ ComponentLoaderFactory,
+ PreferenceService
+ ],
+})
+export class PreferenceModule {}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/app-routing.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/app-routing.module.ts
index 2b6e9fe..2198535 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/app-routing.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/app-routing.module.ts
@@ -15,10 +15,13 @@
import { NgModule, Component } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
+import { AuthGuard } from './authentication/authguard';
+import { Role } from './authentication/authentication.service';
const appRoutes: Routes = [
{ path: 'navigator', loadChildren: './navigator-view/mdm-navigator-view.module#MDMNavigatorViewModule' },
- { path: 'administration', loadChildren: './administration/admin.module#AdminModule' },
+ { path: 'administration', loadChildren: './administration/admin.module#AdminModule',
+ canActivate: [AuthGuard], data: { roles: [Role.Admin] } },
{ path: '', redirectTo: 'navigator', pathMatch: 'full' }
];
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.html
index 5c4b729..e650581 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.html
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.html
@@ -17,12 +17,12 @@
<a class="navbar-brand" routerLink="/navigator" style="cursor:pointer;">openMDM5 Web</a>
<div class="collapse navbar-collapse" id="bs-mdm-navbar">
<ul class="navbar-nav mr-auto">
- <li class="nav-item" *ngFor="let m of links" [routerLinkActive]="['active']"><a class="nav-link" routerLink="{{m.path}}" style="cursor:pointer;"> {{m.name}}</a></li>
+ <li class="nav-item" *ngFor="let m of (links | authPipe | async)" [routerLinkActive]="['active']"><a class="nav-link" routerLink="{{m.path}}" style="cursor:pointer;"> {{m.name}}</a></li>
</ul>
<ul class="navbar-nav ml-md-auto">
<li class="nav-item"><span class="navbar-text" style="padding: 0 5px; vertical-align: middle;">{{ 'app.language' | translate }}</span> <p-dropdown [options]="languages" (onChange)="selectLanguage($event)" [(ngModel)]="selectedLanguage" [style]="{ 'margin-top': '2px' }"></p-dropdown></li>
<li class="nav-item"><a class="nav-link" [routerLink]="" (click)="showAboutDialog()" href="#">{{ 'app.about' | translate }}</a></li>
- <li class="nav-item"><a class="nav-link" href="mdm/logout"><span class="fa fa-sign-in"></span> {{ 'app.logout' | translate }}</a></li>
+ <li class="nav-item"><a class="nav-link" href="mdm/logout"><span class="fa fa-sign-in"></span> {{ 'app.logout' | translate }}<span *ngIf="user?.username" title="{{ 'app.roles' | translate }}: {{ rolesTooltip }}"> ({{ user?.username }})</span></a></li>
</ul>
</div>
</nav>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.ts
index d8b888b..abf1828 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/app.component.ts
@@ -17,6 +17,8 @@
import { TranslateService } from '@ngx-translate/core';
import {SelectItem} from 'primeng/api';
+import { User, Role } from './authentication/authentication.service';
+import { AuthenticationService } from './authentication/authentication.service';
@Component({
selector: 'app-root',
@@ -36,12 +38,13 @@
selectedLanguage = 'en';
links = [
- { name: 'Administration', path: '/administration' }
+ { name: 'Administration', path: '/administration', roles: [ Role.Admin ] }
];
displayAboutDialog = false;
+ user: User = null;
+ rolesTooltip: string;
- constructor(private translate: TranslateService) {
-
+ constructor(private translate: TranslateService, private authService: AuthenticationService) {
}
ngOnInit() {
@@ -52,6 +55,10 @@
}
this.translate.setDefaultLang(this.selectedLanguage);
this.translate.use(this.selectedLanguage);
+ this.authService.getLoginUser().subscribe(value => {
+ this.user = value;
+ this.rolesTooltip = value.roles.join(', ');
+ })
}
selectLanguage($event: any) {
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/app.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/app.module.ts
index a174995..4cd625e 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/app.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/app.module.ts
@@ -43,12 +43,15 @@
import { QueryService } from './tableview/query.service';
import { ViewService } from './tableview/tableview.service';
import { environment } from '../environments/environment';
+import { FilesAttachableService } from './file-explorer/services/files-attachable.service';
+import { AuthenticationModule } from './authentication/authentication.module';
// AoT requires an exported function for factories
export function HttpLoaderFactory(http: HttpClient) {
return new TranslateHttpLoader(http, 'assets/i18n/', '.json');
}
+
@NgModule({
imports: [
BrowserModule,
@@ -56,6 +59,7 @@
HttpModule,
FormsModule,
MDMCoreModule,
+ AuthenticationModule,
DialogModule,
AppRoutingModule,
DropdownModule,
@@ -69,7 +73,7 @@
],
declarations: [
AppComponent,
- NoticeComponent
+ NoticeComponent,
],
providers: [
NodeService,
@@ -80,6 +84,7 @@
QueryService,
NodeproviderService,
MDMNotificationService,
+ FilesAttachableService,
ViewService,
HttpErrorHandler,
TranslateService,
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/auth.pipe.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/auth.pipe.ts
new file mode 100644
index 0000000..a696573
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/auth.pipe.ts
@@ -0,0 +1,24 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { AuthenticationService } from './authentication.service';
+import { forkJoin, Observable, of } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+
+@Pipe({
+ name: 'authPipe',
+ pure: true
+})
+export class AuthPipe implements PipeTransform {
+ constructor(private authService: AuthenticationService) {
+ }
+
+ transform(linksWithRoles: { roles: string }[]): Observable<{ roles: string }[]> {
+ if (!linksWithRoles) {
+ return of(linksWithRoles);
+ }
+
+ return forkJoin(linksWithRoles.map(l => this.authService.isUserInRole(l.roles))).pipe(
+ map(booleanFilter => linksWithRoles.filter((l, i) => booleanFilter[i]))
+ );
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/authentication.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/authentication.module.ts
new file mode 100644
index 0000000..0e80250
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/authentication.module.ts
@@ -0,0 +1,27 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { NgModule } from '@angular/core';
+import { AuthPipe } from './auth.pipe';
+
+@NgModule({
+declarations: [
+ AuthPipe,
+],
+exports: [
+ AuthPipe,
+],
+})
+export class AuthenticationModule {
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/authentication.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/authentication.service.ts
new file mode 100644
index 0000000..2a89bb8
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/authentication.service.ts
@@ -0,0 +1,82 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Router, ResolveStart } from '@angular/router';
+import { PropertyService } from '../core/property.service';
+import { Observable } from 'rxjs';
+import { publishReplay, refCount, map, tap } from 'rxjs/operators';
+
+export class User {
+ username: string;
+ roles: string[];
+}
+
+export enum Role {
+ Admin = 'Admin',
+ User = 'DescriptiveDataAuthor',
+ Guest = 'Guest',
+}
+
+@Injectable({
+ providedIn: 'root'
+})
+export class AuthenticationService {
+ readonly loginURL: string;
+ readonly logoutURL: string;
+ readonly currentUserURL: string;
+
+ private loginUser: Observable<User>;
+
+ constructor(private http: HttpClient,
+ private _prop: PropertyService) {
+ this.currentUserURL = _prop.getUrl('mdm/user/current');
+ }
+
+ isLoggedIn() {
+ return this.getLoginUser().pipe(map(user => user !== null));
+ }
+
+ getLoginUser() {
+ if (!this.loginUser) {
+ this.loginUser = this.loadUser().pipe(
+ publishReplay(1),
+ refCount()
+ );
+ }
+
+ return this.loginUser;
+ }
+
+ isUserInRole(roles: string | string[]) {
+ if (roles === undefined) {
+ return Observable.of(true);
+ } else if (typeof roles === 'string') {
+ roles = [ roles ];
+ }
+
+ return this.getLoginUser().pipe(
+ map(user => user.roles.filter(x => roles.includes(x)).length > 0)
+ );
+ }
+
+ private loadUser() {
+ return this.http.get<User>(this.currentUserURL, {
+ params: {
+ roles: Object.values(Role).join(',')
+ }
+ });
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/authguard.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/authguard.ts
new file mode 100644
index 0000000..fc126f5
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/authentication/authguard.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { CanActivate } from '@angular/router/src/utils/preactivation';
+import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+
+import { AuthenticationService } from './authentication.service';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class AuthGuard implements CanActivate {
+ path: ActivatedRouteSnapshot[];
+ route: ActivatedRouteSnapshot;
+
+ constructor(private authStateService: AuthenticationService) { }
+
+ canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
+ if (route.data.roles) {
+ // check if current user has any role the route requires
+ return this.authStateService.isUserInRole(route.data.roles);
+ }
+ return true;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.ts
index c94b34c..40fa2ba 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/basket/mdm-basket.component.ts
@@ -249,7 +249,7 @@
}
stopEvent(event: Event) {
- event.stopPropagation()
+ event.stopPropagation();
}
saveBasketWithExtension(event: any, extension: string) {
@@ -302,7 +302,7 @@
rejectVisible: true,
});
} else {
- this.exportItemsToAtfx(this._basketService.getItems())
+ this.exportItemsToAtfx(this._basketService.getItems());
}
}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/chart-viewer.style.css b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/chart-viewer.style.css
new file mode 100644
index 0000000..364c1cb
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/chart-viewer.style.css
@@ -0,0 +1,167 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+.toolbar {
+ background-color: #f8f8f8;
+ border-color:#ddd !important;
+ border-radius: 4px;
+ border: 1px solid;
+ margin-bottom: 4px;
+}
+
+.thin {
+ padding: 4px;
+}
+
+.toggler {
+ text-align: right;
+ color: #6c757d;
+ cursor: pointer;
+}
+
+.toggler:hover {
+ color: black;
+}
+
+p-listbox >>> .ui-listbox-item {
+ padding: 4px 0 4px 8px !important;
+}
+
+p-listbox >>> p-header {
+ display: grid;
+ grid-template-columns: 12% 63% 25%;
+ align-items: center;
+}
+
+p-listbox >>> .ui-listbox-header {
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+ /* border-bottom-color: rgb(166,166,166); */
+}
+
+p-listbox >>> .ui-listbox-header-w-checkbox {
+ padding: 4px 8px;
+}
+
+.hiddenList >>> .ui-listbox-list-wrapper {
+ display: none;
+}
+
+.hiddenList >>> .ui-listbox-header-w-checkbox {
+ display: none;
+}
+
+p-listbox >>> .ypanel .ui-listbox-header-w-checkbox {
+ text-align: right;
+}
+
+p-togglebutton >>> .ui-button {
+ font-size: 14px;
+ margin: 0 3px;
+ color: #6c757d;
+ background-color: transparent;
+ background-image: none;
+ border-color: #6c757d;
+}
+
+p-togglebutton >>> .ui-button.ui-state-active {
+ /* color: #333333!important; */
+ color: #fff!important;
+ background-color: #a0a0a0;
+}
+
+p-togglebutton >>> .ui-button.ui-state-active >>> .ui-button-icon-left {
+ /* color: #333333!important; */
+ color: #fff!important;
+ background-color: #a0a0a0;
+}
+
+p-togglebutton >>> .ui-button:not(.ui-state-active).ui-state-focus {
+ border-color: #6c757d;
+ background-color: transparent!important;
+}
+
+p-togglebutton >>> .ui-button:not(.ui-state-active).ui-state-focus >>> .ui-button-icon-left {
+ color: #6c757d!important;
+}
+
+p-spinner {
+ margin: 0 3px;
+}
+
+p-spinner >>> .ui-button {
+ font-size: 14px;
+ color: #6c757d;
+ background-color: transparent;
+ background-image: none;
+ border-color: #6c757d;
+}
+
+p-spinner >>> .ui-button:hover {
+ background-color:#c8c8c8;
+ border-color:#c8c8c8;
+ color:#333333;
+}
+
+p-spinner >>> .ui-spinner {
+ margin-top: -3px;
+}
+
+p-spinner >>> .ui-spinner-input {
+ height: 32px;
+}
+
+.hidden {
+ display: none;
+}
+
+.channelList {
+ list-style-type: none;
+ padding: 0;
+ margin-bottom: 0;
+ min-height: 80px;
+}
+
+.row {
+ display: grid;
+ grid-template-columns: 155px 185px;
+ align-items: center;
+ padding: 1px 8px 1px 8px;
+}
+
+p-panel >>> .ui-panel-content.ui-widget-content {
+ overflow-x: scroll;
+ overflow-y: visible;
+}
+
+p-panel >>> .ui-panel .ui-panel-titlebar {
+ background-color: inherit;
+ border-color: rgb(166,166,166);
+ padding: 6px 12px;
+}
+
+p-panel >>> .ui-panel .ui-panel-content {
+ border-color: rgb(166,166,166);
+ border-bottom-left-radius: 3px;
+ border-bottom-right-radius: 3px;
+ padding: 4px 10px
+}
+
+p-panel >>> .ui-inputtext {
+ padding: 2px 0.429em;
+}
+
+p-panel label {
+ font-weight: inherit;
+}
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/chartviewer.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/chartviewer.module.ts
new file mode 100644
index 0000000..efd8d58
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/chartviewer.module.ts
@@ -0,0 +1,81 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { NgModule } from '@angular/core';
+import { HttpClientModule } from '@angular/common/http';
+
+import { CheckboxModule } from 'primeng/checkbox';
+import { ButtonModule } from 'primeng/button';
+import { SliderModule } from 'primeng/slider';
+import { InputTextModule } from 'primeng/inputtext';
+import { AccordionModule } from 'primeng/accordion';
+import { TableModule } from 'primeng/table';
+import { SelectButtonModule } from 'primeng/selectbutton';
+import { ChartModule } from 'primeng/chart';
+import { ToggleButtonModule } from 'primeng/togglebutton';
+import { SpinnerModule } from 'primeng/spinner';
+import { MultiSelectModule } from 'primeng/multiselect';
+import { ListboxModule } from 'primeng/listbox';
+import { PanelModule } from 'primeng/panel';
+import { ConfirmDialogModule } from 'primeng/confirmdialog';
+
+import { MDMCoreModule } from '../core/mdm-core.module';
+import { ChartViewerComponent } from './components/chartviewer/chart-viewer.component';
+import { DataTableComponent } from './components/datatable/data-table.component';
+import { ChartViewerNavCardComponent } from './components/chatviewer-nav-card/chart-viewer-nav-card.component';
+import { XyChartViewerComponent } from './components/xy-chart-viewer/xy-chart-viewer.component';
+import { XyChartViewerNavCardComponent } from './components/xy-chart-viewer-nav-card/xy-chart-viewer-nav-card.component';
+import { RequestOptionsComponent } from './components/request-options/request-options.component';
+import { XyChartViewerToolbarComponent } from './components/xy-chart-viewer-toolbar/xy-chart-viewer-toolbar.component';
+import { XyChartDataSelectionPanelComponent } from './components/xy-chart-data-selection-panel/xy-chart-data-selection-panel.component';
+import { ConfirmationService } from 'primeng/api';
+
+@NgModule({
+ imports: [
+ MDMCoreModule,
+ HttpClientModule,
+ CheckboxModule,
+ ButtonModule,
+ SelectButtonModule,
+ TableModule,
+ SliderModule,
+ InputTextModule,
+ AccordionModule,
+ ChartModule,
+ ToggleButtonModule,
+ SpinnerModule,
+ MultiSelectModule,
+ ListboxModule,
+ PanelModule,
+ ConfirmDialogModule,
+ ],
+ declarations: [
+ ChartViewerNavCardComponent,
+ ChartViewerComponent,
+ DataTableComponent,
+ XyChartViewerComponent,
+ XyChartViewerNavCardComponent,
+ RequestOptionsComponent,
+ XyChartViewerToolbarComponent,
+ XyChartDataSelectionPanelComponent,
+ ],
+ exports: [
+ ChartViewerNavCardComponent,
+ XyChartViewerNavCardComponent,
+ ],
+ providers: [
+ ConfirmationService
+ ]
+})
+export class ChartviewerModule {}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chartviewer/chart-viewer.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chartviewer/chart-viewer.component.html
new file mode 100644
index 0000000..85ba743
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chartviewer/chart-viewer.component.html
@@ -0,0 +1,31 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+
+<p-chart #lineChart type="line" [data]="data" [options]="options"></p-chart>
+
+<p-accordion>
+ <p-accordionTab header="Optionen">
+
+ Von <input type="number" numbersOnly pInputText [(ngModel)]="rangeValues[0]" />
+ Bis <input type="number" numbersOnly pInputText [(ngModel)]="rangeValues[1]" />
+ Gesamt {{numberOfRows}}
+ Schrittweite: <input type="text" numbersOnly pInputText [(ngModel)]="step"/>
+ Vorschauwerte<p-checkbox [(ngModel)]="previewEnabled" binary="true"></p-checkbox> <input *ngIf="previewEnabled" type="text" numbersOnly pInputText [(ngModel)]="numberOfChunks" />
+
+ <div style="margin: 20px 0;">
+ <p-slider [(ngModel)]="rangeValues" [range]="true" [min]="1" [max]="numberOfRows" [step]="step"></p-slider>
+ </div>
+ <p-button label="Anwenden" (onClick)="applySettings($event)"></p-button>
+ </p-accordionTab>
+</p-accordion>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chartviewer/chart-viewer.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chartviewer/chart-viewer.component.ts
new file mode 100644
index 0000000..10262be
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chartviewer/chart-viewer.component.ts
@@ -0,0 +1,165 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, ViewChild, Input, SimpleChanges, OnChanges } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map, tap, catchError } from 'rxjs/operators';
+
+import { UIChart } from 'primeng/primeng';
+
+import { HttpErrorHandler } from '../../../core/http-error-handler';
+import { Node } from '../../../navigator/node';
+import { ChartViewerDataService, getDataArray } from '../../services/chart-viewer-data.service';
+import { MeasuredValues } from '../../model/chartviewer.model';
+
+@Component({
+ selector: 'mdm5-chartViewer',
+ templateUrl: 'chart-viewer.component.html',
+ providers: []
+})
+export class ChartViewerComponent implements OnChanges {
+
+ @Input()
+ channelGroup = new Node();
+ @Input()
+ channels = [new Node()];
+
+ @ViewChild('lineChart')
+ chart: UIChart;
+
+ maxRequestedValues = 10000;
+ previewEnabled = true;
+ numberOfChunks = 600;
+ numberOfRows = 0;
+ startIndex = 1;
+ requestedValues = 0;
+
+ // range of values to show; 1-based; start and end inclusive
+ rangeValues: number[] = [this.startIndex, this.requestedValues];
+ step = 1000;
+
+ data = {
+ labels: [],
+ datasets: [
+ {
+ label: 'No data',
+ data: [],
+ borderColor: '#fff',
+ }
+ ]
+ };
+
+ options = {
+ elements: {
+ point: {
+ radius: 0
+ },
+ line: {
+ tension: 0
+ }
+ },
+ legend: {
+ display: true,
+ },
+ plugins: {
+ zoom: {
+ pan: {
+ enabled: true,
+ mode: 'xy'
+ },
+ zoom: {
+ enabled: true,
+ mode: 'xy'
+ }
+ }
+ },
+ };
+
+ constructor(private httpErrorHandler: HttpErrorHandler,
+ private chartService: ChartViewerDataService) {
+ }
+
+ ngOnChanges(changes: SimpleChanges) {
+ for (let propName in changes) {
+ if (propName === 'channelGroup' || propName === 'channels') {
+ this.channelGroup = this.channelGroup;
+ this.numberOfRows = this.chartService.getNumberOfRows(this.channelGroup);
+ if (this.numberOfRows < this.numberOfChunks) {
+ this.previewEnabled = false;
+ }
+ this.requestedValues = Math.min(this.numberOfRows, this.maxRequestedValues);
+
+ this.updateRange();
+ this.chartChannel();
+ break;
+ }
+ }
+ }
+
+ getColor(name: string) {
+ return this.data.datasets.find(dataset => dataset.label === name).borderColor;
+ }
+
+ applySettings(event: any) {
+ this.chartChannel();
+ }
+
+ chartChannel() {
+ this.chartMeasuredValues(this.chartService.loadPreviewValues(
+ this.channelGroup, [this.channels[0]], this.numberOfChunks, this.rangeValues[0] - 1, this.rangeValues[1]));
+ }
+
+ chartMeasuredValues(measuredValues: Observable<MeasuredValues[]>) {
+ measuredValues.pipe(
+ map(mvl => <any>{
+ data: {
+ labels: this.getLabels(this.rangeValues[0], this.rangeValues[1], this.getLength(mvl)),
+ datasets: mvl.map(this.convertToDataset, this)
+ }
+ }),
+ catchError(this.httpErrorHandler.handleError)
+ ).subscribe(d => {
+ console.log(d);
+ this.data = d.data;
+ });
+ }
+
+ updateRange() {
+ this.rangeValues = [this.startIndex, this.requestedValues];
+ this.step = Math.min(1000, Math.max(Math.floor(this.numberOfRows / 1000), 1));
+ }
+
+ getLabels(startIndex: number, endIndex: number, numberOfChunks: number) {
+ let labels: number[] = Array();
+ for (let i = startIndex; i <= endIndex; i += (endIndex - startIndex + 1) / numberOfChunks) {
+ labels.push(Math.floor(i));
+ }
+ return labels;
+ }
+
+ getLength(measuredValues: MeasuredValues[]) {
+ return measuredValues.map(mv => mv.length).reduce((p, l) => Math.max(p, l));
+ }
+
+ convertToDataset(measuredValues: MeasuredValues) {
+ return <any>{
+ label: measuredValues.name + ' [' + measuredValues.unit + ']',
+ unit: measuredValues.unit,
+ data: getDataArray(measuredValues).values,
+ borderColor: '#' + Math.random().toString(16).substr(-6),
+ measuredValues: map,
+ channel: new Node()
+ };
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chatviewer-nav-card/chart-viewer-nav-card.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chatviewer-nav-card/chart-viewer-nav-card.component.html
new file mode 100644
index 0000000..8cc9516
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chatviewer-nav-card/chart-viewer-nav-card.component.html
@@ -0,0 +1,27 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+
+<div *ngIf="channels === undefined">
+ No Channel selected.
+</div>
+
+<div *ngIf="channels !== undefined">
+ <p-selectButton [options]="modes" [(ngModel)]="selectedMode"></p-selectButton>
+
+ <div [ngSwitch]="selectedMode">
+ <mdm5-chartViewer *ngSwitchCase="'chart'" [channelGroup]="channelGroup" [channels]="channels" ></mdm5-chartViewer>
+ <mdm5-dataTable *ngSwitchCase="'table'" [channelGroup]="channelGroup" [channels]="channels"></mdm5-dataTable>
+ <div *ngSwitchDefault></div>
+ </div>
+</div>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chatviewer-nav-card/chart-viewer-nav-card.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chatviewer-nav-card/chart-viewer-nav-card.component.ts
new file mode 100644
index 0000000..7b21a64
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/chatviewer-nav-card/chart-viewer-nav-card.component.ts
@@ -0,0 +1,96 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { NavigatorService } from '../../../navigator/navigator.service';
+import { MDMNotificationService } from '../../../core/mdm-notification.service';
+import { TranslateService } from '@ngx-translate/core';
+import { NodeService } from '../../../navigator/node.service';
+import { forkJoin, Observable } from 'rxjs';
+import { Node } from '../../../navigator/node';
+import { SelectItem } from 'primeng/api';
+import { PropertyService } from 'src/app/core/property.service';
+
+@Component({
+ selector: 'mdm5-chartViewerNavCard',
+ templateUrl: 'chart-viewer-nav-card.component.html',
+ providers: []
+})
+export class ChartViewerNavCardComponent implements OnInit, OnDestroy {
+ private _contextUrl: string;
+
+ modes: SelectItem[] = [
+ { label: 'Chart', value: 'chart'},
+ { label: 'Table', value: 'table'},
+ ];
+ selectedMode = 'chart';
+
+ selectedNode: Node;
+ channelGroup: Node;
+ channels: Node[];
+ subscription: any;
+
+ showLegend = false;
+ dataAvailable = false;
+
+ constructor(private navigatorService: NavigatorService,
+ private notificationService: MDMNotificationService,
+ private translateService: TranslateService,
+ private nodeService: NodeService,
+ private _prop: PropertyService) {
+ this._contextUrl = _prop.getUrl('mdm/environments');
+ }
+
+ ngOnInit() {
+ this.onSelectedNodeChange(this.navigatorService.getSelectedNode());
+ this.subscription = this.navigatorService.selectedNodeChanged.subscribe(
+ node => this.onSelectedNodeChange(node),
+ error => this.notificationService.notifyError(this.translateService.instant('details.mdm-detail-view.cannot-update-node'), error)
+ );
+ }
+
+ ngOnDestroy() {
+ this.subscription.unsubscribe();
+ }
+
+ onSelectedNodeChange(node: Node) {
+ if (!node) {
+ this.dataAvailable = false;
+ return;
+ }
+ this.selectedNode = node;
+
+ if (node && node.type === 'Channel') {
+ this.loadChannelGroup(node)
+ .flatMap(channelGroup => forkJoin([Observable.of(channelGroup), this.loadChannels(channelGroup)]))
+ .subscribe(([channelGroup, channels]) => {
+ this.channelGroup = channelGroup;
+ this.channels = [node];
+ this.dataAvailable = true;
+ });
+ } else {
+ this.dataAvailable = false;
+ }
+ }
+
+ loadChannelGroup(channel: Node) {
+ let url = this._contextUrl + '/' + channel.sourceName + '/channelgroups?filter=Channel.Id eq \"' + channel.id + '\"';
+ return this.nodeService.getNode(url).map(channelGroup => channelGroup[0]);
+ }
+
+ loadChannels(channelgroup: Node) {
+ let url = this._contextUrl + '/' + channelgroup.sourceName + '/channels?filter=ChannelGroup.Id eq \"' + channelgroup.id + '\"';
+ return this.nodeService.getNode(url);
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/datatable/data-table.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/datatable/data-table.component.html
new file mode 100644
index 0000000..fd6857b
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/datatable/data-table.component.html
@@ -0,0 +1,44 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+
+<p-table #datatable [value]="datapoints" [columns]="cols" [lazy]="true" (onLazyLoad)="loadLazy($event)" [paginator]="true"
+[rows]="recordsPerPage" [totalRecords]="totalRecords" [loading]="tableLoading" [rowsPerPageOptions]="[10, 20, 50, 100, 1000]">
+ <ng-template pTemplate="header" let-columns>
+ <tr>
+ <th>Index</th>
+ <th *ngFor="let col of columns">
+ {{col.header}}
+ </th>
+ </tr>
+ </ng-template>
+ <ng-template pTemplate="body" let-rowData let-i="rowIndex" let-columns="columns">
+ <tr style="height:34px">
+ <td>{{i}}</td>
+ <td *ngFor="let col of columns">
+ {{rowData[col.field]}}
+ </td>
+ </tr>
+ </ng-template>
+ <ng-template pTemplate="emptymessage" let-columns>
+ <tr>
+ <td [attr.colspan]="columns.length">
+ No records found
+ </td>
+ </tr>
+ </ng-template>
+ <ng-template pTemplate="paginatorleft" let-state>
+ Total: {{state.totalRecords}}
+ </ng-template>
+
+</p-table>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/datatable/data-table.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/datatable/data-table.component.ts
new file mode 100644
index 0000000..76370f5
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/datatable/data-table.component.ts
@@ -0,0 +1,77 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, ViewChild, Input, OnChanges, SimpleChanges } from '@angular/core';
+
+import { LazyLoadEvent, Column } from 'primeng/primeng';
+import { Table } from 'primeng/table';
+
+import { Node } from '../../../navigator/node';
+import { ChartViewerDataService, getDataArray } from '../../services/chart-viewer-data.service';
+import { MeasuredValues } from '../../model/chartviewer.model';
+
+@Component({
+ selector: 'mdm5-dataTable',
+ templateUrl: 'data-table.component.html',
+ providers: []
+})
+export class DataTableComponent implements OnChanges {
+ @ViewChild('datatable')
+ private table: Table;
+
+ @Input()
+ channelGroup = new Node();
+ @Input()
+ channels = [new Node()];
+
+ tableLoading = false;
+ cols: Column[] = [];
+ totalRecords = 0;
+ recordsPerPage = 10;
+ datapoints = [];
+
+ constructor(private chartviewerService: ChartViewerDataService) {
+ }
+
+ ngOnChanges(changes: SimpleChanges) {
+ for (let propName in changes) {
+ if (propName === 'channelGroup' || propName === 'channels') {
+ this.table.reset();
+ }
+ }
+ }
+
+ load(mv: MeasuredValues[]) {
+ let zip = (rows => rows[0].map((_, c) => rows.map(row => row[c])));
+
+ this.cols = mv.map((m, i) => Object.assign(new Column(), { header: m.name, field: i }));
+ this.datapoints = zip(mv.map(m => getDataArray(m).values));
+ }
+
+ loadLazy(event: LazyLoadEvent) {
+ if (this.channelGroup === undefined) {
+ return;
+ }
+
+ setTimeout(() => {
+ this.tableLoading = true;
+ this.totalRecords = this.chartviewerService.getNumberOfRows(this.channelGroup);
+ this.chartviewerService.loadMeasuredValues(this.channelGroup, this.channels, event.first, event.rows).subscribe(mv => {
+ this.load(mv);
+ this.tableLoading = false;
+ },
+ () => this.tableLoading = false);
+ }, 0);
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/request-options/request-options.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/request-options/request-options.component.html
new file mode 100644
index 0000000..108ee9a
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/request-options/request-options.component.html
@@ -0,0 +1,77 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+<p-accordion [style]="{'width':'100%'}">
+ <p-accordionTab header="Optionen" [disabled]="!channelGroups || channelGroups.length === 0">
+ <div class="p-grid nested-grid p-align-center">
+ <!-- Row 1 -->
+ <!-- left -->
+ <div class="p-col-2">
+ <label for="rangeValStart">Von</label>
+ <p-spinner id="rangeValStart"
+ size="4"
+ [(ngModel)]="rangeValues[0]"
+ [step]="step"
+ [min]="minIndex"
+ [max]="rangeValues[1]"
+ (onChange)="onChangeValueRange($event)"
+ ></p-spinner>
+ </div>
+ <div class="p-col-2">
+ <label for="rangeValEnd">Bis</label>
+ <p-spinner id="rangeValEnd"
+ size="4"
+ [(ngModel)]="rangeValues[1]"
+ [step]="step"
+ [min]="rangeValues[0]"
+ [max]="numberOfRows"
+ (onChange)="onChangeValueRange($event)"
+ (onBlur)="onChangeValueRange($event)"
+ ></p-spinner>
+ </div>
+ <div class="p-col-4">
+ <label for="step">Schrittweite</label>
+ <p-spinner id="step" type="text" [(ngModel)]="step" size="4"></p-spinner>
+ </div>
+ <!-- right -->
+ <div class="p-col-4">
+ <label for="preview">Vorschauwerte</label>
+ <p-checkbox id="preview" [(ngModel)]="previewEnabled" binary="true"></p-checkbox>
+ </div>
+
+ <!-- Row 2 -->
+ <!-- left -->
+ <div class="p-col-7">
+ <div class="p-grid p-align-center">
+ <div class="p-col-1" style="text-align: right;">{{minIndex}}</div>
+ <div class="p-col-10"><p-slider [(ngModel)]="rangeValues" [range]="true" [min]="1" [max]="(numberOfRows + 1)" [step]="step"></p-slider></div>
+ <div class="p-col-1">{{numberOfRows + 1}}</div>
+ </div>
+ </div>
+ <div class="p-col-1">
+ </div>
+ <!-- right -->
+ <div class="p-col-4">
+ <input *ngIf="previewEnabled" type="text" numbersOnly pInputText [(ngModel)]="numberOfChunks" />
+ </div>
+
+ <!-- Row 3 -->
+ <div class="p-col-12" style="text-align: right;">
+ <button class="btn btn-mdm" (click)="onApplySettings($event)">
+ <span class="fa fa-check"></span>
+ Übernehmen
+ </button>
+ </div>
+ </div>
+ </p-accordionTab>
+</p-accordion>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/request-options/request-options.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/request-options/request-options.component.ts
new file mode 100644
index 0000000..ddbf822
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/request-options/request-options.component.ts
@@ -0,0 +1,96 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit, Input, SimpleChanges, OnChanges, Output, EventEmitter } from '@angular/core';
+import { ChartViewerDataService } from '../../services/chart-viewer-data.service';
+import { Node } from '../../../navigator/node';
+import { RequestOptions } from '../../model/chartviewer.model';
+
+@Component({
+ selector: 'mdm5-request-options',
+ templateUrl: './request-options.component.html'
+})
+export class RequestOptionsComponent implements OnInit, OnChanges {
+
+ // octive accordion tab, default: -1 (= non is active).
+ public accordionIndex = undefined;
+
+ public readonly minIndex = 1;
+ // public requestedValues = 1;
+ public rangeValues: number[] = [];
+
+ private maxRequestedValues = 10000;
+
+ public numberOfRows = 0;
+ public numberOfChunks = 600;
+ public step: number;
+ public previewEnabled = true;
+
+ @Input()
+ public channelGroups: Node[];
+
+ @Output()
+ public onRequestOptionsChanged = new EventEmitter<RequestOptions>();
+
+ constructor(
+ private chartService: ChartViewerDataService) { }
+
+ ngOnInit() {
+ this.reload();
+ this.emitRequestOptionsChanged();
+ }
+
+ ngOnChanges(changes: SimpleChanges) {
+ if (changes['channelGroups']) {
+ this.reload();
+ this.emitRequestOptionsChanged();
+ }
+ }
+
+ private reload() {
+ if (this.channelGroups != undefined && this.channelGroups.length > 0) {
+ this.numberOfRows = this.chartService.getNumberOfRows(this.channelGroups[0]);
+ this.step = Math.min(1000, Math.max(Math.floor(this.numberOfRows / 100), 1));
+ if (this.numberOfRows < this.numberOfChunks) {
+ this.previewEnabled = false;
+ }
+ const requestedValues = Math.min(this.numberOfRows, this.maxRequestedValues);
+ this.rangeValues = [this.minIndex, requestedValues];
+ }
+ }
+
+ public onChangeValueRange(event: Event) {
+ // check if input string is numeric, set min/max otherwise
+ if (isNaN(+this.rangeValues[0])) {
+ this.rangeValues[0] = this.minIndex;
+ }
+ if (isNaN(+this.rangeValues[1])) {
+ this.rangeValues[1] = this.numberOfRows;
+ }
+ // reassign for change detection
+ this.rangeValues = [].concat(this.rangeValues);
+ }
+
+ public onApplySettings(event: Event) {
+ // close accordion
+ this.accordionIndex = -1;
+ // emit options
+ this.emitRequestOptionsChanged();
+ }
+
+ private emitRequestOptionsChanged() {
+ this.onRequestOptionsChanged.emit(
+ new RequestOptions(this.rangeValues[1] - this.rangeValues[0], this.rangeValues[0] - 1, this.previewEnabled, this.numberOfChunks));
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-data-selection-panel/xy-chart-data-selection-panel.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-data-selection-panel/xy-chart-data-selection-panel.component.html
new file mode 100644
index 0000000..c2cfc55
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-data-selection-panel/xy-chart-data-selection-panel.component.html
@@ -0,0 +1,98 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+
+<div class="p-grid">
+ <div class="p-col-12" style="margin-top: 4px">
+ <p-listbox
+ [options]="channelGroups"
+ [(ngModel)]="selectedChannelGroups"
+ multiple="multiple"
+ checkbox="checkbox"
+ filter="filter"
+ optionLabel="name"
+ (onChange)="onSelectedChannelGroupsChanged($event)"
+ [ngClass]="{'hiddenList': hiddenGroups}"
+ [style]="{'width':'100%'}"
+ [listStyle]="{'height':'100px'}">
+ <p-header>
+ <span class="icon channelgroup"></span>
+ {{'SubMatrix' | mdmdatasourcetranslate}}
+ <span
+ class="fa toggler"
+ [ngClass]="{'fa-chevron-down': !hiddenGroups, 'fa-chevron-right': hiddenGroups}"
+ (click)="onToggleChannelGroupPanel($event)"></span>
+ </p-header>
+ </p-listbox>
+ </div>
+ <div class="p-col-12">
+ <p-listbox [options]="yChannelOptions"
+ [(ngModel)]="selectedYChannels"
+ multiple="multiple"
+ checkbox="checkbox"
+ filter="filter"
+ optionLabel="name"
+ (onChange)="onSelectedYChannelsChanged($event)"
+ [ngClass]="{'hiddenList': hiddenYChannels}"
+ [style]="{'width':'100%'}"
+ [styleClass]="'ypanel'"
+ [listStyle]="{'height':'200px'}"
+ [showToggleAll]="false">
+ <p-header>
+ <span class="icon channel"></span>
+ Y-{{'MeaQuantity' | mdmdatasourcetranslate}}
+ <span
+ class="fa toggler"
+ [ngClass]="{'fa-chevron-down': !hiddenYChannels, 'fa-chevron-right': hiddenYChannels}"
+ (click)="onToggleYChannelPanel($event)"></span>
+ </p-header>
+ </p-listbox>
+ </div>
+ <div class="p-col-12">
+ <p-panel
+ [toggleable]="true"
+ [collapsed]="true"
+ expandIcon="fa fa-chevron-right"
+ collapseIcon="fa fa-chevron-down">
+ <p-header>
+ <span class="icon channel"></span>
+ X-{{'MeaQuantity' | mdmdatasourcetranslate}}
+ </p-header>
+ <ul class="channelList">
+ <li *ngFor="let rowData of selectedChannelRows">
+ <div class="row">
+ <label>
+ {{rowData.yChannel.name}}
+ </label>
+
+ <!-- appendTo="body" is workaround for overlay is hidden in panel. Problem: AppendTo body makes overly stuck on scroll -->
+ <p-dropdown
+ [(ngModel)]="rowData.xChannel"
+ [options]="xChannelOptions[rowData.channelGroup.id]"
+ appendTo="body"
+ [filter]="xChannelOptions[rowData.channelGroup.id]?.length > 5"
+ (onChange)="onSelectedXChannelChanged($event, rowData)"
+ (onShow)="onShowSelectedXChannelChanged($event, rowData)"
+ placeholder="{{'chartviewer.xy-chart-data-selection-panel.select-channel-placeholder' | translate}}"
+ optionLabel="name"
+ [showClear]="false"
+ [style]="{'width':'95%'}">
+ </p-dropdown>
+ </div>
+ </li>
+ </ul>
+ </p-panel>
+ </div>
+</div>
+
+<p-confirmDialog icon="pi pi-exclamation-triangle"></p-confirmDialog>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-data-selection-panel/xy-chart-data-selection-panel.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-data-selection-panel/xy-chart-data-selection-panel.component.ts
new file mode 100644
index 0000000..7def935
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-data-selection-panel/xy-chart-data-selection-panel.component.ts
@@ -0,0 +1,449 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit, Input, OnDestroy, EventEmitter, Output, OnChanges, SimpleChanges } from '@angular/core';
+import { ChannelSelectionRow, MeasuredValues} from '../../model/chartviewer.model';
+import { Subscription, of } from 'rxjs';
+import { ChartViewerDataService } from '../../services/chart-viewer-data.service';
+import { ChartViewerService } from '../../services/chart-viewer.service';
+import { ArrayUtilService } from 'src/app/core/services/array-util.service';
+import { MDMNotificationService } from 'src/app/core/mdm-notification.service';
+import { TYPE_MEASUREMENT, TYPE_CHANNELGROUP, TYPE_CHANNEL } from '../../model/constants';
+import { tap } from 'rxjs/operators';
+import { Node } from '../../../navigator/node';
+import {ConfirmationService} from 'primeng/api';
+import { TranslateService } from '@ngx-translate/core';
+
+@Component({
+ selector: 'mdm5-xy-chart-data-selection-panel',
+ templateUrl: './xy-chart-data-selection-panel.component.html',
+ styleUrls: ['../../chart-viewer.style.css']
+})
+export class XyChartDataSelectionPanelComponent implements OnInit, OnDestroy, OnChanges {
+
+ @Input()
+ public channelGroups: Node[];
+ @Input()
+ public channels: Map<string, Node[]>;
+
+ @Input()
+ public xyMode: boolean;
+
+ @Output()
+ public onSelectionChanged = new EventEmitter<ChannelSelectionRow[]>();
+
+ // select options for channels
+ public yChannelOptions: Node[] = [];
+ public xChannelOptions: {[key: string]: Node[]} = {};
+
+ // channel(group) selection for chart
+ // !! change via setter to update cache for workarround !!
+ public selectedChannelGroups: Node[] = [];
+ public selectedYChannels: Node[] = [];
+
+ private xYcache = new Map<string, MeasuredValues[]>();
+ private selectionChanged = false;
+
+ // listbox workarround to determine toggled item(s)
+ private lastChannelGroupSelection: Node[] = [];
+ private lastYChannelSelection: Node[] = [];
+
+ public selectedChannelRows: ChannelSelectionRow[] = [];
+
+ // Toggle selection panel visibility
+ public hiddenGroups = false;
+ public hiddenYChannels = false;
+
+ // for x-channel default value
+ private independentChannels = new Map<string, Node>();
+
+ /********** subscriptions */
+ private chartViewerSub: Subscription;
+
+ constructor(private chartviewerDataService: ChartViewerDataService,
+ private chartViewerService: ChartViewerService,
+ private arrayUtil: ArrayUtilService,
+ private confirmationService: ConfirmationService,
+ private notificationService: MDMNotificationService,
+ private translateService: TranslateService) { }
+
+
+ /**************** Angular lifecycle-hooks ****************************/
+
+ ngOnInit() {
+ this.chartViewerSub = this.chartViewerService.onNodeMetaChange().subscribe(node => this.handleNodeSelectionInNavTree(node));
+ }
+
+ ngOnDestroy() {
+ this.chartViewerSub.unsubscribe();
+ }
+
+ ngOnChanges(changes: SimpleChanges) {
+ if (changes['xyMode']) {
+ this.reloadAxisSelectOptions().subscribe(() => {
+ if (this.selectionChanged) {
+ this.fireSelectionChanged();
+ this.selectionChanged = false;
+ }
+ });
+ }
+ }
+
+ /**************** Html-template listeners *****************************/
+
+ // x-axis
+ public onSelectedXChannelChanged(event: any) {
+ if (event.value == undefined) {
+ // work around: if x-axis is deselected for an y-channel, plat over independent channel.
+ // should force selection on dropdown instead.
+ this.selectedChannelRows
+ .filter(row => row.xChannel == undefined)
+ .map(row => row.xChannel = this.getDefaultXChannel(row.channelGroup));
+ }
+ this.fireSelectionChanged();
+ }
+
+ public onShowSelectedXChannelChanged(event: any, rowData: ChannelSelectionRow) {
+ if (this.getDefaultXChannel(rowData.channelGroup) == undefined) {
+ this.confirmationService.confirm({
+ header: this.translateService.instant('chartviewer.xy-chart-data-selection-panel.no-x-channel-dialog-header'),
+ message: this.translateService.instant('chartviewer.xy-chart-data-selection-panel.no-x-channel-dialog-message'),
+ acceptLabel: 'OK',
+ rejectVisible: false
+ });
+ }
+ }
+
+ // y-axis
+ public onSelectedYChannelsChanged(event: any) {
+ let channel: Node;
+ // Deselect
+ if (this.selectedYChannels.length < this.lastYChannelSelection.length) {
+ channel = this.lastYChannelSelection.find(yChannel => !this.selectedYChannels.some(c => yChannel.id === c.id));
+ // .forEach(yChannel => this.addOrRemoveRow(this.findChannelGroup(yChannel), yChannel));
+ // Select
+ } else {
+ channel = this.selectedYChannels.find(group => !this.lastYChannelSelection.some(g => group.id === g.id));
+ }
+ this.addOrRemoveRow(this.findChannelGroup(channel), channel);
+ this.lastYChannelSelection = this.selectedYChannels;
+ this.fireSelectionChanged();
+ }
+
+ public onSelectedChannelGroupsChanged(event: any) {
+ // All deselected
+ if (this.selectedChannelGroups.length === 0) {
+ this.resetChannelData();
+ this.fireSelectionChanged();
+ } else {
+ // Deselect
+ if (this.selectedChannelGroups.length < this.lastChannelGroupSelection.length) {
+ this.lastChannelGroupSelection
+ .filter(group => !this.selectedChannelGroups.some(g => group.id === g.id))
+ .forEach(group => this.handleDeselectChannelGroup(group));
+ // Select
+ } else {
+ this.selectedChannelGroups
+ .filter(group => !this.lastChannelGroupSelection.some(g => group.id === g.id))
+ .forEach(group => this.handleSelectChannelGroup(group));
+ }
+ }
+ this.lastChannelGroupSelection = this.selectedChannelGroups;
+ }
+
+ public onToggleChannelGroupPanel(event: Event) {
+ this.hiddenGroups = !this.hiddenGroups;
+ }
+
+ public onToggleYChannelPanel(event: Event) {
+ this.hiddenYChannels = !this.hiddenYChannels;
+ }
+
+ private handleDeselectChannelGroup(channelGroup: Node) {
+ // remove rows
+ if (this.arrayUtil.isNotEmpty(this.selectedChannelRows)) {
+ this.selectedChannelRows = this.selectedChannelRows.filter(row => row.channelGroup.id !== channelGroup.id);
+ }
+ // remove selection
+ if (this.arrayUtil.isNotEmpty(this.selectedYChannels)) {
+ this.setSelectedYChannels(this.selectedYChannels.filter(channel =>
+ this.channels.get(channelGroup.id).findIndex(c => channel.id === c.id) === -1));
+ }
+ this.reloadAxisSelectOptions().subscribe(() => this.fireSelectionChanged());
+ }
+
+ /**
+ * Handle channelGroup selection via multiselect in html template
+ * @param channelGroup
+ */
+ private handleSelectChannelGroup(channelGroup: Node) {
+ const cached = this.xYcache.get(channelGroup.id);
+ if (cached != undefined) {
+ this.setChannelOptions(cached, channelGroup);
+ this.fireSelectionChanged();
+ } else {
+ this.chartviewerDataService.readAxisType(channelGroup)
+ .subscribe(mvls => {
+ this.setChannelOptions(mvls, channelGroup);
+ this.fireSelectionChanged();
+ });
+ }
+ }
+
+ private handleNodeSelectionInNavTree(node: Node) {
+ if (node != undefined) {
+ switch (node.type) {
+ case TYPE_MEASUREMENT:
+ this.xYcache.clear();
+ this.resetChannelData();
+ this.fireSelectionChanged();
+ break;
+ case TYPE_CHANNELGROUP:
+ this.cleanOldState();
+ this.addChannelGroupToSelection(node.id, node);
+ break;
+ case TYPE_CHANNEL:
+ this.cleanOldState();
+ // add related channel group to selection
+ if (this.arrayUtil.isNotEmpty(this.channelGroups) && this.channels != undefined) {
+ const channelGroup = this.findChannelGroup(node);
+ // this.addChannelGroupToSelection(channelGroupId, this.channelGroups.find(cg => cg.id === channelGroupId));
+ if (!this.isNodeIn(channelGroup, this.selectedChannelGroups)) {
+ this.setSelectedChannelGroups(this.selectedChannelGroups.concat([channelGroup]));
+ this.chartviewerDataService.readAxisType(channelGroup)
+ .subscribe(mvls => {
+ this.setChannelOptions(mvls, channelGroup);
+ this.addChannelToSelection(node, channelGroup);
+ });
+ } else {
+ // if channel is in axis type y, set as selected, if not selected already
+ this.addChannelToSelection(node, channelGroup);
+ }
+ }
+ break;
+ }
+ }
+ }
+
+ /**
+ * reset chart data, select options and selection, if selected channelgroups
+ * contain a channelGroup which does not belongto this measurement.
+ *
+ * notice: this works for channels aswell, since a channel cannot be selected without
+ * selecting the parent channelGroup aswell.
+ */
+ private cleanOldState() {
+ if (this.arrayUtil.isNotEmpty(this.selectedChannelGroups)
+ && this.selectedChannelGroups.some(selected => !this.isNodeIn(selected, this.channelGroups))) {
+ this.xYcache.clear();
+ this.resetChannelData();
+ }
+ }
+
+ /**
+ * Handle channel selection via nav-tree
+ * @param channel
+ * @param channelGroup
+ */
+ private addChannelToSelection(channel: Node, channelGroup: Node) {
+ // adds channel to selected y-channels if possible and creates row in table
+ if (this.isNodeIn(channel, this.yChannelOptions)) {
+ const index = this.selectedYChannels.findIndex(c => c.id === channel.id);
+ if (index === -1) {
+ this.setSelectedYChannels(this.selectedYChannels.concat([channel]));
+ this.addRow(channelGroup, channel);
+ this.fireSelectionChanged();
+ }
+ /**
+ * @TODO -> expected behaviour on selecting x-channel in tree.
+ * suggestion: set it as x-channel for all selected y-channels of that channelgroup.
+ */
+ // if channel is of axis type x, set ... ?
+ } else if (this.isNodeIn(channel, this.xChannelOptions[channelGroup.id])) {
+ this.notificationService.notifyWarn('Selected X-Channel', 'Selected channel is of type x-axis. Change x/y mode.');
+ } else {
+ this.notificationService.notifyError('Unknown channel option', 'Not sure where you found this..');
+ }
+ }
+
+ /**
+ * Handle channelGroup selection via nav-tree
+ * @param id
+ * @param channelGroup
+ */
+ private addChannelGroupToSelection(id: string, channelGroup: Node) {
+ if (this.selectedChannelGroups == undefined) {
+ this.setSelectedChannelGroups([]);
+ }
+ if (!this.isNodeIn(channelGroup, this.selectedChannelGroups)) {
+ this.setSelectedChannelGroups(this.selectedChannelGroups.concat([channelGroup]));
+ this.handleSelectChannelGroup(channelGroup);
+ }
+ }
+
+ /**
+ * Adds options for x- and y-channels depending on given channelGroup
+ *
+ * @param measuredValues
+ * @param channelGroup
+ */
+ private setChannelOptions(measuredValues: MeasuredValues[], channelGroup: Node) {
+ if (channelGroup != undefined) {
+ // cache measuredValues to avoid reloading
+ this.xYcache.set(channelGroup.id, measuredValues);
+
+ // create empty array if property not exists
+ this.xChannelOptions[channelGroup.id] = this.xChannelOptions[channelGroup.id] || [];
+
+ if (this.xyMode) {
+ measuredValues.forEach(mvl => {
+ const tmpChannel = this.channels.get(channelGroup.id).filter(c => c.name === mvl.name)[0];
+ if (mvl.axisType === 'X_AXIS' || mvl.axisType === 'XY_AXIS' || ( mvl.axisType == undefined && mvl.independent)) {
+ this.xChannelOptions[channelGroup.id] = this.xChannelOptions[channelGroup.id].concat(tmpChannel);
+ // cache independent channels for default x-axis.
+ if (mvl.independent) {
+ this.independentChannels.set(channelGroup.id, tmpChannel);
+ }
+ } else if (mvl.axisType === 'Y_AXIS' || mvl.axisType === 'XY_AXIS') {
+ this.yChannelOptions = this.yChannelOptions.concat(tmpChannel);
+ }
+ });
+ } else {
+ // cache independent channel for default x-axis.
+ const value = measuredValues.find(mvl => mvl.independent);
+ if (value != undefined) {
+ const tmpChannel = this.channels.get(channelGroup.id).filter(c => c.name === value.name)[0];
+ this.independentChannels.set(channelGroup.id, tmpChannel);
+ }
+
+ const tmpChannels = this.channels.get(channelGroup.id);
+ this.xChannelOptions[channelGroup.id] = this.xChannelOptions[channelGroup.id].concat(tmpChannels);
+ this.yChannelOptions = this.yChannelOptions.concat(tmpChannels);
+ }
+ }
+ }
+
+ /**
+ * Resets selections and select options to empty state.
+ */
+ private resetChannelData() {
+ this.setSelectedChannelGroups([]);
+ this.selectedChannelRows = [];
+ this.setSelectedYChannels([]);
+ this.channelGroups = [].concat(this.channelGroups);
+ this.xChannelOptions = {};
+ this.yChannelOptions = [];
+ }
+
+ /**
+ * Reloads the select options for the x- and y-axis dropdowns
+ */
+ private reloadAxisSelectOptions() {
+ this.xChannelOptions = {};
+ this.yChannelOptions = [];
+ if (this.arrayUtil.isNotEmpty(this.selectedChannelGroups)) {
+ const cached = this.selectedChannelGroups.filter(g => this.xYcache.get(g.id) !== undefined);
+ return of(cached.map((group, index) => this.setChannelOptions(this.xYcache.get(group.id), cached[index])))
+ .pipe(tap(() => this.removeSelectionsNotMatchingXYMode()));
+ }
+ return of();
+ }
+
+ private removeSelectionsNotMatchingXYMode() {
+ if (this.selectedYChannels.length > 0) {
+ const l = this.selectedChannelRows.length;
+ this.selectedChannelRows = this.selectedChannelRows.filter(row => this.isNodeIn(row.yChannel, this.yChannelOptions));
+ this.setSelectedYChannels(this.selectedYChannels.filter(channel => this.isNodeIn(channel, this.yChannelOptions)));
+ this.selectionChanged = l !== this.selectedChannelRows.length;
+ }
+ }
+
+ /**
+ * Row control for table with x-channel selection.
+ *
+ * @param channelGroup
+ * @param yChannel
+ */
+ private addOrRemoveRow(channelGroup: Node, yChannel: Node) {
+ const index = this.selectedChannelRows.findIndex(row => row.yChannel.id === yChannel.id);
+ if (index > -1) {
+ this.selectedChannelRows.splice(index, 1);
+ this.selectedChannelRows = [].concat(this.selectedChannelRows);
+ } else {
+ this.addRow(channelGroup, yChannel);
+ }
+ }
+
+ /**
+ * Add row to selection
+ * @param channelGroup
+ * @param yChannel
+ */
+ private addRow(channelGroup: Node, yChannel: Node) {
+ const row = new ChannelSelectionRow(channelGroup, yChannel, this.getDefaultXChannel(channelGroup));
+ this.selectedChannelRows.push(row);
+ }
+
+ /**
+ * Get the default channel for x-axis. First tries to find an independent channel,
+ * if non is found the first channel with axistype X-Axis or XY-Axis is returned.
+ * @param channelGroup
+ */
+ private getDefaultXChannel(channelGroup: Node) {
+ let defaultXChannel = this.independentChannels.get(channelGroup.id);
+ if (defaultXChannel == undefined && this.xChannelOptions[channelGroup.id].length > 0) {
+ defaultXChannel = this.xChannelOptions[channelGroup.id][0];
+ }
+ return defaultXChannel;
+ }
+
+ /**
+ * Returns true if node with given id is in the given array.
+ *
+ * @param array the array
+ * @param id the id
+ */
+ private isNodeIn(node: Node, array: Node[]) {
+ let response = false;
+ if (node != undefined && this.arrayUtil.isNotEmpty(array)) {
+ response = array.findIndex(n => n.id === node.id) > -1;
+ }
+ return response;
+ }
+
+ /**
+ * Looks up parent channelGroup for channel via the channel map.
+ *
+ * @param channel
+ */
+ private findChannelGroup(channel: Node) {
+ const channelGroupId = Array.from(this.channels.keys())
+ .find(key => this.isNodeIn(channel, this.channels.get(key)));
+ return this.channelGroups.find(cg => cg.id === channelGroupId);
+ }
+
+ private fireSelectionChanged() {
+ this.onSelectionChanged.emit(this.selectedChannelRows);
+ }
+
+ private setSelectedYChannels(channels: Node[]) {
+ this.selectedYChannels = channels;
+ this.lastYChannelSelection = channels;
+ }
+
+ private setSelectedChannelGroups(channelGroups: Node[]) {
+ this.selectedChannelGroups = channelGroups;
+ this.lastChannelGroupSelection = channelGroups;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-nav-card/xy-chart-viewer-nav-card.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-nav-card/xy-chart-viewer-nav-card.component.html
new file mode 100644
index 0000000..01b2142
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-nav-card/xy-chart-viewer-nav-card.component.html
@@ -0,0 +1,23 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+
+<div *ngIf="measurement === undefined || channelGroups === undefined || channels === undefined">
+ <div class="alert alert-info" style="margin: 0;">
+ <strong>{{'chartviewer.xy-chart-viewer-nav-card.no-node-selected' | translate}}</strong>
+ </div>
+</div>
+
+<div *ngIf="measurement !== undefined && channelGroups !== undefined && channels !== undefined">
+ <app-xy-chart-viewer [channelGroups]="channelGroups" [channels]="channels"></app-xy-chart-viewer>
+</div>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-nav-card/xy-chart-viewer-nav-card.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-nav-card/xy-chart-viewer-nav-card.component.ts
new file mode 100644
index 0000000..af4d82d
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-nav-card/xy-chart-viewer-nav-card.component.ts
@@ -0,0 +1,178 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { NavigatorService } from 'src/app/navigator/navigator.service';
+import { MDMNotificationService } from 'src/app/core/mdm-notification.service';
+import { Node } from '../../../navigator/node';
+import { TYPE_CHANNEL, TYPE_CHANNELGROUP, TYPE_MEASUREMENT } from '../../model/constants';
+import { Subscription, forkJoin } from 'rxjs';
+import { NodeService } from 'src/app/navigator/node.service';
+import { map, tap } from 'rxjs/operators';
+import { MDMItem } from 'src/app/core/mdm-item';
+import { ChartViewerService } from '../../services/chart-viewer.service';
+
+@Component({
+ selector: 'app-xy-chart-viewer-nav-card',
+ templateUrl: './xy-chart-viewer-nav-card.component.html'
+})
+export class XyChartViewerNavCardComponent implements OnInit, OnDestroy {
+
+ public channels = new Map<string, Node[]>();
+ public channelGroups: Node[];
+ public measurement: Node;
+
+ private selectedNode: Node;
+
+ // Subscriptions
+ private selectedNodeSub: Subscription;
+
+ constructor(
+ private navigatorService: NavigatorService,
+ private notificationService: MDMNotificationService,
+ private nodeService: NodeService,
+ private chartViewerService: ChartViewerService) {}
+
+ ngOnInit() {
+ this.selectedNodeChanged(this.navigatorService.getSelectedNode());
+ this.selectedNodeSub = this.navigatorService.selectedNodeChanged.subscribe(
+ node => this.selectedNodeChanged(node),
+ error => this.notificationService.notifyError('details.mdm-detail-view.cannot-update-node', error)
+ );
+ }
+
+ ngOnDestroy() {
+ this.selectedNodeSub.unsubscribe();
+ }
+
+ /**
+ * Handle node selection in navigation tree.
+ * Loads necessary data for xy chart, if not present:
+ * - Measurement:
+ * + Loaded if a channel or channelgroup is selected that is not present.
+ * + Also loads all channels and channelgroups for that measurement.
+ * - Channelgroups:
+ * + Loaded if a measurement is selected/loaded that is not present.
+ * + Also loads all channels for all newly loaded channelgroups.
+ * - Channels:
+ * + Allways loaded if some node is not present.
+ *
+ * @param node the selected node
+ */
+ private selectedNodeChanged(node: Node) {
+ this.selectedNode = node;
+ if (node != undefined) {
+ switch (node.type) {
+ case TYPE_MEASUREMENT:
+ this.selectedMeasurement(node);
+ break;
+ case TYPE_CHANNELGROUP:
+ this.selectedChannelGroup(node);
+ break;
+ case TYPE_CHANNEL:
+ this.selectedChannel(node);
+ break;
+ }
+ }
+ }
+
+ // reload all, if channel is not present yet.
+ private selectedChannel(node: Node) {
+ if (!this.isChannelPresent(node)) {
+ this.loadMeasurement(node);
+ } else {
+ this.chartViewerService.sendNodeMeta(this.selectedNode);
+ }
+ }
+
+ private selectedChannelGroup(node: Node) {
+ if (!this.isChannelGroupPresent(node)) {
+ this.loadMeasurement(node);
+ } else {
+ this.chartViewerService.sendNodeMeta(this.selectedNode);
+ }
+ }
+
+ private selectedMeasurement(node: Node) {
+ if (this.measurement == undefined || this.measurement.id !== node.id) {
+ this.measurement = node;
+ this.loadChannelGroups(node);
+ } else {
+ this.chartViewerService.sendNodeMeta(this.selectedNode);
+ }
+ }
+
+ private isChannelPresent(node: Node) {
+ if (this.channels != undefined) {
+ /**
+ * @TODO more readable code, but got the impression that performance is bad. Read up on performance topic in depth.
+ */
+ // Array.from(this.channels.values())
+ // .reduce((a,b) => a.concat(b), [])
+ // .findIndex(c => c.id === node.id);
+ let index = -1;
+ const iterator = this.channels.values();
+ let res = iterator.next();
+ while (index === -1 && !res.done) {
+ index = res.value.findIndex(c => c.id === node.id);
+ res = iterator.next();
+ }
+ return index > -1;
+ }
+ return false;
+ }
+
+ private isChannelGroupPresent(node: Node) {
+ if (this.channelGroups != undefined) {
+ return this.channelGroups.findIndex(channelGroup => channelGroup.id === node.id) > -1;
+ }
+ return false;
+ }
+
+ private loadMeasurement(node: Node) {
+ this.searchNodes(node, TYPE_MEASUREMENT)
+ .pipe(
+ /** @TODO in general true? */
+ // parent measurement must be distinct
+ map(measurements => measurements[0]),
+ ).subscribe(measurement => {
+ this.measurement = measurement;
+ this.loadChannelGroups(this.measurement);
+ });
+ }
+
+ private loadChannelGroups(measurement: Node) {
+ this.searchNodes(measurement, TYPE_CHANNELGROUP)
+ .subscribe(channelGroups => {
+ this.channelGroups = channelGroups;
+ if (this.channelGroups != undefined) {
+ this.loadChannels(channelGroups);
+ }
+ });
+ }
+
+ private loadChannels(channelGroups: Node[]) {
+ this.channels.clear();
+ let obsArray = channelGroups.map(channelGroup => this.searchNodes(channelGroup, TYPE_CHANNEL));
+ forkJoin(obsArray).pipe(
+ tap(array => array.forEach((channels, index) => this.channels.set(channelGroups[index].id, channels)))
+ ).subscribe(datasets => this.chartViewerService.sendNodeMeta(this.selectedNode));
+ }
+
+ private searchNodes(node: Node, targetType: string) {
+ const filter = 'filter=' + node.type + '.Id eq \"' + node.id + '\"';
+ return this.nodeService.searchNodes(filter, node.sourceName, targetType);
+ }
+
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-toolbar/xy-chart-viewer-toolbar.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-toolbar/xy-chart-viewer-toolbar.component.html
new file mode 100644
index 0000000..9264220
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-toolbar/xy-chart-viewer-toolbar.component.html
@@ -0,0 +1,97 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+<div class="p-col-12 thin" >
+ <!-- ChannelSelection -->
+ <p-toggleButton
+ [(ngModel)]="properties.showSelection"
+ [onIcon]="'fa fa-columns'"
+ offIcon="fa fa-square-o"
+ onLabel=""
+ offLabel=""
+ (onChange)="onChangeProperty($event)"
+ title="{{(properties.showSelection ? 'chartviewer.xy-chart-viewer-toolbar.hide-data-selection-panel' : 'chartviewer.xy-chart-viewer-toolbar.show-data-selection-panel')| translate }}">
+ </p-toggleButton>
+ <!-- X/Y-mode -->
+ <p-toggleButton
+ [(ngModel)]="xyMode"
+ [onIcon]="'fa fa-filter'"
+ offIcon="fa fa-filter"
+ onLabel=""
+ offLabel=""
+ (onChange)="onToggleXyMode($event)"
+ title="{{(xyMode ? 'chartviewer.xy-chart-viewer-toolbar.deactivate-xy-mode' : 'chartviewer.xy-chart-viewer-toolbar.activate-xy-mode')| translate }}">
+ </p-toggleButton>
+ <span style="width:12px; display:inline-block;"></span>
+ <!-- Legend -->
+ <p-toggleButton
+ [onIcon]="'fa fa-map'"
+ offIcon="fa fa-map-o"
+ onLabel=""
+ offLabel=""
+ [(ngModel)]="properties.options.legend.display"
+ (onChange)="onChangeProperty($event)"
+ title="{{(properties?.options?.legend?.display ? 'chartviewer.xy-chart-viewer-toolbar.hide-chart-legend' : 'chartviewer.xy-chart-viewer-toolbar.show-chart-legend')| translate }}">
+ </p-toggleButton>
+ <!-- Linewidth -->
+ <p-spinner
+ [(ngModel)]="properties.lineWidth"
+ [min]="0.25"
+ [step]="0.25"
+ size="1"
+ (onChange)="onChangeProperty($event)"
+ title="{{'chartviewer.xy-chart-viewer-toolbar.line-width' | translate }}">
+ </p-spinner>
+ <!-- draw lines -->
+ <p-toggleButton
+ [onIcon]="'fa fa-line-chart'"
+ offIcon="fa fa-line-chart"
+ onLabel=""
+ offLabel=""
+ [(ngModel)]="properties.showLines"
+ (onChange)="onToggleShowLines($event)"
+ title="{{(properties.showLines ? 'chartviewer.xy-chart-viewer-toolbar.hide-lines' : 'chartviewer.xy-chart-viewer-toolbar.show-lines')| translate }}">
+ </p-toggleButton>
+ <!-- fill area -->
+ <p-toggleButton
+ [onIcon]="'fa fa-area-chart'"
+ offIcon="fa fa-area-chart"
+ onLabel=""
+ offLabel=""
+ [(ngModel)]="properties.fillArea"
+ (onChange)="onChangeProperty($event)"
+ [disabled]="!properties.showLines"
+ title="{{(properties.fillArea ? 'chartviewer.xy-chart-viewer-toolbar.clear-area' : 'chartviewer.xy-chart-viewer-toolbar.fill-area')| translate }}">
+ </p-toggleButton>
+ <!-- Datapoints -->
+ <p-toggleButton
+ title="Show Datapoints"
+ [onIcon]="'fa fa-share-alt'"
+ offIcon="fa fa-share-alt"
+ onLabel=""
+ offLabel=""
+ [(ngModel)]="properties.drawPoints"
+ (onChange)="onChangeProperty($event)"
+ title="{{(properties.drawPoints ? 'chartviewer.xy-chart-viewer-toolbar.hide-datapoints' : 'chartviewer.xy-chart-viewer-toolbar.show-datapoints'| translate) }}">
+ </p-toggleButton>
+ <!-- tension -->
+ <p-spinner
+ size="1"
+ [(ngModel)]="properties.lineTension"
+ [min]="0"
+ [step]="0.1"
+ [max]="1"
+ (onChange)="onChangeProperty($event)"
+ title="{{'chartviewer.xy-chart-viewer-toolbar.tension' | translate }}">
+ </p-spinner>
+</div>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-toolbar/xy-chart-viewer-toolbar.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-toolbar/xy-chart-viewer-toolbar.component.ts
new file mode 100644
index 0000000..b22f402
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer-toolbar/xy-chart-viewer-toolbar.component.ts
@@ -0,0 +1,82 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { ChartToolbarProperties } from '../../model/chartviewer.model';
+
+@Component({
+ selector: 'mdm5-xy-chart-viewer-toolbar',
+ templateUrl: './xy-chart-viewer-toolbar.component.html',
+ styleUrls: ['../../chart-viewer.style.css']
+})
+export class XyChartViewerToolbarComponent implements OnInit {
+
+ @Output()
+ public xyModeChanged = new EventEmitter<boolean>();
+ @Output()
+ public toolbarPropertiesChanged = new EventEmitter<ChartToolbarProperties>();
+
+ // if true, x- and y-channels have to be channels with axisType 'X_AXIS', or 'Y_AXIS' respectively.
+ // change xy requires reloading of select options. Thus requires own event.
+ public xyMode = true;
+ // holds actual properties
+ public properties = new ChartToolbarProperties();
+ // model for showlines.
+ public showLegend = true;
+
+ constructor() { }
+
+ ngOnInit() {
+
+ /** properties for cahrt elements */
+
+ // if true, shows pannel with channel(-group) selection
+ this.properties.showSelection = true;
+ // if true, draws datapoints
+ this.properties.drawPoints = false;
+ // the charts borderwidth (width of lines, border for points)
+ this.properties.lineWidth = 1;
+ // if true, draws lines connecting datapoints
+ this.properties.showLines = true;
+ // if true, fills are below graph
+ this.properties.fillArea = false;
+ // the interpolation degree. 0 = linear, 0.4 = Bezier
+ this.properties.lineTension = 0;
+
+ // /** properties directly passed to cahrt options */
+ // if legend.display true, shows chart legend
+ this.properties.options = {legend: {display: true}};
+
+ // emit to send initial properties to chart viewer
+ this.xyModeChanged.emit(this.xyMode);
+ this.toolbarPropertiesChanged.emit(this.properties);
+ }
+
+ // X- and y-axis options are determined by channels axis type, if xyMode toggled to true
+ public onToggleXyMode(event: Event) {
+ this.xyModeChanged.emit(this.xyMode);
+ }
+
+ public onChangeProperty(event: Event) {
+ this.toolbarPropertiesChanged.emit(this.properties);
+ }
+
+ // displays/hides lines connecting data points
+ public onToggleShowLines(event: Event) {
+ if (!this.properties.showLines) {
+ this.properties.fillArea = false;
+ }
+ this.toolbarPropertiesChanged.emit(this.properties);
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer/xy-chart-viewer.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer/xy-chart-viewer.component.html
new file mode 100644
index 0000000..7273cff
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer/xy-chart-viewer.component.html
@@ -0,0 +1,42 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+<div class="p-grid toolbar">
+ <mdm5-xy-chart-viewer-toolbar #toolbar
+ (xyModeChanged)="onXyModeChanged($event)"
+ (toolbarPropertiesChanged)="onToolbarPropertiesChanged($event)">
+ </mdm5-xy-chart-viewer-toolbar>
+</div>
+
+<!-- View area -->
+<div class="p-grid nested-grid">
+ <!-- Axis selection -->
+ <div [ngClass]="showSelection ? 'p-col-3' : 'hidden'">
+ <mdm5-xy-chart-data-selection-panel
+ [channelGroups]="channelGroups"
+ [channels]="channels"
+ [xyMode]="xyMode"
+ (onSelectionChanged)="onDataSelectionChanged($event)"
+ ></mdm5-xy-chart-data-selection-panel>
+ </div>
+ <!-- Chart / Table -->
+ <div [ngClass]="showSelection ? 'p-col-9' : 'p-col-12'">
+ <p-chart #xyChart type="scatter" [data]="data"></p-chart>
+ </div>
+</div>
+<div class="p-grid">
+ <div class="p-col-12">
+ <mdm5-request-options [channelGroups]="channelGroups" (onRequestOptionsChanged)="onRequestOptionsChanged($event)"></mdm5-request-options>
+ </div>
+</div>
+
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer/xy-chart-viewer.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer/xy-chart-viewer.component.ts
new file mode 100644
index 0000000..549a418
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/components/xy-chart-viewer/xy-chart-viewer.component.ts
@@ -0,0 +1,220 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit, Input, ViewChild } from '@angular/core';
+
+import { UIChart } from 'primeng/chart';
+import { map, flatMap, tap } from 'rxjs/operators';
+
+import { Node } from '../../../navigator/node';
+
+import { ChartData, ChartDataSet, MeasuredValues, RequestOptions, ChannelSelectionRow,
+ ChartXyDataSet, ChartToolbarProperties} from '../../model/chartviewer.model';
+import { ChartViewerDataService } from '../../services/chart-viewer-data.service';
+import { ArrayUtilService } from 'src/app/core/services/array-util.service';
+import { ChartViewerService } from '../../services/chart-viewer.service';
+import { forkJoin} from 'rxjs';
+import { MDMNotificationService } from 'src/app/core/mdm-notification.service';
+
+@Component({
+ selector: 'app-xy-chart-viewer',
+ templateUrl: './xy-chart-viewer.component.html',
+ styleUrls: ['../../chart-viewer.style.css']
+})
+export class XyChartViewerComponent implements OnInit {
+
+ @ViewChild('xyChart')
+ public chart: UIChart;
+
+ @Input()
+ public channelGroups: Node[];
+ @Input()
+ public channels: Map<string, Node[]>;
+
+ // the chart data
+ public data: ChartData;
+
+ // options for meausred value data request
+ private requestOptions: RequestOptions;
+ // chart properties set via toolbar
+ private toolbarProperties: ChartToolbarProperties;
+ // shows selection pannel if true, set via toolbar
+ public showSelection: boolean;
+ // passed to selection pannel
+ public xyMode: boolean;
+
+ public selectedChannelRows: ChannelSelectionRow[] = [];
+
+ constructor(private chartviewerDataService: ChartViewerDataService,
+ private chartviewerService: ChartViewerService,
+ private arrayUtil: ArrayUtilService,
+ private notificationService: MDMNotificationService) { }
+
+ ngOnInit() {
+ this.initChartData();
+ }
+
+ /**************** Html-template listeners *****************************/
+
+ /**
+ * Draws chart when data selection changes
+ * @param rows
+ */
+ public onDataSelectionChanged(rows: ChannelSelectionRow[]) {
+ this.selectedChannelRows = rows;
+ this.doChart();
+ }
+
+ /**
+ * Passes xyModeChanges from toolbar to selection pannel
+ * @param isXyMode
+ */
+ public onXyModeChanged(isXyMode: boolean) {
+ this.xyMode = isXyMode;
+ }
+
+ /**
+ * Handles toolbar property changes
+ * @param properties
+ */
+ public onToolbarPropertiesChanged(properties: ChartToolbarProperties) {
+ this.toolbarProperties = properties;
+ this.showSelection = properties.showSelection;
+ this.chart.options = properties.options;
+ if (this.chart.data != undefined) {
+ this.chart.data.datasets.forEach( dataSet => {
+ dataSet.showLine = properties.showLines;
+ dataSet.pointRadius = properties.drawPoints ? 3 : 0;
+ dataSet.borderWidth = properties.lineWidth;
+ dataSet.lineTension = properties.lineTension;
+ dataSet.fill = properties.fillArea;
+ });
+ this.chart.reinit();
+ }
+ }
+
+ // Sets new data request options and redraws the graph
+ public onRequestOptionsChanged(options: RequestOptions) {
+ this.requestOptions = options;
+ this.doChart();
+ }
+
+ /********** private methods / class logic ********************************************************/
+
+ // empty chart on initialization
+ private initChartData() {
+ const dataset = new ChartDataSet('No data', []);
+ dataset.borderColor = '#fff';
+ this.data = new ChartData([], [dataset]);
+ }
+
+ /**
+ * Loads measured values for current selection and draws the new chart.
+ */
+ private doChart() {
+ if (this.arrayUtil.isNotEmpty(this.selectedChannelRows) && this.requestOptions != undefined) {
+ const xChannels = this.selectedChannelRows.filter(row => row.xChannel != undefined)
+ .map(row => this.chartviewerDataService.loadMeasuredValues(
+ row.channelGroup, [row.xChannel], this.requestOptions.startIndex, this.requestOptions.requestSize));
+ forkJoin(xChannels)
+ .pipe(
+ map(array => array.map((mea, index) => ({yChannel: this.selectedChannelRows[index].yChannel, measuredValues: mea[0]}))),
+ flatMap(xValues => this.loadYData(xValues)),
+ tap(x => console.log(x))
+ )
+ .subscribe(resp => this.applyData(resp));
+ } else {
+ this.initChartData();
+ }
+ }
+
+ /**
+ * Apply the ChartData to data and options attributes of the chart component
+ * @param xValues
+ */
+ private applyData(resp: ChartData) {
+ this.data = resp;
+ this.chart.options = {
+ scales: {
+ xAxes: [{
+ scaleLabel: {
+ display: true,
+ labelString: resp.datasets.map(ds => (<ChartXyDataSet> ds).xUnit).join(', ')
+ }
+ }],
+ },
+ };
+ }
+
+ /**
+ * Loads measured values for y-channels, merges them with given values for x
+ * @param xValues
+ */
+ private loadYData(xValues: {yChannel: Node; measuredValues: MeasuredValues}[]) {
+ if (xValues != undefined) {
+ const yChannels = this.groupYChannelsByChannelGroup(this.selectedChannelRows);
+ // const channelGroups = this.selectedChannelGroups.filter(cg => this.arrayUtil.isNotEmpty(yChannels[cg.id]));
+ const channelGroups = Array.from(new Set(this.selectedChannelRows.map(row => row.channelGroup)));
+
+ const obs = channelGroups.map(cg => this.chartviewerDataService.loadMeasuredValues(
+ cg, yChannels[cg.id], this.requestOptions.startIndex, this.requestOptions.requestSize));
+ // forkJoin return observables in order of input array. Therefore channelgroup id has to be like tmpChannelGroups[index].id
+ return forkJoin(obs)
+ .pipe(
+ map(array => array.map((yData, channelGroupIndex) =>
+ yData.map((yValues, yChannelIndex) => {
+ const cgId = channelGroups[channelGroupIndex].id;
+ const xMeasuredValues = this.extractXMeasuredValues(xValues, yChannels[cgId][yChannelIndex].id);
+ const dataSet = this.chartviewerService.toXyDataSet(xMeasuredValues, yValues);
+ return this.setChartProperties(dataSet);
+ }))),
+ map(sets => new ChartData([], sets.reduce((a, b) => a.concat(b), [])))
+ );
+ }
+ }
+
+ private extractXMeasuredValues(xValues: {yChannel: Node; measuredValues: MeasuredValues}[], channelId: string) {
+ const val = xValues.find(v => v.yChannel.id === channelId);
+ if (val != undefined ) {
+ return val.measuredValues;
+ }
+ }
+
+ /******* Helping functions */
+
+ private groupYChannelsByChannelGroup(array: ChannelSelectionRow[]) {
+ return array.reduce(
+ (obj, next) => {
+ const value = next.channelGroup.id;
+ obj[value] = obj[value] || [];
+ obj[value] = obj[value].concat(next.yChannel);
+ return obj;
+ }, {});
+ }
+
+ private setChartProperties(dataset: ChartXyDataSet) {
+ if (!this.toolbarProperties.drawPoints) {
+ dataset.pointRadius = 0;
+ }
+ dataset.showLine = this.toolbarProperties.showLines;
+ dataset.fill = this.toolbarProperties.fillArea;
+ dataset.lineTension = this.toolbarProperties.lineTension;
+ dataset.borderWidth = this.toolbarProperties.lineWidth;
+ const color = '#' + Math.random().toString(16).substr(-6);
+ dataset.borderColor = color;
+ dataset.backgroundColor = color;
+
+ return dataset;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/chartviewer.model.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/chartviewer.model.ts
new file mode 100644
index 0000000..82089da
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/chartviewer.model.ts
@@ -0,0 +1,31 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+export { BooleanArray } from './types/boolean-array.class';
+export { DateArray } from './types/date-array.class';
+export { NumberArray } from './types/number-array.class';
+export { MeasuredValues } from './types/measured-values.class';
+export { MeasuredValuesResponse } from './types/measured-values-response.class';
+export { PreviewValueList } from './types/preview-value-list.class';
+export { ChartData } from './types/chart-data.class';
+export { ChartDataSet } from './types/chart-data-set.class';
+export { ChartXyDataSet } from './types/chart-xy-data-set.class';
+export { ChartPoint } from './types/chart-point.class';
+export { RequestOptions } from './types/request-options.class';
+export { ChannelSelectionRow } from './types/channel-selection-row';
+export { ChartToolbarProperties } from './types/chart-toolbar-properties.class';
+
+
+export { PrimeChartDataSet } from './primeNgHelper/prime-chart-data-set.interface';
+export { PrimeChartData } from './primeNgHelper/prime-chart-data.interface';
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/constants.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/constants.ts
new file mode 100644
index 0000000..84c8b5b
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/constants.ts
@@ -0,0 +1,4 @@
+// entity types
+export const TYPE_CHANNEL = 'Channel';
+export const TYPE_CHANNELGROUP = 'ChannelGroup';
+export const TYPE_MEASUREMENT = 'Measurement';
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/primeNgHelper/prime-chart-data-set.interface.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/primeNgHelper/prime-chart-data-set.interface.ts
new file mode 100644
index 0000000..2ab3947
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/primeNgHelper/prime-chart-data-set.interface.ts
@@ -0,0 +1,18 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+export interface PrimeChartDataSet {
+ label: string;
+ data: any[];
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/primeNgHelper/prime-chart-data.interface.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/primeNgHelper/prime-chart-data.interface.ts
new file mode 100644
index 0000000..d2a1d96
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/primeNgHelper/prime-chart-data.interface.ts
@@ -0,0 +1,19 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+import { PrimeChartDataSet } from './prime-chart-data-set.interface';
+
+export interface PrimeChartData {
+ labels: any[];
+ datasets: PrimeChartDataSet[];
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/boolean-array.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/boolean-array.class.ts
new file mode 100644
index 0000000..a55de67
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/boolean-array.class.ts
@@ -0,0 +1,17 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+export class BooleanArray {
+ values: boolean[];
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/channel-selection-row.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/channel-selection-row.ts
new file mode 100644
index 0000000..23f0072
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/channel-selection-row.ts
@@ -0,0 +1,26 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+import {Node} from '../../../navigator/node';
+
+export class ChannelSelectionRow {
+ channelGroup: Node;
+ xChannel: Node;
+ yChannel: Node;
+
+ constructor(channelGroup: Node, yChannel: Node, xChannel?: Node) {
+ this.channelGroup = channelGroup;
+ this.yChannel = yChannel;
+ this.xChannel = xChannel;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-data-set.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-data-set.class.ts
new file mode 100644
index 0000000..616a91e
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-data-set.class.ts
@@ -0,0 +1,36 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+import { PrimeChartDataSet } from '../chartviewer.model';
+import { Node } from '../../../navigator/node';
+import { MeasuredValues } from './measured-values.class';
+
+export class ChartDataSet implements PrimeChartDataSet {
+ label: string;
+ data: any[];
+ hidden?: boolean;
+ fill?: boolean;
+ measuredValues?: MeasuredValues;
+ channel?: Node;
+ backgroundColor?: string;
+ borderColor?: string;
+ pointBackgroundColor?: string;
+ pointBorderColor?: string;
+ pointHoverBackgroundColor?: string;
+ pointHoverBorderColor?: string;
+
+ constructor (label: string, data: any[]) {
+ this.label = label;
+ this.data = data;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-data.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-data.class.ts
new file mode 100644
index 0000000..fc5c2ee
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-data.class.ts
@@ -0,0 +1,26 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+import { PrimeChartData } from '../primeNgHelper/prime-chart-data.interface';
+import { ChartDataSet } from './chart-data-set.class';
+import { ChartXyDataSet } from './chart-xy-data-set.class';
+
+export class ChartData implements PrimeChartData {
+ labels: any[];
+ datasets: (ChartDataSet | ChartXyDataSet)[];
+
+ constructor(labels: any[], datasets: (ChartDataSet | ChartXyDataSet)[]) {
+ this.labels = labels;
+ this.datasets = datasets;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-point.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-point.class.ts
new file mode 100644
index 0000000..22e36fe
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-point.class.ts
@@ -0,0 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+export class ChartPoint {
+ x: number;
+ y: number;
+
+ constructor (x: number, y: number) {
+ this.x = x;
+ this.y = y;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-toolbar-properties.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-toolbar-properties.class.ts
new file mode 100644
index 0000000..454d718
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-toolbar-properties.class.ts
@@ -0,0 +1,31 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+export class ChartToolbarProperties {
+
+ // if true, shows pannel with channel(-group) selection
+ public showSelection: boolean;
+ // if true, draws datapoints
+ public drawPoints: boolean;
+ // the charts borderwidth (width of lines, border for points)
+ public lineWidth: number;
+ // if true, draws lines connecting datapoints
+ public showLines: boolean;
+ // if true, fills are below graph
+ public fillArea: boolean;
+ // the interpolation degree. 0 = linear, 0.4 = Bezier
+ public lineTension: number;
+
+ public options: {legend: {display: boolean}};
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-xy-data-set.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-xy-data-set.class.ts
new file mode 100644
index 0000000..23da9aa
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/chart-xy-data-set.class.ts
@@ -0,0 +1,54 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+import { Node } from '../../../navigator/node';
+import { MeasuredValues } from './measured-values.class';
+import { ChartPoint } from './chart-point.class';
+import { PrimeChartDataSet } from '../chartviewer.model';
+
+export class ChartXyDataSet implements PrimeChartDataSet {
+ // mandatory
+ label: string;
+ data: ChartPoint[];
+
+ xUnit?: string;
+ yUnit?: string;
+
+ // remove?
+ hidden?: boolean;
+ measuredValues?: MeasuredValues;
+ channel?: Node;
+
+ // point styles
+ pointBackgroundColor?: string;
+ pointBorderColor?: string;
+ pointHoverBackgroundColor?: string;
+ pointHoverBorderColor?: string;
+ pointRadius: number;
+ pointHoverRadius?: number;
+
+ // line styles
+ borderWidth: number;
+ fill: boolean;
+ borderColor: string;
+ lineTension: number;
+ showLine: boolean;
+
+ // general
+ backgroundColor?: string;
+
+ constructor (label: string, data: ChartPoint[]) {
+ this.label = label;
+ this.data = data;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/date-array.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/date-array.class.ts
new file mode 100644
index 0000000..4f13aee
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/date-array.class.ts
@@ -0,0 +1,18 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+export class DateArray {
+ // @Type(() => Date)
+ values: string[];
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/measured-values-response.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/measured-values-response.class.ts
new file mode 100644
index 0000000..915b12a
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/measured-values-response.class.ts
@@ -0,0 +1,19 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { MeasuredValues } from './measured-values.class';
+
+export class MeasuredValuesResponse {
+ values: MeasuredValues[];
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/measured-values.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/measured-values.class.ts
new file mode 100644
index 0000000..672cb1a
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/measured-values.class.ts
@@ -0,0 +1,54 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { NumberArray } from './number-array.class';
+import { BooleanArray } from './boolean-array.class';
+import { DateArray } from './date-array.class';
+
+export class MeasuredValues {
+ name: string;
+ unit: string;
+ length: number;
+ independent: boolean;
+ axisType: string;
+ scalarType: string;
+ // stringArray: StringArray;
+ dateArray: DateArray;
+ booleanArray: BooleanArray;
+ // byteArray: ByteArray;
+ shortArray: NumberArray;
+ integerArray: NumberArray;
+ longArray: NumberArray;
+ floatArray: NumberArray;
+ doubleArray: NumberArray;
+ // byteStreamArray: ByteStreamArray;
+ // floatComplexArrray: FloatComplexArray;
+ // doubleComplexArrray: DoubleComplexArray;
+ flags: boolean[];
+ getDataArray() {
+ if (this.scalarType === 'INTEGER') {
+ return this.integerArray;
+ } else if (this.scalarType === 'FLOAT') {
+ return this.floatArray;
+ } else if (this.scalarType === 'DOUBLE') {
+ return this.doubleArray;
+ } else if (this.scalarType === 'DATE') {
+ return this.dateArray;
+ } else if (this.scalarType === 'SHORT') {
+ return this.shortArray;
+ } else if (this.scalarType === 'BOOLEAN') {
+ return this.booleanArray;
+ }
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/number-array.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/number-array.class.ts
new file mode 100644
index 0000000..7c3c310
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/number-array.class.ts
@@ -0,0 +1,16 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+export class NumberArray {
+ values: number[];
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/preview-value-list.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/preview-value-list.class.ts
new file mode 100644
index 0000000..9a42f12
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/preview-value-list.class.ts
@@ -0,0 +1,21 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { MeasuredValues } from './measured-values.class';
+
+export class PreviewValueList {
+ min: MeasuredValues[];
+ avg: MeasuredValues[];
+ max: MeasuredValues[];
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/request-options.class.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/request-options.class.ts
new file mode 100644
index 0000000..c818e02
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/model/types/request-options.class.ts
@@ -0,0 +1,26 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+export class RequestOptions {
+ requestSize: number;
+ startIndex: number;
+ previewEnabled: boolean;
+ numberOfChunks: number;
+
+ constructor(requestSize: number, startIndex: number, previewEnabled: boolean, numberOfChunks: number) {
+ this.requestSize = requestSize;
+ this.startIndex = startIndex;
+ this.previewEnabled = previewEnabled;
+ this.numberOfChunks = numberOfChunks;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer-data.service.spec.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer-data.service.spec.ts
new file mode 100644
index 0000000..e50383c
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer-data.service.spec.ts
@@ -0,0 +1,99 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
+import { HttpErrorHandler } from '../../core/http-error-handler';
+import { PropertyService } from '../../core/property.service';
+import { Node } from '../../navigator/node';
+import { MeasuredValues, NumberArray, MeasuredValuesResponse } from '../model/chartviewer.model';
+import { ChartViewerDataService } from './chart-viewer-data.service';
+
+
+let timeChannel = new MeasuredValues();
+timeChannel.name = 'time';
+timeChannel.unit = 's';
+timeChannel.length = 5;
+timeChannel.independent = true;
+timeChannel.integerArray = new NumberArray();
+timeChannel.integerArray.values = [1, 2, 3, 4, 5];
+timeChannel.flags = [true, true, true, true, true];
+
+let channel1 = new MeasuredValues();
+channel1.name = 'channel1';
+channel1.unit = 'm';
+channel1.length = 5;
+channel1.independent = true;
+channel1.integerArray = new NumberArray();
+channel1.integerArray.values = [3, 5, 4, 3, 2];
+channel1.flags = [true, true, true, true, true];
+
+export let data = new MeasuredValuesResponse();
+data.values = [channel1, timeChannel];
+
+describe('ChartViewerDataService', () => {
+ let httpTestingController: HttpTestingController;
+ let chartViewerDataService: ChartViewerDataService;
+
+ beforeEach(() => {
+ TestBed.resetTestEnvironment();
+ TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
+ TestBed.configureTestingModule({
+ imports: [ HttpClientTestingModule ],
+ providers: [ChartViewerDataService, HttpErrorHandler, PropertyService]
+ });
+
+ httpTestingController = TestBed.get(HttpTestingController);
+ chartViewerDataService = TestBed.get(ChartViewerDataService);
+ });
+
+ it('can read values', () => {
+ let node = new Node();
+ node.sourceName = 'MDM';
+ node.id = '1';
+
+ chartViewerDataService.loadMeasuredValues(node, [node])
+ .subscribe(channelGroups => expect(channelGroups).toEqual(data.values));
+
+ const req = httpTestingController.expectOne('/org.eclipse.mdm.nucleus/mdm/environments/MDM/values/read');
+ expect(req.request.method).toEqual('POST');
+ req.flush(data);
+
+ // Finally, assert that there are no outstanding requests.
+ httpTestingController.verify();
+ });
+
+ it('can filter on data', () => {
+ let node = new Node();
+ node.sourceName = 'MDM';
+ node.id = '1';
+
+ chartViewerDataService.loadMeasuredValues(node, [node])
+ .subscribe(channelGroups => expect(channelGroups.filter(c => c.name === 'time')).toEqual([timeChannel]));
+
+ const req = httpTestingController.expectOne('/org.eclipse.mdm.nucleus/mdm/environments/MDM/values/read');
+ expect(req.request.method).toEqual('POST');
+ req.flush(data);
+
+ // Finally, assert that there are no outstanding requests.
+ httpTestingController.verify();
+ });
+
+
+ afterEach(() => {
+ // After every test, assert that there are no more pending requests.
+ httpTestingController.verify();
+ });
+});
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer-data.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer-data.service.ts
new file mode 100644
index 0000000..7773a30
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer-data.service.ts
@@ -0,0 +1,146 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+
+import { plainToClass } from 'class-transformer';
+import { map, tap, catchError } from 'rxjs/operators';
+
+import { HttpErrorHandler } from '../../core/http-error-handler';
+import { PropertyService } from '../../core/property.service';
+import { Node } from '../../navigator/node';
+import { MeasuredValuesResponse, MeasuredValues, PreviewValueList } from '../model/chartviewer.model';
+
+export function getDataArray(m: MeasuredValues) {
+ if (m.scalarType === 'INTEGER') {
+ return m.integerArray;
+ } else if (m.scalarType === 'FLOAT') {
+ return m.floatArray;
+ } else if (m.scalarType === 'DOUBLE') {
+ return m.doubleArray;
+ } else if (m.scalarType === 'DATE') {
+ return m.dateArray;
+ } else if (m.scalarType === 'SHORT') {
+ return m.shortArray;
+ } else if (m.scalarType === 'BOOLEAN') {
+ return m.booleanArray;
+ }
+}
+
+@Injectable({
+ providedIn: 'root'
+})
+export class ChartViewerDataService {
+ private _contextUrl: string;
+
+ private httpOptions = {
+ headers: new HttpHeaders({
+ 'Content-Type': 'application/json',
+ 'Accept': 'application/json'
+ })
+ };
+
+ constructor(private http: HttpClient,
+ private httpErrorHandler: HttpErrorHandler,
+ private _prop: PropertyService) {
+ this._contextUrl = _prop.getUrl('mdm/environments');
+ }
+
+ loadMeasuredValues(channelGroup: Node, channels: Node[], startIndex = 0, requestSize = 0) {
+ let readRequest = {
+ 'channelGroupId': channelGroup.id,
+ 'channelIds': channels.map(channel => channel.id),
+ 'start_index': startIndex,
+ 'request_size': requestSize,
+ 'valuesMode': 'CALCULATED'
+ };
+
+ return this.http.post<MeasuredValuesResponse>(this._contextUrl + '/' + channelGroup.sourceName + '/values/read',
+ readRequest, this.httpOptions)
+ .pipe(
+ map(res => plainToClass(MeasuredValues, res.values)),
+ map(measurementValues => measurementValues.sort((a, b) => a.name.localeCompare(b.name))),
+ // tap(r => console.log(r)),
+ catchError(this.httpErrorHandler.handleError)
+ );
+ }
+
+ loadPreviewValues(channelGroup: Node, channels: Node[], chunks: number, startIndex = 0, requestSize = 0) {
+ let readRequest = {
+ 'channelGroupId': channelGroup.id,
+ 'channelIds': channels.map(channel => channel.id),
+ 'start_index': startIndex,
+ 'request_size': requestSize,
+ 'valuesMode': 'CALCULATED'
+ };
+ let previewRequest = {
+ 'numberOfChunks': chunks,
+ 'readRequest': readRequest
+ };
+
+ return this.http.post<PreviewValueList>(this._contextUrl + '/' + channelGroup.sourceName + '/values/preview',
+ previewRequest, this.httpOptions)
+ .pipe(
+ map(res => plainToClass(MeasuredValues, res.avg)),
+ // tap(r => console.log(r)),
+ catchError(this.httpErrorHandler.handleError)
+ );
+ }
+
+ // readMeasuredValuesMetadata(channelGroup: Node, channels: Node[]) {
+ // let readRequest = {
+ // 'channelGroupId': channelGroup.id,
+ // 'channelIds': channels.map(channel => channel.id),
+ // 'valuesMode': 'CALCULATED'
+ // };
+
+ // return this.http.post<MeasuredValuesResponse>(this._contextUrl + '/' + channelGroup.sourceName + '/values/read',
+ // readRequest, this.httpOptions)
+ // .pipe(
+ // map(res => plainToClass(MeasuredValues, res.values)),
+ // map(measurementValues => measurementValues.sort((a, b) => a.name.localeCompare(b.name))),
+ // tap(r => console.log(r)));
+ // }
+
+ /**
+ * @Todo workarround to get axis type. This schould be possible without accessign data. Requires RESTAPI changes.
+ */
+ readAxisType(channelGroup: Node) {
+ let readRequest = {
+ 'channelGroupId': channelGroup.id,
+ 'start_index': 0,
+ 'request_size': 1,
+ 'valuesMode': 'CALCULATED'
+ };
+
+ return this.http.post<MeasuredValuesResponse>(this._contextUrl + '/' + channelGroup.sourceName + '/values/read',
+ readRequest, this.httpOptions)
+ .pipe(
+ map(res => plainToClass(MeasuredValues, res.values)),
+ map(measurementValues => measurementValues.sort((a, b) => a.name.localeCompare(b.name))),
+ // tap(r => console.log(r))
+ );
+ }
+
+ getNumberOfRows(channelGroup: Node) {
+ let attr = channelGroup.attributes.find(a => a.name === 'SubMatrixNoRows');
+ if (attr === undefined) {
+ // TODO
+ console.log('Could not find attribute SubMatrixNoRows on ChannelGroup with id ' + channelGroup.id);
+ return;
+ }
+ return parseInt(<string> attr.value, 10);
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer.service.spec.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer.service.spec.ts
new file mode 100644
index 0000000..b187abc
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ChartViewerService } from './chart-viewer.service';
+
+describe('ChartViewerService', () => {
+ beforeEach(() => TestBed.configureTestingModule({}));
+
+ it('should be created', () => {
+ const service: ChartViewerService = TestBed.get(ChartViewerService);
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer.service.ts
new file mode 100644
index 0000000..7e0587d
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/chart-viewer.service.ts
@@ -0,0 +1,42 @@
+import { Injectable } from '@angular/core';
+import { Node } from '../../navigator/node';
+import { Subject } from 'rxjs';
+import { MeasuredValues, ChartData, ChartXyDataSet, ChartPoint } from '../model/chartviewer.model';
+import { getDataArray } from './chart-viewer-data.service';
+import { zip } from 'rxjs/operators';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class ChartViewerService {
+
+ private nodeMetaSubject = new Subject<Node>();
+
+ constructor() {}
+
+ public sendNodeMeta(nodeMeta: Node) {
+ this.nodeMetaSubject.next(nodeMeta);
+ }
+
+ public onNodeMetaChange() {
+ return this.nodeMetaSubject.asObservable();
+ }
+
+ public toXyDataSet(xData: MeasuredValues, yData: MeasuredValues) {
+ const xValues = xData.getDataArray().values as number[];
+ const yValues = getDataArray(yData).values as number[];
+ const points = this.getDataPoints(xValues, yValues);
+ const dataset = new ChartXyDataSet(yData.name + ' [' + yData.unit + ']', points);
+ dataset.xUnit = xData.unit;
+ dataset.yUnit = yData.unit;
+ return dataset;
+ }
+
+ private getDataPoints(xData: number[], yData: number[], startIndex = 0) {
+ if (xData != undefined && xData.length <= yData.length) {
+ return xData.map((x, i) => new ChartPoint(x, yData[i]));
+ } else if (xData != undefined && xData.length > yData.length) {
+ return yData.map((y, i) => new ChartPoint(xData[i], y));
+ }
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/dummy.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/dummy.service.ts
new file mode 100644
index 0000000..731c6ac
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/chartviewer/services/dummy.service.ts
@@ -0,0 +1,66 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { Node } from '../../navigator/node';
+import { MeasuredValues, MeasuredValuesResponse, NumberArray } from '../model/chartviewer.model';
+
+let timeChannel = new MeasuredValues();
+timeChannel.name = 'time';
+timeChannel.unit = 's';
+timeChannel.length = 5;
+timeChannel.independent = true;
+timeChannel.scalarType = 'INTEGER';
+timeChannel.integerArray = new NumberArray();
+timeChannel.integerArray.values = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+timeChannel.flags = [true, true, true, true, true, true, true, true, true, true];
+
+let channel1 = new MeasuredValues();
+channel1.name = 'channel1';
+channel1.unit = 'm';
+channel1.length = 5;
+channel1.independent = true;
+channel1.scalarType = 'INTEGER';
+channel1.integerArray = new NumberArray();
+channel1.integerArray.values = [3, 5, 4, 3, 2, 5, 1, 1, 7, 2];
+channel1.flags = [true, true, true, true, true, true, true, true, true, true];
+
+let data = new MeasuredValuesResponse();
+data.values = [timeChannel, channel1];
+
+@Injectable({
+ providedIn: 'root'
+})
+export class DummyChartviewerService {
+
+ constructor() {
+ }
+
+ loadMeasuredValues(channelGroup: Node, channels: Node[], startIndex = 0, requestSize = 0) {
+ data.values[0].length = requestSize;
+ data.values[0].integerArray.values = Array.from(Array(requestSize).keys()).map((v, i) => startIndex + i);
+ data.values[0].flags = data.values[0].integerArray.values.map(v => true);
+
+ data.values[1].length = requestSize;
+ data.values[1].integerArray.values = data.values[0].integerArray.values.map(v => Math.random() * 10);
+ data.values[1].flags = data.values[1].integerArray.values.map(v => true);
+
+ return Observable.of(data.values);
+ }
+
+ readMeasuredValuesMetadata(channelGroup: Node, channels: Node[]) {
+ return Observable.of(data.values);
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts
index ded3d54..bf5dbe5 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/core/mdm-core.module.ts
@@ -36,12 +36,15 @@
import { MDMNotificationComponent } from './mdm-notification.component';
import { OverwriteDialogComponent } from './overwrite-dialog.component';
+import { AttributeValuePipe } from '../navigator/attribute-value.pipe';
+
import { MDMDataSourceTranslationPipe } from '../localization/mdmdatasourcetranslation.pipe';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { Observable } from 'rxjs/Observable';
import { startWith, switchMap } from 'rxjs/operators';
+import { OnlyNumberDirective } from './only-number-directive';
// Marker function for ngx-translate-extract:
export function TRANSLATE(str: string) {
@@ -77,7 +80,9 @@
declarations: [
MDMNotificationComponent,
OverwriteDialogComponent,
- MDMDataSourceTranslationPipe
+ MDMDataSourceTranslationPipe,
+ OnlyNumberDirective,
+ AttributeValuePipe
],
exports: [
CommonModule,
@@ -99,6 +104,8 @@
OverwriteDialogComponent,
TranslateModule,
MDMDataSourceTranslationPipe,
+ AttributeValuePipe,
+ OnlyNumberDirective,
],
providers: [
PositioningService,
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/only-number-directive.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/core/only-number-directive.ts
new file mode 100644
index 0000000..74872fe
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/core/only-number-directive.ts
@@ -0,0 +1,19 @@
+import { Directive, ElementRef, HostListener, Input } from '@angular/core';
+import { NgControl } from '@angular/forms';
+
+@Directive({
+ selector: '[numbersOnly]'
+})
+export class OnlyNumberDirective {
+
+ constructor(private _el: ElementRef) { }
+
+ @HostListener('input', ['$event']) onInputChange(event) {
+ const initalValue = this._el.nativeElement.value;
+
+ this._el.nativeElement.value = initalValue.replace(/[^0-9]*/g, '');
+ if ( initalValue !== this._el.nativeElement.value) {
+ event.stopPropagation();
+ }
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/core/services/array-util.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/core/services/array-util.service.ts
new file mode 100644
index 0000000..d0b42b6
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/core/services/array-util.service.ts
@@ -0,0 +1,13 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class ArrayUtilService {
+
+ constructor() { }
+
+ public isNotEmpty(array: any[]) {
+ return array != undefined && array.length > 0;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-editor/attribute-editor.component.css b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-editor/attribute-editor.component.css
new file mode 100644
index 0000000..03e0f0c
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-editor/attribute-editor.component.css
@@ -0,0 +1,15 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+.attreditor {width: 80%;}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-editor/attribute-editor.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-editor/attribute-editor.component.html
new file mode 100644
index 0000000..43121f7
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-editor/attribute-editor.component.html
@@ -0,0 +1,33 @@
+<!--******************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ *******************************************************************************-->
+
+ <div [ngSwitch]="attribute?.dataType">
+ <input *ngSwitchCase="'STRING'" pInputText type="text" [(ngModel)]="attribute.value[ident.contextGroup]" class="attreditor">
+ <input *ngSwitchCase="'FLOAT'" pInputText type="number" [(ngModel)]="attribute.value[ident.contextGroup]" class="attreditor">
+ <input *ngSwitchCase="'SHORT'" pInputText type="number" [(ngModel)]="attribute.value[ident.contextGroup]" class="attreditor">
+ <input *ngSwitchCase="'LONG'" pInputText type="number" [(ngModel)]="attribute.value[ident.contextGroup]" class="attreditor">
+ <input *ngSwitchCase="'LONGLONG'" pInputText type="number" [(ngModel)]="attribute.value[ident.contextGroup]" class="attreditor">
+ <input *ngSwitchCase="'DOUBLE'" pInputText type="number" [(ngModel)]="attribute.value[ident.contextGroup]" class="attreditor">
+ <p-calendar *ngSwitchCase="'DATE'" [locale]="locale" dataType="string" showTime="true" hourFormat="24" dateFormat="{{'details.mdm-detail-descriptive-data.input-dateformat' | translate}}" [(ngModel)]="attribute.value[ident.contextGroup]" class="attreditor" [style]="{'width':'80%'}" [inputStyle]="{'min-width':'0.2em','width':'80%'}"></p-calendar>
+ <input *ngSwitchCase="'BOOLEAN'" pInputText type="checkbox" [(ngModel)]="attribute.value[ident.contextGroup]" class="attreditorbool">
+ <mdm5-file-link-editor *ngSwitchCase="'FILE_LINK'"
+ class="attreditor"
+ [ident]="ident"></mdm5-file-link-editor>
+ <file-link-sequence-editor *ngSwitchCase="'FILE_LINK_SEQUENCE'"
+ class="attreditor"
+ [ident]="ident"
+ [attribute]="attribute" ></file-link-sequence-editor>
+ <div *ngSwitchDefault>{{attribute | attributeValue: ident.contextGroup | async}}</div>
+</div>
+<span *ngIf="attribute?.unit?.length > 0" class="inlinecontent">{{attribute.unit}}</span>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-editor/attribute-editor.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-editor/attribute-editor.component.ts
new file mode 100644
index 0000000..53cec5a
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-editor/attribute-editor.component.ts
@@ -0,0 +1,90 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, Input } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+
+import { Attribute } from '@navigator/node';
+import { ContextAttributeIdentifier } from '../../model/details.model';
+
+@Component({
+ selector: 'attribute-editor',
+ templateUrl: './attribute-editor.component.html',
+ styleUrls: ['./attribute-editor.component.css']
+})
+export class AttributeEditorComponent {
+
+ @Input() ident: ContextAttributeIdentifier;
+ @Input() attribute: Attribute;
+
+ locale: any;
+
+ constructor(private translateService: TranslateService) {
+ // calendar localization
+ this.locale = {
+ firstDayOfWeek: 1,
+ dayNames: [this.translateService.instant('details.attribute-editor.cal-sunday'),
+ this.translateService.instant('details.attribute-editor.cal-monday'),
+ this.translateService.instant('details.attribute-editor.cal-tuesday'),
+ this.translateService.instant('details.attribute-editor.cal-wednesday'),
+ this.translateService.instant('details.attribute-editor.cal-thursday'),
+ this.translateService.instant('details.attribute-editor.cal-friday'),
+ this.translateService.instant('details.attribute-editor.cal-saturday')],
+ dayNamesShort: [this.translateService.instant('details.attribute-editor.cal-sun'),
+ this.translateService.instant('details.attribute-editor.cal-mon'),
+ this.translateService.instant('details.attribute-editor.cal-tue'),
+ this.translateService.instant('details.attribute-editor.cal-wed'),
+ this.translateService.instant('details.attribute-editor.cal-thu'),
+ this.translateService.instant('details.attribute-editor.cal-fri'),
+ this.translateService.instant('details.attribute-editor.cal-sat')],
+ dayNamesMin: [this.translateService.instant('details.attribute-editor.cal-su'),
+ this.translateService.instant('details.attribute-editor.cal-mo'),
+ this.translateService.instant('details.attribute-editor.cal-tu'),
+ this.translateService.instant('details.attribute-editor.cal-we'),
+ this.translateService.instant('details.attribute-editor.cal-th'),
+ this.translateService.instant('details.attribute-editor.cal-fr'),
+ this.translateService.instant('details.attribute-editor.cal-sa')],
+ monthNames: [this.translateService.instant('details.attribute-editor.cal-january'),
+ this.translateService.instant('details.attribute-editor.cal-february'),
+ this.translateService.instant('details.attribute-editor.cal-march'),
+ this.translateService.instant('details.attribute-editor.cal-april'),
+ this.translateService.instant('details.attribute-editor.cal-may'),
+ this.translateService.instant('details.attribute-editor.cal-june'),
+ this.translateService.instant('details.attribute-editor.cal-july'),
+ this.translateService.instant('details.attribute-editor.cal-august'),
+ this.translateService.instant('details.attribute-editor.cal-september'),
+ this.translateService.instant('details.attribute-editor.cal-october'),
+ this.translateService.instant('details.attribute-editor.cal-november'),
+ this.translateService.instant('details.attribute-editor.cal-december')],
+ monthNamesShort: [this.translateService.instant('details.attribute-editor.cal-jan'),
+ this.translateService.instant('details.attribute-editor.cal-feb'),
+ this.translateService.instant('details.attribute-editor.cal-mar'),
+ this.translateService.instant('details.attribute-editor.cal-apr'),
+ this.translateService.instant('details.attribute-editor.cal-may'),
+ this.translateService.instant('details.attribute-editor.cal-jun'),
+ this.translateService.instant('details.attribute-editor.cal-jul'),
+ this.translateService.instant('details.attribute-editor.cal-aug'),
+ this.translateService.instant('details.attribute-editor.cal-sep'),
+ this.translateService.instant('details.attribute-editor.cal-oct'),
+ this.translateService.instant('details.attribute-editor.cal-nov'),
+ this.translateService.instant('details.attribute-editor.cal-dec')],
+ today: this.translateService.instant('details.attribute-editor.cal-today'),
+ clear: this.translateService.instant('details.attribute-editor.cal-clear'),
+ dateFormat: this.translateService.instant('details.attribute-editor.cal-format'),
+ weekHeader: this.translateService.instant('details.attribute-editor.cal-week')
+ };
+}
+
+}
+
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-viewer/attribute-viewer.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-viewer/attribute-viewer.component.html
new file mode 100644
index 0000000..05e62a9
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-viewer/attribute-viewer.component.html
@@ -0,0 +1,20 @@
+<!--******************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ *******************************************************************************-->
+
+<div [ngSwitch]="attribute?.dataType">
+ <file-attribute-viewer *ngSwitchCase="'FILE_LINK'" [ident]="ident" [attribute]="attribute"></file-attribute-viewer>
+ <file-attribute-viewer *ngSwitchCase="'FILE_LINK_SEQUENCE'" [ident]="ident" [attribute]="attribute"></file-attribute-viewer>
+ <div *ngSwitchDefault>{{attribute | attributeValue: ident.contextGroup | async}}</div>
+</div>
+<span *ngIf="attribute?.unit?.length > 0" class="inlinecontent">{{attribute.unit}}</span>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-viewer/attribute-viewer.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-viewer/attribute-viewer.component.ts
new file mode 100644
index 0000000..6c79bd9
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/attribute-viewer/attribute-viewer.component.ts
@@ -0,0 +1,29 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, Input } from '@angular/core';
+
+import { Attribute } from '@navigator/node';
+import { ContextAttributeIdentifier } from '../../model/details.model';
+
+@Component({
+ selector: 'attribute-viewer',
+ templateUrl: './attribute-viewer.component.html'
+})
+export class AttributeViewerComponent {
+
+ @Input() ident: ContextAttributeIdentifier;
+ @Input() attribute: Attribute;
+}
+
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.css b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/detail-panel/detail-panel.component.css
similarity index 95%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.css
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/components/detail-panel/detail-panel.component.css
index aab6ffb..ac8087b 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.css
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/detail-panel/detail-panel.component.css
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/detail-panel/detail-panel.component.html
similarity index 79%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.html
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/components/detail-panel/detail-panel.component.html
index a7acc78..6d36aa5 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.html
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/detail-panel/detail-panel.component.html
@@ -1,5 +1,5 @@
<!--******************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -20,8 +20,13 @@
{{node.type | mdmdatasourcetranslate}}
</span>
<span class="btn-group" style="float: right;">
- <button *ngIf="showButton" type="button" class="btn btn-mdm" (click)="add2Basket()" [disabled]="shoppable">
- {{ 'details.mdm-detail-panel.btn-into-shopping-basket' | translate }}
+ <button *ngIf="showButton"
+ type="button"
+ class="btn btn-mdm"
+ (click)="add2Basket()"
+ [disabled]="shoppable"
+ title="{{ 'details.mdm-detail-panel.btn-into-shopping-basket' | translate }}">
+ <span class="fa fa-shopping-cart"></span>
</button>
</span>
</span>
@@ -37,7 +42,7 @@
<tbody *ngIf="node">
<tr *ngFor="let attr of displayAttributes">
<td>{{attr.name}}</td>
- <td>{{attr.value}}</td>
+ <td>{{attr | attributeValue | async}}</td>
<td>{{attr.unit}}</td>
</tr>
</tbody>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/detail-panel/detail-panel.component.ts
similarity index 87%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.ts
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/components/detail-panel/detail-panel.component.ts
index 0f529b2..ed4e1c6 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-panel/detail-panel.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/detail-panel/detail-panel.component.ts
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -14,10 +14,10 @@
import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { DetailViewService } from '../detail-view.service';
-import { BasketService } from '../../basket/basket.service';
-import { Node, Attribute } from '../../navigator/node';
-import { MDMItem } from '../../core/mdm-item';
+import { DetailViewService } from '../../services/detail-view.service';
+import { BasketService } from '@basket/basket.service';
+import { Node, Attribute} from '@navigator/node';
+import { MDMItem } from '@core/mdm-item';
@Component({
selector: 'mdm-detail-panel',
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-descriptive-data/mdm-detail-descriptive-data.component.css b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-descriptive-data/mdm-detail-descriptive-data.component.css
new file mode 100644
index 0000000..9b0c5b0
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-descriptive-data/mdm-detail-descriptive-data.component.css
@@ -0,0 +1,37 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+.btn-col {
+ width: 50px;
+}
+
+p-treetable >>> .ui-treetable-caption {
+ padding: .25em .5em!important;
+ text-align: right!important;
+}
+
+.toggler {
+ width: 19px;
+ height: 19px;
+ color: #6c757d;
+ margin: 0 8px 0 8px;
+}
+
+.clickable {
+ cursor: pointer;
+}
+
+.mdm-attribute-row.clickable.readOnly {
+ background-color: rgba(211, 211, 211, 0.5);
+}
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-descriptive-data/mdm-detail-descriptive-data.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-descriptive-data/mdm-detail-descriptive-data.component.html
new file mode 100644
index 0000000..8109cc7
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-descriptive-data/mdm-detail-descriptive-data.component.html
@@ -0,0 +1,122 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+
+
+ <div *ngIf="!contextComponents">
+ <div class="alert alert-info" style="margin: 0;">
+ <strong>{{status | translate}}</strong>
+ </div>
+</div>
+
+<div *ngIf="contextComponents" class="mdm-details-attributes">
+
+ <!-- <button (click)="changeTreeEdit(true, false)" *ngIf="!editMode && canEdit" class="btn btn-mdm" style="margin-bottom: 5px;">
+ <span class="fa fa-pencil"></span>
+ {{ 'details.mdm-detail-descriptive-data.btn-edit' | translate }}
+ </button>
+ <button (click)="changeTreeEdit(false, false)" *ngIf="editMode" class="btn btn-mdm" style="margin-bottom: 5px;">
+ <span class="fa fa-ban"></span>
+ {{ 'details.mdm-detail-descriptive-data.btn-cancel' | translate }}
+ </button>
+ <button (click)="changeTreeEdit(false, true)" *ngIf="editMode" class="btn btn-mdm" style="margin-bottom: 5px;">
+ <span class="fa fa-check"></span>
+ {{ 'details.mdm-detail-descriptive-data.btn-save' | translate }}
+ </button> -->
+
+ <p-treeTable #ttref [value]="treeNodes[contextType]" styleClass="table-hover">
+
+ <ng-template pTemplate="caption">
+ <div (click)="toggleTreeNodeState(ttref)" class="clickable">
+ <button (click)="onEdit($event)"
+ *ngIf="!editMode && canEdit"
+ class="btn btn-mdm"
+ title="{{ 'details.mdm-detail-descriptive-data.btn-edit' | translate }}">
+ <span class="fa fa-pencil"></span>
+ </button>
+ <button (click)="onCancelEdit($event)"
+ *ngIf="editMode"
+ class="btn btn-mdm"
+ title="{{ 'details.mdm-detail-descriptive-data.btn-cancel' | translate }}">
+ <span class="fa fa-ban"></span>
+ </button>
+ <button (click)="onSaveChanges($event)"
+ *ngIf="editMode"
+ class="btn btn-mdm"
+ title="{{ 'details.mdm-detail-descriptive-data.btn-save' | translate }}">
+ <span class="fa fa-check"></span>
+ </button>
+ <span class="fa fa-lg toggler" [ngClass]="isTreeTableExpanded ? 'fa-chevron-down': 'fa-chevron-right'"></span>
+ </div>
+ </ng-template>
+
+ <ng-template pTemplate="header">
+ <tr>
+ <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-name' | translate }}</th>
+ <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-ordered' | translate }}</th>
+ <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-measured' | translate }}</th>
+ </tr>
+ </ng-template>
+
+ <ng-template pTemplate="body" let-rowNode let-rowData="rowData">
+ <tr>
+ <!-- name -->
+ <td class="{{rowData.header ? 'mdm-component-row' : 'mdm-attribute-row'}}">
+ <p-treeTableToggler [rowNode]="rowNode"></p-treeTableToggler>
+ <span pTooltip="{{rowData.attribute != null ? rowData.attribute.description : ''}}" tooltipPosition="bottom">{{rowData.name}}</span>
+ </td>
+
+ <!-- ordered -->
+ <td ttEditableColumn [ttEditableColumnDisabled]="!editMode || rowData?.attribute?.readOnly" class="{{rowData.header ? 'mdm-component-row' : 'mdm-attribute-row'}}"
+ [ngClass]="{'clickable': canEdit && editMode, 'readOnly': rowData?.attribute?.readOnly}">
+ <p-treeTableCellEditor>
+ <ng-template pTemplate="input">
+ <attribute-editor
+ [ident]="getIdentifier(selectedNode, rowNode?.parent?.data?.attribute, rowData?.attribute, contextGroupEnum.ORDERED, contextType)"
+ [attribute]="rowData?.attribute" >
+ </attribute-editor>
+ </ng-template>
+
+ <ng-template pTemplate="output">
+ <attribute-viewer
+ [ident]="getIdentifier(selectedNode, rowNode?.parent?.data?.attribute, rowData?.attribute, contextGroupEnum.ORDERED, contextType)"
+ [attribute]="rowData?.attribute" >
+ </attribute-viewer>
+ </ng-template>
+ </p-treeTableCellEditor>
+ </td>
+
+ <!-- measured -->
+ <td ttEditableColumn [ttEditableColumnDisabled]="!editMode || rowData?.attribute?.readOnly" class="{{rowData.header ? 'mdm-component-row' : 'mdm-attribute-row'}}"
+ [ngClass]="{'clickable': canEdit && editMode, 'readOnly': rowData?.attribute?.readOnly}">
+ <p-treeTableCellEditor>
+ <ng-template pTemplate="input">
+ <span *ngIf="rowData?.attribute?.value?.length == 2">
+ <attribute-editor
+ [ident]="getIdentifier(selectedNode, rowNode?.parent?.data?.attribute, rowData?.attribute, contextGroupEnum.MEASURED, contextType)"
+ [attribute]="rowData?.attribute">
+ </attribute-editor>
+ </span>
+ </ng-template>
+ <ng-template pTemplate="output">
+ <attribute-viewer *ngIf="rowData?.attribute?.value?.length == 2"
+ [ident]="getIdentifier(selectedNode, rowNode?.parent?.data?.attribute, rowData?.attribute, contextGroupEnum.MEASURED, contextType)"
+ [attribute]="rowData?.attribute">
+ </attribute-viewer>
+ </ng-template>
+ </p-treeTableCellEditor>
+ </td>
+ </tr>
+ </ng-template>
+ </p-treeTable>
+</div>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-descriptive-data/mdm-detail-descriptive-data.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-descriptive-data/mdm-detail-descriptive-data.component.ts
new file mode 100644
index 0000000..d64ca38
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-descriptive-data/mdm-detail-descriptive-data.component.ts
@@ -0,0 +1,563 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+
+import { Component, OnInit, ChangeDetectorRef } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { DatePipe } from '@angular/common';
+
+import { TreeNode } from 'primeng/api';
+import { TreeTable } from 'primeng/primeng';
+import { Observable } from 'rxjs';
+import { TranslateService } from '@ngx-translate/core';
+
+import { Node, Attribute, ContextGroup } from '@navigator/node';
+import { NavigatorService } from '@navigator/navigator.service';
+import { MDMNotificationService } from '@core/mdm-notification.service';
+import { TRANSLATE } from '@core/mdm-core.module';
+import { FileService } from '@file-explorer/services/file.service';
+import { FileLinkContextWrapper } from '@file-explorer/model/file-explorer.model';
+import { AuthenticationService } from '../../../authentication/authentication.service';
+
+import { Sensor, Components, Context, ContextAttributeIdentifier} from '../../model/details.model';
+import { ContextService } from '../../services/context.service';
+import { Role } from 'src/app/authentication/authentication.service';
+
+@Component({
+ selector: 'mdm-detail-context',
+ templateUrl: 'mdm-detail-descriptive-data.component.html',
+ styleUrls: ['mdm-detail-descriptive-data.component.css'],
+})
+
+export class MDMDescriptiveDataComponent implements OnInit {
+
+ private readonly StatusLoading = TRANSLATE('details.mdm-detail-descriptive-data.status-loading');
+ private readonly StatusSaving = TRANSLATE('details.mdm-detail-descriptive-data.status-saving');
+ private readonly StatusNoNodes = TRANSLATE('details.mdm-detail-descriptive-data.status-no-nodes-available');
+ private readonly StatusNoDescriptiveData = TRANSLATE('details.mdm-detail-descriptive-data.status-no-descriptive-data-available');
+
+ public treeNodes: {[key: string]: TreeNode[]};
+
+ // this holds the type dependant original context data in case of cancelling the edit mode
+ private tmpTreeNodes: Node[];
+
+ public selectedNode: Node;
+ public contextType: string;
+
+ public contextComponents: Components;
+ public sensors: Sensor[];
+ public status: string;
+
+ // reference to be able to use enum in html template
+ public contextGroupEnum = ContextGroup;
+
+ public editMode: boolean;
+
+ public isTreeTableExpanded = true;
+
+ constructor(private route: ActivatedRoute,
+ private _contextService: ContextService,
+ private navigatorService: NavigatorService,
+ private notificationService: MDMNotificationService,
+ private translateService: TranslateService,
+ private datePipe: DatePipe,
+ private authenticationService: AuthenticationService,
+ private fileService: FileService) {
+ }
+
+ public canEdit: boolean;
+
+ ngOnInit() {
+ this.authenticationService.isUserInRole([Role.Admin.toString(), Role.User.toString()]).subscribe(b => this.canEdit = b);
+ this.status = this.StatusLoading;
+ this.editMode = false;
+
+ this.refreshDetailData(this.navigatorService.getSelectedNode());
+ this.route.params
+ .subscribe(
+ params => this.refreshContextData(params['context']),
+ error => this.notificationService.notifyError(
+ this.translateService.instant('details.mdm-detail-descriptive-data.err-cannot-load-scope'), error));
+
+ // node changed from the navigation tree
+ this.navigatorService.selectedNodeChanged
+ .subscribe(
+ node => this.refreshDetailData(node),
+ error => this.notificationService.notifyError(
+ this.translateService.instant('details.mdm-detail-descriptive-data.err-cannot-load-data'), error));
+
+ // file changed
+ this.fileService.onFileChanged().subscribe(link => this.handleFileChanged(link));
+ }
+
+ handleFileChanged(fileLinkContextWrapper: FileLinkContextWrapper) {
+ if (this.treeNodes != undefined) {
+ this.treeNodes[fileLinkContextWrapper.contextType]
+ .filter(tnode => tnode.label === fileLinkContextWrapper.contextComponent.name)
+ .map(tnode => tnode.children)
+ .reduce((a, b) => a.concat(b), [])
+ .filter(tnode => tnode.data.attribute.name === fileLinkContextWrapper.attribute.name)
+ .forEach(tnode => tnode.data.attribute = fileLinkContextWrapper.attribute);
+ // spread is necessary for treeTable changeDetection
+ this.treeNodes[fileLinkContextWrapper.contextType] = [...
+ this.treeNodes[fileLinkContextWrapper.contextType]];
+ }
+ }
+
+ setContext(context: string) {
+ let contextType: string;
+
+ switch (context) {
+ case 'uut':
+ contextType = 'UNITUNDERTEST';
+ break;
+ case 'te':
+ contextType = 'TESTEQUIPMENT';
+ break;
+ case 'ts':
+ contextType = 'TESTSEQUENCE';
+ break;
+ }
+ this.contextType = contextType;
+ }
+
+ /**
+ * Listener method to change the context tab
+ *
+ * @param contextType
+ */
+ refreshContextData(contextType: string) {
+ // revert before changing the context
+ this.undoEditChanges(undefined, this.editMode);
+ this.setContext(contextType);
+ this.editMode = false;
+ }
+
+ /**
+ * Listener method to change the node
+ *
+ * @param node
+ */
+ refreshDetailData(node: Node) {
+ if (node != undefined) {
+ this.selectedNode = node;
+ this.status = this.StatusLoading;
+ this.editMode = false;
+ this.contextComponents = undefined;
+ this.treeNodes = undefined;
+ if (node.type.toLowerCase() === 'measurement' || node.type.toLowerCase() === 'teststep' || node.type.toLowerCase() === 'test') {
+ this.loadContext(node);
+ } else {
+ this.status = this.StatusNoDescriptiveData;
+ }
+ } else {
+ this.status = this.StatusNoNodes;
+ }
+ }
+
+ /**
+ * Load the context data for the provided node
+ *
+ * @param node
+ */
+ private loadContext(node: Node) {
+ this._contextService.getContext(node).subscribe(
+ components => {
+ if (components['UNITUNDERTEST'] != undefined
+ || components['TESTEQUIPMENT'] != undefined
+ || components['TESTSEQUENCE'] != undefined) {
+ this.contextComponents = components;
+ this.treeNodes = this.mapComponents(components);
+ } else {
+ this.status = this.StatusNoDescriptiveData;
+ }
+ },
+ error => this.notificationService.notifyError(
+ this.translateService.instant('details.mdm-detail-descriptive-data.err-cannot-load-context'), error)
+ );
+ }
+
+ getIdentifier(contextDescribable: Node, contextComponent: Node, attribute: Attribute, contextGroup?: ContextGroup, contextType?: string) {
+ return new ContextAttributeIdentifier(contextDescribable, contextComponent, attribute, contextGroup, contextType);
+ }
+
+ getNodeClass(item: Node) {
+ return 'icon ' + item.type.toLowerCase();
+ }
+
+ /**
+ * Change the tree state to expanded or collapsed
+ *
+ * @param type
+ * @param expand
+ */
+ toggleTreeNodeState(tt: TreeTable) {
+ this.isTreeTableExpanded = !this.isTreeTableExpanded;
+ const nodeArray = this.treeNodes[this.contextType];
+ if (nodeArray != undefined) {
+ for (let node of nodeArray) {
+ this.recursiveChangeNodes(node, this.isTreeTableExpanded);
+ }
+ }
+
+ // invoke table update when pressing the plus or minus buttons from the table header
+ tt.updateSerializedValue();
+ tt.tableService.onUIUpdate(tt.value);
+ }
+
+ /**
+ * Change the tree node state recursively
+ *
+ * @param node
+ * @param expand
+ */
+ recursiveChangeNodes(node: TreeNode, expand: boolean) {
+ node.expanded = expand;
+ if (node.children != undefined && node.children.length > 0) {
+ for (let child of node.children) {
+ this.recursiveChangeNodes(child, expand);
+ }
+ }
+ }
+
+ /**
+ * Get the nodes from the current context
+ *
+ * @param nodes
+ * @param parentId optional parent id which will get the child nodes
+ */
+ getNodes(nodes: Node[], parentId: string) {
+ return nodes.filter(n => this.nodeIsInCurrentContext(n, parentId));
+ }
+
+ nodeIsInCurrentContext(node: Node, parentId: string) {
+ let parentNodeId = node.relations != null && node.relations.length > 0 ? node.relations[0].parentId : null;
+ return parentId == null && parentNodeId == null
+ || parentId != null && parentNodeId != null && parentId === parentNodeId;
+ }
+
+ /**
+ * Create a tree node based on the mdm entity
+ *
+ * @param node
+ * @param context
+ */
+ createTreeNode(node: Node, children: Node[]) {
+ return <TreeNode>{
+ label: node.name,
+ data: {
+ 'name': node.name,
+ 'attribute': node,
+ 'header': true
+ },
+ children: this.createTreeChildren(node, children),
+ icon: this.getNodeClass(node),
+ expanded: true
+ };
+ }
+
+ /**
+ * Create the tree children nodes recursive based on the mdm attributes and subsequent mdm entities
+ *
+ * @param node the current node
+ * @param contexts the complete contexts
+ */
+ createTreeChildren(node: Node, children: Node[]) {
+ let list = [];
+
+ for (let attribute of node.attributes) {
+ let tmp = <TreeNode>{
+ data: {
+ 'name': attribute.name,
+ 'attribute': this.patchAttributeForDate(attribute),
+ 'header': false
+ },
+ expanded: true
+ };
+ list.push(tmp);
+ }
+
+ if (node.relations != null && node.relations.length > 0) {
+ for (let relation of node.relations) {
+ if (relation.ids != null && relation.ids.length > 0) {
+ for (let id of relation.ids) {
+ let nodes = this.getNodes(children, id);
+ for (let n of nodes) {
+ list.push(this.createTreeNode(n, children));
+ }
+ }
+ }
+ }
+ }
+ return list;
+ }
+
+ /**
+ * Method to create a tree structure from the flat context entity and attribute map
+ *
+ * @param components
+ */
+ mapComponents(components: Components) {
+ const list: {[key: string]: TreeNode[]} = {};
+ if (components != undefined ) {
+ for (let key of Object.keys(components)) {
+ const nodes: Node[] = this.getNodes(components[key], null);
+ if (nodes != undefined) {
+ list[key] = nodes.map(node => this.createTreeNode(node, components[key]));
+ }
+ }
+ }
+ return list;
+ }
+
+ /**
+ * Convert the date for UI or backend
+ *
+ * @param attribute
+ */
+ patchAttributeForDate(attribute: Attribute) {
+ if (attribute.dataType != null && attribute.dataType.length > 0 && 'DATE' === attribute.dataType) {
+ const val = attribute.value as any[];
+ if (val != null && val.length > 0) {
+ if (val[0] != null && val[0].length > 0) {
+ val[0] = this.convertFixedDateStr(val[0], true);
+ }
+ if (val.length > 1 && val[1] != null && val[1].length > 0) {
+ val[1] = this.convertFixedDateStr(val[1], true);
+ }
+ }
+ }
+ return attribute;
+ }
+
+ /** *********************
+ * Edit functions start
+ ********************** */
+
+ convertFixedDateStr(dt: string, convertForUI: boolean) {
+ let newDt = dt;
+ let sourceFormat = '';
+
+ /**
+ * Get the translation immediately
+ */
+ sourceFormat = this.translateService.instant('details.mdm-detail-descriptive-data.transform-dateformat');
+
+ if (dt != null && dt.length > 0 && convertForUI && dt.indexOf('T') > -1) {
+ // for display purpose
+ let tmpDt = this.parseISOString(dt);
+ newDt = this.datePipe.transform(tmpDt, sourceFormat, '+0000');
+ } else if (dt != null && dt.length > 0 && !convertForUI && dt.indexOf('T') === -1) {
+ // re-convert UI date to server date for persistence
+ if (newDt.indexOf('-') === -1) {
+ // find the date patterns dd, MM and yyyy and grab the according index positions
+ let startDay = sourceFormat.indexOf('d');
+ let endDay = sourceFormat.lastIndexOf('d');
+ let startMonth = sourceFormat.indexOf('M');
+ let endMonth = sourceFormat.lastIndexOf('M');
+ let startYear = sourceFormat.indexOf('y');
+ let endYear = sourceFormat.lastIndexOf('y');
+ // manually attach the time as toISOString() will not properly transform the winter/summer time
+ newDt = dt.substring(startYear, endYear + 1) + '-' + dt.substring(startMonth, endMonth + 1)
+ + '-' + dt.substring(startDay, endDay + 1);
+ if (dt.indexOf(' ') > -1) {
+ // use the provided timestamp
+ newDt = newDt + 'T' + dt.substring(dt.indexOf(' ') + 1) + ':00Z';
+ } else {
+ newDt = newDt + 'T00:00:00Z';
+ }
+ if (newDt.length !== 20) {
+ newDt = '';
+ }
+ }
+ }
+ return newDt;
+ }
+
+ /**
+ * Fixed parsing for ISO date string
+ *
+ * @param s
+ */
+ parseISOString(s: string) {
+ let b: any[] = s.split(/\D+/);
+ return new Date(Date.UTC(b[0], --b[1], b[2], b[3], b[4], b[5], b[6]));
+ }
+
+ /**
+ * Send the changed data to the backend
+ *
+ * @param node
+ * @param type
+ */
+ private putContext(node: Node, type: string) {
+ if (type == null) {
+ return;
+ }
+ this.status = this.StatusSaving;
+ this.treeNodes = undefined;
+
+ const data = new Context();
+ data.ordered = new Components();
+ data.ordered[type] = this.getNodesWithUpdatedContent(this.contextComponents[type] as Node[], true);
+
+ data.measured = new Components();
+ data.measured[type] = this.getNodesWithUpdatedContent(this.contextComponents[type] as Node[], false);
+
+ // clear for status display
+ this.contextComponents = undefined;
+
+ this._contextService.putContext(node, data).subscribe(
+ components => {
+ if (components.hasOwnProperty('UNITUNDERTEST')
+ || components.hasOwnProperty('TESTEQUIPMENT')
+ || components.hasOwnProperty('TESTSEQUENCE')) {
+ this.contextComponents = components;
+ this.treeNodes = this.mapComponents(this.contextComponents);
+ } else {
+ this.status = this.StatusNoDescriptiveData;
+ }
+ },
+ error => this.notificationService.notifyError(
+ this.translateService.instant('details.mdm-detail-descriptive-data.err-cannot-load-context'), error)
+ );
+ }
+
+ onEdit(event: Event) {
+ event.stopPropagation();
+ this.editMode = true;
+ this.tmpTreeNodes = JSON.parse(JSON.stringify(this.contextComponents[this.contextType]));
+ }
+
+ onCancelEdit(event: Event) {
+ event.stopPropagation();
+ this.editMode = false;
+ this.isTreeTableExpanded = true;
+ this.undoEditChanges(this.contextType, true);
+ }
+
+ onSaveChanges(event: Event) {
+ event.stopPropagation();
+ this.editMode = false;
+ this.isTreeTableExpanded = true;
+ this.putContext(this.selectedNode, this.contextType);
+ this.tmpTreeNodes = undefined;
+ }
+
+ /**
+ * Method to revert table changes back to the original state
+ *
+ * @param type
+ */
+ undoEditChanges(type: string, editMode: boolean) {
+ this.refreshDetailData(this.navigatorService.getSelectedNode());
+ // if (this.contextComponents != undefined && editMode && this.tmpTreeNodes != undefined) {
+ // if (type == undefined) {
+ // type = this.contextType;
+ // }
+ // // contexts is the origin, so we revert this back as the tree attributes are just references
+ // this.contextComponents[type] = this.tmpTreeNodes;
+ // // revert back
+ // this.treeNodes = this.mapComponents(this.contextComponents);
+ // this.tmpTreeNodes = null;
+ // }
+ }
+
+ /**
+ * Get the updated nodes from the current context
+ *
+ * @param contextComponents
+ * @param type the context type
+ * @param ordered true if ordered data, false if measured data
+ */
+ getNodesWithUpdatedContent(contextComponents: Node[], ordered: boolean) {
+ let list = [];
+ for (let component of contextComponents) {
+ let parentNodeId = component.relations != null && component.relations.length > 0 ? component.relations[0].parentId : null;
+ if (parentNodeId == null) {
+ let attrs = [];
+ for (let cAttribute of component.attributes) {
+ let attr = new Attribute();
+ let addAttr = true;
+ attr.dataType = cAttribute.dataType;
+ attr.name = cAttribute.name;
+ attr.unit = cAttribute.unit;
+ attr.value = '';
+
+ if (ordered && cAttribute.value instanceof Array && cAttribute.value.length > 0) {
+ attr.value = cAttribute.value[0];
+ } else if (!ordered && cAttribute.value instanceof Array && cAttribute.value.length > 1) {
+ attr.value = cAttribute.value[1];
+ }
+ // lookup new value from treenodes
+ if (attr.dataType === 'BOOLEAN' && attr.value != null && attr.value.toString().length > 0) {
+ attr.value = attr.value.toString() === 'true' ? '1' : '0';
+ }
+
+ // BUG: don't add if non-string as this throws an parsing error in the middleware
+ if (attr.dataType !== 'STRING' && (attr.value == null || attr.value.toString().length === 0)) {
+ addAttr = false;
+ }
+
+ if (addAttr && attr.dataType === 'DATE') {
+ attr.value = this.convertFixedDateStr(attr.value as string, false);
+ }
+
+ if (addAttr) {
+ if (this.isAttributeValueModified(attr, component, ordered)) {
+ attrs.push(attr);
+ }
+ }
+ }
+ // un-merged list
+ if (attrs.length > 0) {
+ let c = JSON.parse(JSON.stringify(component));
+ c.attributes = attrs;
+ list.push(c);
+ }
+ }
+ }
+ return list;
+ }
+
+ private isAttributeValueModified(attr: Attribute, component: Node, ordered: boolean) {
+ for (let tmpNode of this.tmpTreeNodes) {
+ if (tmpNode.name === component.name) {
+ for (let attribute of tmpNode.attributes) {
+ if (attribute.name === attr.name && attribute.value instanceof Array) {
+ let orgValue = ordered ? attribute.value[0] :
+ attribute.value.length > 1 ? attribute.value[1] : undefined;
+ if (orgValue != undefined) {
+ if (attr.dataType === 'BOOLEAN') {
+ // server value = true or false, UI value = 1 or 0
+ return attr.value === '0' && orgValue === 'true'
+ || attr.value === '1' && orgValue === 'false'
+ || attr.value !== '' && orgValue === '';
+ } else {
+ // plain comparison
+ return attr.value !== orgValue;
+ }
+ }
+ return false;
+ }
+ }
+ }
+ }
+ }
+
+ /** *********************
+ * Edit functions end
+ ********************** */
+
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-view/mdm-detail-view.component.html
similarity index 78%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.html
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-view/mdm-detail-view.component.html
index 37983ed..ed12eeb 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.html
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-view/mdm-detail-view.component.html
@@ -1,5 +1,5 @@
<!--********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -11,6 +11,11 @@
* SPDX-License-Identifier: EPL-2.0
*
********************************************************************************-->
+ <div *ngIf="!selectedNode && !quantity && !unit">
+ <div class="alert alert-info" style="margin: 0;">
+ <strong>{{status | translate}}</strong>
+ </div>
+</div>
<div *ngIf="selectedNode">
<mdm-detail-panel [node]="selectedNode" [shoppable]="shoppable" [showButton]=true></mdm-detail-panel>
</div>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-view/mdm-detail-view.component.ts
similarity index 85%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.ts
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-view/mdm-detail-view.component.ts
index c0c4db4..f8a9f04 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-view.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail-view/mdm-detail-view.component.ts
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -11,21 +11,15 @@
* SPDX-License-Identifier: EPL-2.0
*
********************************************************************************/
-
-
import { Component, OnInit, OnDestroy } from '@angular/core';
-import { MDMItem } from '../core/mdm-item';
-import { Node } from '../navigator/node';
-import { BasketService } from '../basket/basket.service';
-
-import { Release, FilereleaseService } from '../filerelease/filerelease.service';
-import { NavigatorService } from '../navigator/navigator.service';
-
-import { MDMNotificationService } from '../core/mdm-notification.service';
-
import { TranslateService } from '@ngx-translate/core';
-import { NodeService } from '../navigator/node.service';
+
+import { Node } from '@navigator/node';
+import { NodeService } from '@navigator/node.service';
+import { BasketService } from '@basket/basket.service';
+import { NavigatorService } from '@navigator/navigator.service';
+import { MDMNotificationService } from '@core/mdm-notification.service';
@Component({
selector: 'mdm-detail-view',
@@ -39,6 +33,8 @@
subscription: any;
shoppable = false;
+ public status = 'file-explorer.file-explorer-nav-card.status-no-node-selected';
+
constructor(private basketService: BasketService,
private navigatorService: NavigatorService,
private notificationService: MDMNotificationService,
@@ -65,7 +61,7 @@
this.loadUnit(node);
} else {
this.quantity = undefined;
- this.unit = undefined
+ this.unit = undefined;
}
this.shoppable = this.isShoppable();
}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail/mdm-detail.component.html
similarity index 94%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.html
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail/mdm-detail.component.html
index 77fa592..51c70c9 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.html
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail/mdm-detail.component.html
@@ -1,5 +1,5 @@
<!--********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -19,7 +19,7 @@
}
</style>
-<nav class="navbar navbar-expand bg-light detail-nav ui-corner-all">
+<nav class="navbar navbar-expand bg-light detail-nav ui-corner-all" *ngIf="isVisible()">
<div class="container-fluid">
<div class="collapse navbar-collapse" id="bs-mdm-detail-navbar">
<ul class="nav navbar-nav mdm-link-list">
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail/mdm-detail.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail/mdm-detail.component.ts
new file mode 100644
index 0000000..f5cbbb3
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/mdm-detail/mdm-detail.component.ts
@@ -0,0 +1,59 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+
+import { Component } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+
+import { Node } from '@navigator/node';
+import { NavigatorService } from '@navigator/navigator.service';
+
+@Component({
+ selector: 'mdm-detail',
+ templateUrl: 'mdm-detail.component.html',
+ providers: []
+})
+export class MDMDetailComponent {
+
+ visible = false;
+
+ constructor(private route: ActivatedRoute,
+ private router: Router,
+ private navigatorService: NavigatorService) {
+
+ this.refreshVisibility(this.navigatorService.getSelectedNode());
+
+ this.navigatorService.selectedNodeChanged
+ .subscribe(node => this.refreshVisibility(node));
+ }
+
+ refreshVisibility(node: Node) {
+ this.visible = false;
+ if (node != undefined && node.type != undefined && (node.type.toLowerCase() === 'measurement'
+ || node.type.toLowerCase() === 'teststep' || node.type.toLowerCase() === 'test')) {
+ this.visible = true;
+ }
+
+ // check if we are in the general node and if the context tabs are visible
+ if (!this.visible && this.router.url !== '/navigator/details/general') {
+ // redirect to correct router path
+ this.router.navigate(['/navigator/details/general']);
+ }
+ }
+
+ isVisible() {
+ return this.visible;
+ }
+
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/sensor/sensor.component.html
similarity index 95%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.html
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/components/sensor/sensor.component.html
index 83a0678..8d1e294 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.html
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/sensor/sensor.component.html
@@ -1,5 +1,5 @@
<!--********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/sensor/sensor.component.ts
similarity index 82%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.ts
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/components/sensor/sensor.component.ts
index 0fccfb8..0ce9774 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/sensor.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/components/sensor/sensor.component.ts
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -11,23 +11,19 @@
* SPDX-License-Identifier: EPL-2.0
*
********************************************************************************/
-
-
-import {Component, OnInit, Input, OnChanges, SimpleChange} from '@angular/core';
-import { Router, ActivatedRoute, Params } from '@angular/router';
-
-import {LocalizationService} from '../localization/localization.service';
-
-import {NodeService} from '../navigator/node.service';
-import {ContextService} from './context.service';
-import {Context, Sensor} from './context';
-import {Node} from '../navigator/node';
-import {NavigatorService} from '../navigator/navigator.service';
-
-import {MDMNotificationService} from '../core/mdm-notification.service';
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
-import { TRANSLATE } from '../core/mdm-core.module';
+
+import { Node} from '@navigator/node';
+import { NavigatorService } from '@navigator/navigator.service';
+import { LocalizationService } from '@localization/localization.service';
+import { MDMNotificationService } from '@core/mdm-notification.service';
+import { TRANSLATE } from '@core/mdm-core.module';
+
+import { ContextService } from '../../services/context.service';
+import { Sensor, Context } from '../../model/details.model';
@Component({
selector: 'sensors',
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.html
deleted file mode 100644
index 5986b6d..0000000
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- ********************************************************************************-->
-
-
-<div *ngIf="!contexts">
- <div class="alert alert-info" style="margin: 0;">
- <strong>{{status | translate}}</strong>
- </div>
-</div>
-
-<div *ngIf="contexts">
-<accordion *ngIf="isUUT()">
- <accordion-group *ngFor="let template of contexts['UNITUNDERTEST']" #UUT>
- <div accordion-heading class="thinheader">{{template.name}}
- <span class="pull-right fa" [ngClass]="{'fa-chevron-down': UUT?.isOpen, 'fa-chevron-right': !UUT?.isOpen}"></span>
- </div>
- <table class="table table-hover">
- <thead>
- <tr>
- <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-name' | translate }}</th>
- <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-ordered' | translate }}</th>
- <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-measured' | translate }}</th>
- </tr>
- </thead>
- <tbody>
- <tr *ngFor="let attr of template.attributes" [ngClass]="diff(attr.value[0], attr.value[1])">
- <td>{{attr.name}}</td>
- <td>{{attr.value[0]}}</td>
- <td>{{attr.value[1]}}</td>
- </tr>
- </tbody>
- </table>
- </accordion-group>
-</accordion>
-<accordion *ngIf="isTS()">
- <accordion-group *ngFor="let template of contexts['TESTSEQUENCE']" #TS>
- <div accordion-heading class="thinheader">{{template.name}}
- <span class="pull-right fa" [ngClass]="{'fa-chevron-down': TS?.isOpen, 'fa-chevron-right': !TS?.isOpen}"></span>
- </div>
- <table class="table table-hover">
- <thead>
- <tr>
- <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-name' | translate }}</th>
- <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-ordered' | translate }}</th>
- <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-measured' | translate }}</th>
- </tr>
- </thead>
- <tbody>
- <tr *ngFor="let attr of template.attributes" [ngClass]="diff(attr.value[0], attr.value[1])">
- <td>{{attr.name}}</td>
- <td>{{attr.value[0]}}</td>
- <td>{{attr.value[1]}}</td>
- </tr>
- </tbody>
- </table>
- </accordion-group>
-</accordion>
-<accordion *ngIf="isTE()">
- <accordion-group *ngFor="let template of contexts['TESTEQUIPMENT']" #TE>
- <div accordion-heading class="thinheader">{{template.name}}
- <span class="pull-right fa" [ngClass]="{'fa-chevron-down': TE?.isOpen, 'fa-chevron-right': !TE?.isOpen}"></span>
- </div>
- <table class="table table-hover">
- <thead>
- <tr>
- <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-name' | translate }}</th>
- <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-ordered' | translate }}</th>
- <th>{{ 'details.mdm-detail-descriptive-data.tblhdr-measured' | translate }}</th>
- </tr>
- </thead>
- <tbody>
- <tr *ngFor="let attr of template.attributes" [ngClass]="diff(attr.value[0], attr.value[1])">
- <td>{{attr.name}}</td>
- <td>{{attr.value[0]}}</td>
- <td>{{attr.value[1]}}</td>
- </tr>
- </tbody>
- </table>
- </accordion-group>
-</accordion>
-</div>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.ts
deleted file mode 100644
index 7dfa500..0000000
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-descriptive-data.component.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- ********************************************************************************/
-
-
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-
-import { LocalizationService } from '../localization/localization.service';
-
-import { ContextService } from './context.service';
-import { Context, Sensor } from './context';
-import { Node } from '../navigator/node';
-import { NavigatorService } from '../navigator/navigator.service';
-
-import { MDMNotificationService } from '../core/mdm-notification.service';
-
-import { TranslateService } from '@ngx-translate/core';
-import { TRANSLATE } from '../core/mdm-core.module';
-
-@Component({
- selector: 'mdm-detail-context',
- templateUrl: 'mdm-detail-descriptive-data.component.html',
-})
-
-export class MDMDescriptiveDataComponent implements OnInit {
-
- readonly StatusLoading = TRANSLATE('details.mdm-detail-descriptive-data.status-loading');
- readonly StatusNoNodes = TRANSLATE('details.mdm-detail-descriptive-data.status-no-nodes-available');
- readonly StatusNoDescriptiveData = TRANSLATE('details.mdm-detail-descriptive-data.status-no-descriptive-data-available');
-
- selectedNode: Node;
- context: String;
-
- _diff = false;
- contexts: Context[];
- sensors: Sensor[];
- status: string;
-
- msgsStatus: string;
-
- constructor(private route: ActivatedRoute,
- private localService: LocalizationService,
- private _contextService: ContextService,
- private navigatorService: NavigatorService,
- private notificationService: MDMNotificationService,
- private translateService: TranslateService) {}
-
- ngOnInit() {
- this.status = this.StatusLoading;
-
- this.refreshDetailData(this.navigatorService.getSelectedNode());
-
- this.route.params
- .subscribe(
- params => this.setContext(params['context']),
- error => this.notificationService.notifyError(
- this.translateService.instant('details.mdm-detail-descriptive-data.err-cannot-load-scope'), error));
-
- this.navigatorService.selectedNodeChanged
- .subscribe(
- node => this.refreshDetailData(node),
- error => this.notificationService.notifyError(
- this.translateService.instant('details.mdm-detail-descriptive-data.err-cannot-load-data'), error));
- }
-
- setContext(context: string) {
- this.context = context;
- }
-
- refreshDetailData(node: Node) {
- if (node != undefined) {
- this.selectedNode = node;
- this.status = this.StatusLoading;
- if (node.type.toLowerCase() === 'measurement' || node.type.toLowerCase() === 'teststep') {
- this.loadContext(node);
- } else {
- this.status = this.StatusNoDescriptiveData;
- }
- } else {
- this.status = this.StatusNoNodes;
- }
- }
-
- private loadContext(node: Node) {
- this.contexts = undefined;
- this._contextService.getContext(node).subscribe(
- contexts => {
- if (contexts.hasOwnProperty('UNITUNDERTEST')
- || contexts.hasOwnProperty('TESTEQUIPMENT')
- || contexts.hasOwnProperty('TESTSEQUENCE')) {
- this.contexts = <Context[]> contexts;
- } else {
- this.status = this.StatusNoDescriptiveData;
- }
- },
- error => this.notificationService.notifyError(
- this.translateService.instant('details.mdm-detail-descriptive-data.err-cannot-load-context'), error)
- );
- }
-
- diffToggle() {
- this._diff = !this._diff;
- }
-
- diff(attr1: string, attr2: string) {
- if (attr1 !== attr2 && this._diff) {
- return 'danger';
- }
- }
-
- isUUT() {
- return this.context.toLowerCase() === 'uut';
- }
-
- isTE() {
- return this.context.toLowerCase() === 'te';
- }
-
- isTS() {
- return this.context.toLowerCase() === 'ts';
- }
-}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-routing.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-routing.module.ts
index 5d9cc7a..5bd4405 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-routing.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail-routing.module.ts
@@ -16,10 +16,10 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
-import { MDMDetailComponent } from './mdm-detail.component';
-import { MDMDetailViewComponent } from './mdm-detail-view.component';
-import { MDMDescriptiveDataComponent } from './mdm-detail-descriptive-data.component';
-import { SensorComponent } from './sensor.component';
+import { MDMDetailComponent } from './components/mdm-detail/mdm-detail.component';
+import { MDMDetailViewComponent } from './components/mdm-detail-view/mdm-detail-view.component';
+import { MDMDescriptiveDataComponent } from './components/mdm-detail-descriptive-data/mdm-detail-descriptive-data.component';
+import { SensorComponent } from './components/sensor/sensor.component';
const detailRoutes: Routes = [
{ path: '', component: MDMDetailComponent, children: [
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.ts
deleted file mode 100644
index 41998d0..0000000
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- ********************************************************************************/
-
-
-import {Component} from '@angular/core';
-
-import {MDMDetailViewComponent} from './mdm-detail-view.component';
-import {MDMDescriptiveDataComponent} from './mdm-detail-descriptive-data.component';
-import {SensorComponent} from './sensor.component';
-
-@Component({
- selector: 'mdm-detail',
- templateUrl: 'mdm-detail.component.html',
- providers: []
-})
-export class MDMDetailComponent {
-
-}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.module.ts
index 29662a5..1a71acc 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/mdm-detail.module.ts
@@ -11,28 +11,45 @@
* SPDX-License-Identifier: EPL-2.0
*
********************************************************************************/
-
-
import { NgModule } from '@angular/core';
+import { DatePipe } from '@angular/common';
+import { PanelModule } from 'primeng/panel';
+import { TreeTableModule } from 'primeng/treetable';
+import { InputTextModule } from 'primeng/inputtext';
+import { TooltipModule } from 'primeng/tooltip';
+import { OverlayPanelModule } from 'primeng/overlaypanel';
+import { TableModule } from 'primeng/table';
+
+import { MDMDetailComponent } from './components/mdm-detail/mdm-detail.component';
+import { MDMDetailViewComponent } from './components/mdm-detail-view/mdm-detail-view.component';
+import { MDMDescriptiveDataComponent } from './components/mdm-detail-descriptive-data/mdm-detail-descriptive-data.component';
+import { DetailViewService } from './services/detail-view.service';
+import { SensorComponent } from './components/sensor/sensor.component';
+import { ContextService } from './services/context.service';
+import { DetailPanelComponent } from './components/detail-panel/detail-panel.component';
+import { AttributeEditorComponent } from './components/attribute-editor/attribute-editor.component';
+import { AttributeViewerComponent } from './components/attribute-viewer/attribute-viewer.component';
import { MDMDetailRoutingModule } from './mdm-detail-routing.module';
import { MDMCoreModule } from '../core/mdm-core.module';
-import { PanelModule } from 'primeng/panel';
+import { FileExplorerModule } from '../file-explorer/file-explorer.module';
+import { AuthenticationModule } from '../authentication/authentication.module';
-import { MDMDetailComponent } from './mdm-detail.component';
-import { MDMDetailViewComponent } from './mdm-detail-view.component';
-import { MDMDescriptiveDataComponent } from './mdm-detail-descriptive-data.component';
-import { DetailViewService } from './detail-view.service';
-import { SensorComponent } from './sensor.component';
-import { ContextService } from './context.service';
-import { DetailPanelComponent } from './detail-panel/detail-panel.component';
+
@NgModule({
imports: [
MDMDetailRoutingModule,
MDMCoreModule,
- PanelModule
+ PanelModule,
+ TreeTableModule,
+ TooltipModule,
+ AuthenticationModule,
+ FileExplorerModule,
+ OverlayPanelModule,
+ TableModule,
+ InputTextModule
],
declarations: [
MDMDetailComponent,
@@ -40,13 +57,16 @@
MDMDescriptiveDataComponent,
SensorComponent,
DetailPanelComponent,
+ AttributeEditorComponent,
+ AttributeViewerComponent,
],
exports: [
MDMDetailComponent
],
providers: [
DetailViewService,
- ContextService
+ ContextService,
+ DatePipe
]
})
export class MDMDetailModule {
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/details.model.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/details.model.ts
new file mode 100644
index 0000000..c9f0a93
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/details.model.ts
@@ -0,0 +1,20 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+// Grouping file to enable import from central point.
+export { Components } from './types/components';
+export { Sensor } from './types/sensor';
+export { Context } from './types/context';
+export { ContextResponse } from './types/context-response';
+export { ContextAttributeIdentifier } from './types/context-attribute-identifier';
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/components.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/components.ts
new file mode 100644
index 0000000..c1df941
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/components.ts
@@ -0,0 +1,20 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Node } from '../../../navigator/node';
+export class Components {
+ UNITUNDERTEST: Node[];
+ TESTSEQUENCE: Node[];
+ TESTEQUIPMENT: Node[];
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/context-attribute-identifier.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/context-attribute-identifier.ts
new file mode 100644
index 0000000..2395c3b
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/context-attribute-identifier.ts
@@ -0,0 +1,30 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Node, Attribute, ContextGroup } from '@navigator/node';
+
+export class ContextAttributeIdentifier {
+ contextDescribable: Node;
+ contextComponent: Node;
+ attribute: Attribute;
+ contextGroup?: ContextGroup;
+ contextType?: string;
+ constructor(contextDescribable: Node, contextComponent: Node, attribute: Attribute, contextGroup?: ContextGroup, contextType?: string) {
+ this.contextDescribable = contextDescribable;
+ this.contextComponent = contextComponent;
+ this.attribute = attribute;
+ this.contextGroup = contextGroup;
+ this.contextType = contextType;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/context-response.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/context-response.ts
new file mode 100644
index 0000000..7633d74
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/context-response.ts
@@ -0,0 +1,21 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+import { Context } from './context';
+
+export class ContextResponse {
+ data: Context[];
+ constructor(data: Context[]) {
+ this.data = data;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/context.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/context.ts
new file mode 100644
index 0000000..c016ff1
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/context.ts
@@ -0,0 +1,20 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Components } from './components';
+export class Context {
+ measured: Components;
+ ordered: Components;
+}
+
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/sensor.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/sensor.ts
new file mode 100644
index 0000000..8d21d90
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/model/types/sensor.ts
@@ -0,0 +1,20 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Node } from '../../../navigator/node';
+
+export class Sensor {
+ sensor_measured: Node[];
+ sensor_ordered: Node[];
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.spec.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/services/context.service.spec.ts
similarity index 86%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.spec.ts
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/services/context.service.spec.ts
index a35df6a..07e2518 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.spec.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/services/context.service.spec.ts
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -17,9 +17,10 @@
import { BaseRequestOptions, Http, HttpModule } from '@angular/http';
import { MockBackend } from '@angular/http/testing';
-import { ContextService, ContextAttribute, MergedContextAttribute } from './context.service';
-import { PropertyService } from '../core/property.service';
-import { HttpErrorHandler } from '../core/http-error-handler';
+import { ContextService } from './context.service';
+import { PropertyService } from '../../core/property.service';
+import { HttpErrorHandler } from '../../core/http-error-handler';
+import { Attribute } from '../../navigator/node';
describe('ContextService', () => {
beforeEach(() => {
@@ -44,15 +45,15 @@
describe('mergeAttributes()', () => {
it('should merge value of one attribute', async(inject([ContextService], (contextService) => {
- let attribute1: ContextAttribute = {
+ let attribute1: Attribute = {
'name' : 'size',
'value' : '95R16',
'unit' : '',
'dataType' : 'STRING'
- }
+ };
let attributes = [ attribute1 ];
let contextIndex = 2;
- let resultAttributes: MergedContextAttribute[] = [];
+ let resultAttributes: Attribute[] = [];
expect(contextService.mergeAttributes(attributes, contextIndex, resultAttributes)).toEqual(
[{
@@ -62,25 +63,25 @@
'dataType' : 'STRING'
}]
);
- })))
+ })));
it('should merge values of multiple attributes', async(inject([ContextService], (contextService) => {
- let attribute1: ContextAttribute = {
+ let attribute1: Attribute = {
'name' : 'size',
'value' : '95R16',
'unit' : '',
'dataType' : 'STRING'
- }
- let attribute2: ContextAttribute = {
+ };
+ let attribute2: Attribute = {
'name' : 'side',
'value' : 'Left',
'unit' : '',
'dataType' : 'STRING'
- }
+ };
let attributes = [ attribute1, attribute2 ];
let contextIndex = 0;
- let resultAttributes: MergedContextAttribute[] = [];
+ let resultAttributes: Attribute[] = [];
expect(contextService.mergeAttributes(attributes, contextIndex, resultAttributes)).toEqual(
[{
@@ -95,7 +96,7 @@
'dataType' : 'STRING'
}]
);
- })))
+ })));
});
describe('mergeContextRoots()', () => {
@@ -152,7 +153,8 @@
let mergedData = contextService.mergeContextRoots([data.ordered, data.measured]);
- expect(mergedData).toEqual({
+ // Workarround since jasmine check for type. Service returns Components, mocked object is of type Obejct.
+ expect(jasmine.objectContaining(Object.assign({}, mergedData))).toEqual({
'UNITUNDERTEST': [{
'name' : 'FL_tyre',
'id' : '38',
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/services/context.service.ts
similarity index 74%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.ts
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/services/context.service.ts
index 74fcf6c..6460127 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/context.service.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/services/context.service.ts
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -18,10 +18,11 @@
import {catchError, map} from 'rxjs/operators';
-import {Sensor} from './context';
-import {PropertyService} from '../core/property.service';
-import {HttpErrorHandler} from '../core/http-error-handler';
-import {Node} from '../navigator/node';
+import { Sensor } from '../model/types/sensor';
+import { Components } from '../model/types/components';
+import {PropertyService} from '@core/property.service';
+import {HttpErrorHandler} from '@core/http-error-handler';
+import {Node, Attribute} from '@navigator/node';
@Injectable()
export class ContextService {
@@ -37,6 +38,20 @@
this._contextUrl = _prop.getUrl('mdm/environments');
}
+ putContext(node: Node, context: any) {
+ let url = this._contextUrl + '/' + node.sourceName;
+ url = url + '/' + node.type.toLowerCase() + 's/' + node.id + '/contexts';
+ let body = {
+ 'data': [ context ]
+ };
+ return this.http.put(url, body).pipe(
+ map((res) => {
+ let data = res.json().data;
+ return this.mergeContextRoots([data[0].ordered, data[0].measured]);
+ }),
+ catchError(this.httpErrorHandler.handleError));
+ }
+
getContext(node: Node) {
let url = this._contextUrl + '/' + node.sourceName;
url = url + '/' + node.type.toLowerCase() + 's/' + node.id + '/contexts';
@@ -44,7 +59,7 @@
map((res) => {
let data = res.json().data;
let context = this.mergeContextRoots([data[0].ordered, data[0].measured]);
- return <{}> context;
+ return context;
}),
catchError(this.httpErrorHandler.handleError));
}
@@ -90,7 +105,7 @@
attr.dataType = ['', attr.dataType];
attr.name = ['', attr.name];
attr.unit = ['', attr.unit];
- attr.value = ['', attr.unit];
+ attr.value = ['', attr.value];
});
return node;
}
@@ -100,14 +115,14 @@
attr.dataType = [attr.dataType, ''];
attr.name = [attr.name, ''];
attr.unit = [attr.unit, ''];
- attr.value = [attr.unit, ''];
+ attr.value = [attr.value, ''];
});
return node;
}
/** Merges several ContextRoots by merging their ContextComponents */
private mergeContextRoots(contexts) {
- let result: { [context: string]: MergedContextComponent[] } = {};
+ let result: Components = new Components();
for (let i = 0; i < contexts.length; ++i) {
for (let contextType in contexts[i]) {
@@ -120,7 +135,7 @@
}
/** Merges several ContextComponents by merging their ContextAttributes */
- private mergeComponents(contextComponents: any, contextIndex: number, resultComponents: MergedContextComponent[]) {
+ private mergeComponents(contextComponents: any, contextIndex: number, resultComponents: Node[]) {
if (!Array.isArray(contextComponents)) {
return resultComponents;
}
@@ -133,7 +148,7 @@
let resultComponent = result.find(cc => cc.name === contextComponent['name']);
if (!resultComponent) {
- resultComponent = JSON.parse(JSON.stringify(contextComponent))
+ resultComponent = JSON.parse(JSON.stringify(contextComponent));
resultComponent['attributes'] = [];
result.push(resultComponent);
}
@@ -149,10 +164,10 @@
* value property. The value property in MergedContextAttribute is an array
* with all values of the value property from all ContextAttributes.
*/
- private mergeAttributes(attributes: ContextAttribute[], contextIndex: number, resultAttributes: MergedContextAttribute[]) {
+ private mergeAttributes(attributes: Attribute[], contextIndex: number, resultAttributes: Attribute[]) {
if (!Array.isArray(attributes)) {
return resultAttributes;
- };
+ }
let result = resultAttributes || [];
@@ -162,7 +177,7 @@
let resultAttribute = result.find(a => a.name === attribute['name']);
if (!resultAttribute) {
- resultAttribute = JSON.parse(JSON.stringify(attribute))
+ resultAttribute = JSON.parse(JSON.stringify(attribute));
resultAttribute['value'] = [];
result.push(resultAttribute);
}
@@ -173,28 +188,28 @@
}
}
-/** Represents a ContextAttribute */
-export class ContextAttribute {
- name: string;
- value: string;
- unit: string;
- dataType: string;
-}
+// /** Represents a ContextAttribute */
+// export class ContextAttribute {
+// name: string;
+// value: string;
+// unit: string;
+// dataType: string;
+// }
-/** Represents multiple ContextAttributes with their value properties merged to an array */
-export class MergedContextAttribute {
- name: string;
- value: string[];
- unit: string;
- dataType: string;
-}
+// /** Represents multiple ContextAttributes with their value properties merged to an array */
+// export class MergedContextAttribute {
+// name: string;
+// value: string[];
+// unit: string;
+// dataType: string;
+// }
-/** Represents merged ContextComponents */
-export class MergedContextComponent {
- name: string;
- id: string;
- type: string;
- sourcType: string;
- sourceName: string;
- attributes: MergedContextAttribute[];
-}
+// /** Represents merged ContextComponents */
+// export class MergedContextComponent {
+// name: string;
+// id: string;
+// type: string;
+// sourcType: string;
+// sourceName: string;
+// attributes: MergedContextAttribute[];
+// }
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.spec.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/services/detail-view.service.spec.ts
similarity index 90%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.spec.ts
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/services/detail-view.service.spec.ts
index dc1974c..1f734e7 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.spec.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/services/detail-view.service.spec.ts
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -19,9 +19,9 @@
import { TranslateModule } from '@ngx-translate/core';
import {of as observableOf, Observable } from 'rxjs';
-import {PreferenceService, Preference, Scope} from '../core/preference.service';
+import {PreferenceService, Preference, Scope} from '../../core/preference.service';
import {DetailViewService} from './detail-view.service';
-import {MDMNotificationService} from '../core/mdm-notification.service';
+import {MDMNotificationService} from '../../core/mdm-notification.service';
class TestPreferenceService {
getPreference(key?: string): Observable<Preference[]> {
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/details/services/detail-view.service.ts
similarity index 89%
rename from org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.ts
rename to org.eclipse.mdm.application/src/main/webapp/src/app/details/services/detail-view.service.ts
index 3e1b69c..f20a265 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/details/detail-view.service.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/details/services/detail-view.service.ts
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -12,15 +12,14 @@
*
********************************************************************************/
-
import { Injectable} from '@angular/core';
-import { Preference, PreferenceService, Scope } from '../core/preference.service';
-import { MDMNotificationService } from '../core/mdm-notification.service';
-
-import { Node, Attribute } from '../navigator/node';
import { TranslateService } from '@ngx-translate/core';
-import { streamTranslate, TRANSLATE } from '../core/mdm-core.module';
+
+import { Preference, PreferenceService, Scope } from '@core/preference.service';
+import { MDMNotificationService } from '@core/mdm-notification.service';
+import { streamTranslate, TRANSLATE } from '@core/mdm-core.module';
+import { Node, Attribute } from '@navigator/node';
@Injectable()
export class DetailViewService {
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-display/file-attribute-display.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-display/file-attribute-display.component.html
new file mode 100644
index 0000000..77f5e4a
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-display/file-attribute-display.component.html
@@ -0,0 +1,30 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+<div>
+ <!-- <mdm5-file-pop-up-menu *ngIf="attribute?.dataType == 'FILE_LINK'"
+ [attribute]="attribute"
+ [contextComponent]="contextComponent"
+ [contextDescribable]="contextDescribable"
+ [contextGroup]="contextGroup"
+ [contextType]="contextType"
+ [readOnly]="readOnly">
+ </mdm5-file-pop-up-menu> -->
+ <button *ngIf="attribute?.dataType == 'FILE_LINK_SEQUENCE'"
+ type="button"
+ class="btn btn-mdm"
+ label="Show"
+ (click)="onShowFileExplorerDialog($event)">
+ <span class="fa fa-folder-open"></span>
+ </button>
+</div>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-display/file-attribute-display.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-display/file-attribute-display.component.ts
new file mode 100644
index 0000000..4ee50b3
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-display/file-attribute-display.component.ts
@@ -0,0 +1,87 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit, Input } from '@angular/core';
+import { MenuItem, DialogService} from 'primeng/api';
+
+import { Attribute, Node, ContextGroup } from '@navigator/node';
+import { FileExplorerDialogComponent } from 'src/app/file-explorer/components/file-explorer-dialog/file-explorer-dialog.component';
+
+@Component({
+ selector: 'mdm5-file-attribute-display',
+ templateUrl: './file-attribute-display.component.html'
+})
+export class FileAttributeDisplayComponent implements OnInit {
+
+ @Input() attribute: Attribute;
+ @Input() contextDescribable: Node;
+ @Input() contextComponent: Node;
+ @Input() contextGroup?: ContextGroup;
+ @Input() contextType?: string;
+ @Input() readOnly: boolean;
+
+ // public link: MDMLink;
+ // public links: MDMLink[];
+
+ public menuItems: MenuItem[];
+
+ constructor(private dialogService: DialogService) { }
+
+ ngOnInit() {
+ // if (this.attribute != undefined && this.attribute.value != undefined) {
+ // if (this.attribute.dataType === 'FILE_LINK') {
+ // this.link = Object.assign(new MDMLink(), this.getValue<MDMLink>());
+ // }
+ // if (this.attribute.dataType === 'FILE_LINK_SEQUENCE' && this.getValues() != undefined) {
+ // this.links = (this.getValues<MDMLink[]>()).map(l => Object.assign(new MDMLink(), l));
+ // }
+ // }
+ }
+
+ // private getValue<T>() {
+ // if (this.attribute != undefined && this.attribute.value != undefined) {
+ // return <T> (this.contextGroup != undefined ? this.attribute.value[this.contextGroup] : this.attribute.value);
+ // }
+ // }
+
+ // private getValues<T>() {
+ // if (this.attribute != undefined && this.attribute.value != undefined) {
+ // const tmp = this.contextGroup != undefined ? this.attribute.value[this.contextGroup] : this.attribute.value;
+ // return tmp !== '' ? tmp : undefined;
+ // }
+ // }
+
+ public onShowFileExplorerDialog() {
+ const ref = this.dialogService.open(FileExplorerDialogComponent, {
+ data: {
+ contextDescribable: this.contextDescribable,
+ contextComponent: this.contextComponent,
+ attribute: this.attribute,
+ contextGroup: this.contextGroup,
+ contextType: this.contextType,
+ readOnly: this.readOnly
+ },
+ header: 'File upload wizard for ' + this.contextComponent.name,
+ width: '70%'
+ });
+
+ // ref.onClose.subscribe(linkObs => this.handleUploadDialogResponse(linkObs));
+ }
+
+ // private handleUploadDialogResponse(linkObs: Observable<MDMLink>) {
+ // if (linkObs != undefined) {
+ // linkObs.subscribe(link => console.log(link));
+ // }
+ // }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-viewer/file-attribute-viewer.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-viewer/file-attribute-viewer.component.html
new file mode 100644
index 0000000..b3437a4
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-viewer/file-attribute-viewer.component.html
@@ -0,0 +1,25 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+<div [ngSwitch]="attribute?.dataType">
+ <a *ngSwitchCase="'FILE_LINK'" title="{{attribute?.value[ident.contextGroup]?.description}}" target="_blank" [href]="getUrl(attribute?.value[ident.contextGroup]?.remotePath)">
+ {{attribute?.value[ident.contextGroup] | fileName}}
+ </a>
+ <div *ngSwitchCase="'FILE_LINK_SEQUENCE'" >
+ <div *ngFor="let link of attribute.value[ident.contextGroup]; index as i">
+ <a title="{{attribute?.value[ident.contextGroup][i]?.description}}" target="_blank" [href]="getUrl(attribute?.value[ident.contextGroup][i]?.remotePath)">
+ {{attribute?.value[ident.contextGroup][i] | fileName}}
+ </a>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-viewer/file-attribute-viewer.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-viewer/file-attribute-viewer.component.ts
new file mode 100644
index 0000000..56dec78
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-attribute-viewer/file-attribute-viewer.component.ts
@@ -0,0 +1,40 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, Input } from '@angular/core';
+
+import { Attribute } from '@navigator/node';
+import { ContextAttributeIdentifier } from '@details/model/details.model';
+
+import { ContextFilesService } from '../../services/context-files.service';
+
+@Component({
+ selector: 'file-attribute-viewer',
+ templateUrl: './file-attribute-viewer.component.html'
+})
+export class FileAttributeViewerComponent {
+
+ @Input() ident: ContextAttributeIdentifier;
+ @Input() attribute: Attribute;
+
+ constructor(private contextFilesService: ContextFilesService) {
+
+ }
+
+ getUrl(remotePath: string) {
+ if (remotePath != undefined) {
+ return this.contextFilesService.getUrl(this.ident, remotePath);
+ }
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-dialog/file-explorer-dialog.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-dialog/file-explorer-dialog.component.html
new file mode 100644
index 0000000..5a4c276
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-dialog/file-explorer-dialog.component.html
@@ -0,0 +1,21 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+<mdm5-file-explorer
+ [contextDescribable]="contextDescribable"
+ [node]="contextComponent"
+ [contextType]="contextType"
+ [contextGroup]="contextGroup"
+ [attribute]="attribute"
+ [readOnly]="readOnly">
+</mdm5-file-explorer>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-dialog/file-explorer-dialog.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-dialog/file-explorer-dialog.component.ts
new file mode 100644
index 0000000..93679ed
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-dialog/file-explorer-dialog.component.ts
@@ -0,0 +1,47 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit } from '@angular/core';
+import { DynamicDialogRef, DynamicDialogConfig } from 'primeng/api';
+import { Node, Attribute, ContextGroup } from '@navigator/node';
+
+@Component({
+ selector: 'mdm5-file-explorer-dialog',
+ templateUrl: './file-explorer-dialog.component.html'
+})
+export class FileExplorerDialogComponent implements OnInit {
+
+ public contextComponent: Node;
+ public contextDescribable: Node;
+ public attribute: Attribute;
+ public contextGroup: ContextGroup;
+ public contextType: string;
+ public readOnly: boolean;
+
+ public constructor(
+ public ref: DynamicDialogRef,
+ public config: DynamicDialogConfig) {}
+
+ ngOnInit() {
+ if (this.config != undefined) {
+ this.contextComponent = this.config.data.contextComponent as Node;
+ this.contextDescribable = this.config.data.contextDescribable as Node;
+ this.attribute = this.config.data.attribute as Attribute;
+ this.contextGroup = this.config.data.contextGroup as ContextGroup;
+ this.contextType = this.config.data.contextType as string;
+ this.readOnly = this.config.data.readOnly as boolean;
+ }
+ }
+
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-nav-card/file-explorer-nav-card.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-nav-card/file-explorer-nav-card.component.html
new file mode 100644
index 0000000..bb683be
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-nav-card/file-explorer-nav-card.component.html
@@ -0,0 +1,21 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+<div *ngIf="!filesAttachable">
+ <div class="alert alert-info" style="margin: 0;">
+ <strong>{{status | translate: {type: selectedNode?.type} }}</strong>
+ </div>
+</div>
+<div *ngIf="filesAttachable">
+ <mdm5-file-explorer [node]="selectedNode" [attribute]="linkAttr" [readOnly]="false"></mdm5-file-explorer>
+</div>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-nav-card/file-explorer-nav-card.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-nav-card/file-explorer-nav-card.component.ts
new file mode 100644
index 0000000..f5838ed
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer-nav-card/file-explorer-nav-card.component.ts
@@ -0,0 +1,101 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+import { MDMNotificationService } from '@core/mdm-notification.service';
+import { MDMItem } from '@core/mdm-item';
+import { NavigatorService } from '@navigator/navigator.service';
+import { Node, Attribute } from '@navigator/node';
+import { NodeService } from '@navigator/node.service';
+
+import { FilesAttachableService } from '../../services/files-attachable.service';
+
+@Component({
+ selector: 'mdm5-file-explorer-nav-card',
+ templateUrl: './file-explorer-nav-card.component.html'
+})
+export class FileExplorerNavCardComponent implements OnInit {
+
+ private static readonly FILE_ATTACHABLE_TYPES = ['Test', 'TestStep', 'Measurement'];
+
+ // holding node selected in navigator
+ public selectedNode: Node;
+ // holding node selected in navigator
+ public filesAttachable = false;
+
+ public linkAttr: Attribute;
+
+ public status = 'file-explorer.file-explorer-nav-card.status-no-node-selected';
+
+ public constructor(
+ private route: ActivatedRoute,
+ private navigatorService: NavigatorService,
+ private nodeService: NodeService,
+ private notificationService: MDMNotificationService) {}
+
+ public ngOnInit() {
+ // init data on navigation via modules
+ this.route.url.subscribe(() => {
+ this.selectedNode = this.navigatorService.getSelectedNode();
+ // reload selected node to reflect fileLink changes from delete and create
+ this.reloadSelectedNode();
+ });
+ // init data on selected node change via navigator
+ this.navigatorService.selectedNodeChanged
+ .subscribe(
+ node => this.init(node),
+ error => this.notificationService.notifyError('Daten können nicht geladen werden.', error));
+ }
+
+ // initialize component data
+ private init(node: Node) {
+ if (node != undefined) {
+ this.selectedNode = node;
+ this.status = 'file-explorer.file-explorer-nav-card.status-node-is-no-files-attachable';
+ this.filesAttachable = this.isFileAttachable(this.selectedNode);
+ this.linkAttr = this.findLinkAttribute();
+ // if (linkAttr != undefined && linkAttr.value != undefined) {
+ // this.links = linkAttr.value as MDMLink[];
+ // }
+ }
+ }
+
+ // reloads the selected node (and consequently all file data)
+ private reloadSelectedNode() {
+ if (this.selectedNode != undefined) {
+ this.nodeService.getNodeFromItem(new MDMItem(this.selectedNode.sourceName, this.selectedNode.type, this.selectedNode.id))
+ .subscribe(node => this.init(node));
+ }
+ }
+
+ // extract MDMLink attribute from node
+ private findLinkAttribute() {
+ let linkAttr: Attribute;
+ if (this.selectedNode != undefined && this.selectedNode.attributes != undefined && this.selectedNode.attributes.length > 0) {
+ linkAttr = this.selectedNode.attributes.find(attr => attr.name === FilesAttachableService.MDM_LINKS);
+ }
+ return linkAttr;
+ }
+
+ // returns true, if node.type is configured as file-attachable.
+ private isFileAttachable(node: Node) {
+ let isAttachable = false;
+ if (node != undefined) {
+ isAttachable = FileExplorerNavCardComponent.FILE_ATTACHABLE_TYPES.find(t => t === node.type) != undefined;
+ }
+ return isAttachable;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer.css b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer.css
new file mode 100644
index 0000000..147908c
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer.css
@@ -0,0 +1,61 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+.fileupload {
+overflow: hidden;
+position: relative;
+}
+
+.fileupload input.upload {
+ float: right;
+ position: absolute;
+}
+
+input[type='file']{
+ opacity: 0;
+ cursor: pointer;
+ width: 37px;
+ height: 37.66px;
+ font-size: 0;
+ top: 0;
+ left: 0;
+}
+
+a.disabled {
+ pointer-events: none;
+ cursor: not-allowed;
+}
+
+p-table >>> .ui-table-caption {
+ padding: .25em .5em!important;
+ text-align: right!important;
+}
+
+td {
+white-space: nowrap;
+overflow: hidden;
+text-overflow: ellipsis;
+max-width: 150px;
+}
+
+.mdmContextMenu > a:hover {
+text-decoration: none!important;
+}
+
+.btn:focus {
+box-shadow: none;
+}
+
+.no-margin-bot {
+ margin-bottom: 0;
+}
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer/file-explorer.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer/file-explorer.component.html
new file mode 100644
index 0000000..e3a9233
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer/file-explorer.component.html
@@ -0,0 +1,129 @@
+<!-- ********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ******************************************************************************** -->
+<!-- main explorer table -->
+<p-table [value]="fileMetas"
+ [columns]="columnConfigs"
+
+ selectionMode="single"
+ [(selection)]="selectedFileMeta"
+ [metaKeySelection]="true"
+
+ [contextMenu]="cm"
+ contextMenuSelectionMode="joint"
+
+ [resizableColumns]="true">
+
+ <!-- caption -->
+ <ng-template pTemplate="caption">
+ <!-- selected node -->
+ <span *ngIf="node" style="float: left; margin-top: 7px;">
+ {{'file-explorer.file-explorer.ttl-attached-to' | translate }}
+ {{node?.name}}
+ </span>
+ <!-- download -->
+ <button type="button"
+ class="btn btn-mdm"
+ (click)="onDownloadFile($event)"
+ title="{{'file-explorer.file-explorer.btn-download-file' | translate }}"
+ [disabled]="!selectedFileMeta">
+ <span class="fa fa-arrow-circle-o-down"></span>
+ </button>
+ <!-- upload -->
+ <button type="button"
+ class="btn btn-mdm"
+ (click)="onShowUploadDialog($event)"
+ title="{{'file-explorer.file-explorer.btn-upload-files' | translate }}"
+ [disabled]="readOnly">
+ <span class="fa fa-arrow-circle-o-up"></span>
+ </button>
+ <!-- preview -->
+ <button type="button"
+ class="btn btn-mdm"
+ (click)="onPreviewFile($event)"
+ title="{{'file-explorer.file-explorer.btn-preview-file' | translate }}"
+ [disabled]="!selectedFileMeta">
+ <span class="fa fa-search"></span>
+ </button>
+ <!-- refresh -->
+ <button type="button"
+ class="btn btn-mdm"
+ (click)="onRefresh($event)"
+ title="{{'file-explorer.file-explorer.btn-refresh' | translate }}">
+ <span class="fa fa-refresh"></span>
+ </button>
+ <!-- delete -->
+ <button type="button"
+ class="btn btn-mdm"
+ (click)="onDeleteFile($event)"
+ title="{{'file-explorer.file-explorer.btn-delete-file' | translate }}"
+ [disabled]="!selectedFileMeta || readOnly">
+ <span class="fa fa-times"></span>
+ </button>
+ </ng-template>
+
+ <!-- header -->
+ <ng-template pTemplate="header" let-columns>
+ <tr>
+ <th *ngFor="let col of columns" [pSortableColumn]="col.field" pResizableColumn>
+ {{col.header | translate}}
+ <p-sortIcon [field]="col.field"
+ ariaLabel="Activate to sort"
+ ariaLabelDesc="Activate to sort in descending order"
+ ariaLabelAsc="Activate to sort in ascending order">
+ </p-sortIcon>
+ </th>
+ </tr>
+ </ng-template>
+
+ <!-- body -->
+ <ng-template pTemplate="body" let-rowData let-columns="columns" let-rowIndex="rowIndex">
+ <tr [pSelectableRow]="rowData" [pSelectableRowIndex]="rowIndex" [pContextMenuRow]="rowData">
+ <td *ngFor="let col of columns">
+ {{rowData[col.field]}}
+ </td>
+ </tr>
+ </ng-template>
+
+ <!-- empty message -->
+ <ng-template pTemplate="emptymessage" let-columns>
+ <tr>
+ <td [attr.colspan]="columns?.length">
+ {{'file-explorer.file-explorer.msg-no-files-attached' | translate }}
+ </td>
+ </tr>
+ </ng-template>
+</p-table>
+
+<!-- context menu for explorer table -->
+<p-contextMenu #cm [model]="ctxMenuItems" class="mdmContextMenu"></p-contextMenu>
+
+<!-- confirm dialog for delete file from data base -->
+<p-confirmDialog #cd key="fileExplorerConfirmation"
+ header="{{'file-explorer.file-explorer.ttl-confirmation' | translate }}"
+ icon="fa fa-exclamation-triangle"
+ appendTo="body">
+ <p-footer>
+ <button type="button"
+ (click)="cd.accept()"
+ class="btn btn-mdm">
+ <span class="fa fa-check"></span>
+ </button>
+ <button type="button"
+ (click)="cd.reject()"
+ class="btn btn-mdm">
+ <span class="fa fa-times"></span>
+ </button>
+ </p-footer>
+</p-confirmDialog>
+
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer/file-explorer.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer/file-explorer.component.ts
new file mode 100644
index 0000000..d372911
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-explorer/file-explorer.component.ts
@@ -0,0 +1,363 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+import { Component, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
+
+import { MenuItem, ConfirmationService, DialogService, DynamicDialogRef } from 'primeng/api';
+import { TranslateService} from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import * as FileSaver from 'file-saver';
+
+import { TRANSLATE } from '@core/mdm-core.module';
+import { Node, FileSize, Attribute, MDMLink, ContextGroup } from '@navigator/node';
+
+import { FilesAttachableService } from '../../services/files-attachable.service';
+import { ContextFilesService } from '../../services/context-files.service';
+import { FileService } from '../../services/file.service';
+import { FileExplorerColumn, FileExplorerRow, FileLinkContextWrapper } from '../../model/file-explorer.model';
+import { FileUploadDialogComponent } from '../file-upload-dialog/file-upload-dialog.component';
+import { ContextAttributeIdentifier } from '@details/model/details.model';
+
+@Component({
+ selector: 'mdm5-file-explorer',
+ templateUrl: './file-explorer.component.html',
+ styleUrls: ['../file-explorer.css'],
+ providers: [ConfirmationService]
+})
+export class FileExplorerComponent implements OnInit, OnChanges {
+
+ private readonly CONTEXT_COMPONENT = 'ContextComponent';
+
+ // holding column configuration for table
+ public columnConfigs: FileExplorerColumn[] = [];
+ // holding file metadata for table
+ public fileMetas: FileExplorerRow[] = [];
+ // holding table selection
+ public selectedFileMeta: FileExplorerRow;
+ // holding node selected in navigator
+ @Input() public node: Node;
+ @Input() public contextDescribable?: Node;
+ @Input() public attribute: Attribute;
+ @Input() public contextGroup?: ContextGroup;
+ @Input() public contextType?: string;
+ @Input() public readOnly: boolean;
+
+ public links: MDMLink[];
+
+ // items for context menu
+ public ctxMenuItems: MenuItem[];
+
+
+ public constructor(
+ private filesAttachableService: FilesAttachableService,
+ private contextFilesService: ContextFilesService,
+ private translateService: TranslateService,
+ private confirmationService: ConfirmationService,
+ private dialogService: DialogService,
+ private fileService: FileService) {}
+
+ public ngOnInit() {
+ this.initColumns();
+ // workaround for ctx menu translation, since pipe cannot be passed into primeng contextmenu.
+ this.initCtxMenu();
+ this.translateService.onLangChange.subscribe(() => this.initCtxMenu());
+ this.init();
+ }
+
+ ngOnChanges(changes: SimpleChanges) {
+ if (changes['node']) {
+ this.init();
+ }
+ }
+
+ // initialize component data
+ private init() {
+
+ if (this.node != undefined) {
+ this.fileMetas = [];
+ this.selectedFileMeta = undefined;
+ if (this.attribute != undefined) {
+ this.links = this.getValues<MDMLink[]>();
+ if (this.links != undefined && this.links.length > 0) {
+ this.loadFileSizes();
+ this.fileMetas = this.links.map(mdmLink => this.link2Row(mdmLink));
+ }
+ }
+ }
+ }
+
+ // defines column configuration.
+ private initColumns() {
+ this.columnConfigs = [];
+ this.columnConfigs.push(new FileExplorerColumn('filename', TRANSLATE('file-explorer.file-explorer.hdr-filename')));
+ this.columnConfigs.push(new FileExplorerColumn('description', TRANSLATE('file-explorer.file-explorer.hdr-description')));
+ this.columnConfigs.push(new FileExplorerColumn('type', TRANSLATE('file-explorer.file-explorer.hdr-type')));
+ this.columnConfigs.push(new FileExplorerColumn('size', TRANSLATE('file-explorer.file-explorer.hdr-size')));
+ }
+
+ // defines context menu configuration.
+ private initCtxMenu() {
+ this.ctxMenuItems = [];
+ this.translateService.get('file-explorer.file-explorer.btn-preview-file')
+ .subscribe(t => this.ctxMenuItems.push(
+ { label: t,
+ icon: 'fa fa-search',
+ command: (event) => this.onPreviewFile(event)
+ })
+ );
+ this.translateService.get('file-explorer.file-explorer.btn-download-file')
+ .subscribe(t => this.ctxMenuItems.push(
+ { label: t,
+ icon: 'fa fa-arrow-circle-o-down',
+ command: (event) => this.onDownloadFile(event)
+ })
+ );
+ this.translateService.get('file-explorer.file-explorer.btn-delete-file')
+ .subscribe(t => this.ctxMenuItems.push(
+ { label: t,
+ icon: 'fa fa-times',
+ command: (event) => this.onDeleteFile(event)
+ })
+ );
+ }
+
+ // listener to refresh selected node
+ public onRefresh() {
+ this.reloadSelectedNode();
+ }
+
+ // reloads the selected node (and consequently all file data)
+ private reloadSelectedNode() {
+ this.init();
+ }
+
+ // mapping function to create row data object from MDMLink array entry
+ private link2Row(mdmLink: MDMLink) {
+ if (mdmLink == undefined) {
+ return new FileExplorerRow(undefined, undefined, undefined, undefined, '-');
+ }
+ let nameIndex = mdmLink.remotePath.lastIndexOf('/');
+ let name = mdmLink.remotePath.substring(nameIndex + 1);
+
+ return new FileExplorerRow(mdmLink.remotePath, name, mdmLink.description, mdmLink.mimeType, mdmLink.size);
+ }
+
+ // loads file sizes
+ private loadFileSizes() {
+ // case for files attached to context attributes
+ if (this.node.type === this.CONTEXT_COMPONENT) {
+ // NOT PROPERLY IMPLEMENTED YET. Remove line below and add proper loading mechanism for all sizes at once
+ this.links.forEach(l => this.loadSizeLazy(l.remotePath));
+ } else { // case for files attached to filesAttachables
+ this.filesAttachableService.loadFileSizes(this.node).subscribe(fileSizes => this.updateFileSizes(fileSizes));
+ }
+ }
+
+ // load size information from server for single file
+ private loadSizeLazy(remotePath: string) {
+ // case for files attached to context attributes
+ if (this.contextDescribable != undefined) {
+ // NOT PROPERLY IMPLEMENTED YET. Remove lines below and add proper loading mechanism for all sizes at once
+ if (this.contextGroup != undefined) {
+ const link = this.links.find(l => l.remotePath === remotePath);
+ if (link != undefined) {
+ this.contextFilesService.loadFileSize(link, this.getIdent())
+ .subscribe(fileSize => this.updateFileSize(fileSize));
+ }
+ }
+ } else { // case for files attached to filesAttachables
+ this.filesAttachableService.loadFileSize(remotePath, this.node)
+ .subscribe(fileSize => this.updateFileSize(fileSize));
+ }
+ }
+
+ // update size in row data for table
+ private updateFileSizes(fileSizes: FileSize[]) {
+ if (this.fileMetas != undefined && fileSizes != undefined && fileSizes.length > 0) {
+ fileSizes.forEach(fileSize => this.updateFileSize(fileSize));
+ }
+ }
+
+ // update size in row data for table for single file
+ private updateFileSize(fileSize: FileSize) {
+ this.fileMetas.find(fm => fm.remotePath === fileSize.remotePath).size = fileSize.size;
+ }
+
+ public onShowUploadDialog() {
+ let ref: DynamicDialogRef;
+ // case for files attached to context attributes
+ if (this.contextDescribable != undefined) {
+ ref = this.dialogService.open(FileUploadDialogComponent, {
+ data: { contextDescribable: this.contextDescribable,
+ node: this.node,
+ contextType: this.contextType,
+ contextGroup: this.contextGroup,
+ attribute: this.attribute
+ },
+ header: 'File upload wizard for ' + this.node.name,
+ width: '70%'
+ });
+ // case for files attached to filesAttachables
+ } else {
+ ref = this.dialogService.open(FileUploadDialogComponent, {
+ data: { node: this.node,
+ attribute: this.attribute
+ },
+ header: 'File upload wizard for ' + this.node.name,
+ width: '70%'
+ });
+ }
+
+ ref.onClose.subscribe(linkObs => this.handleUploadDialogResponse(linkObs));
+ }
+
+ // reflects file upload in client side state
+ private handleUploadDialogResponse(linkObs: Observable<MDMLink>) {
+ if (linkObs != undefined) {
+ linkObs.subscribe(link => this.handleUpload(link));
+ }
+ }
+
+ // listener to load blob from db and initialize download dialog for saving file to local filesystem.
+ public onDownloadFile(event: MouseEvent) {
+ if (this.selectedFileMeta != undefined) {
+ this.loadFile().subscribe(blob => FileSaver.saveAs(blob, this.selectedFileMeta.filename));
+ }
+ }
+
+ private loadFile() {
+ if (this.contextDescribable != undefined) {
+ // case for files attached to context attributes
+ if (this.contextGroup != undefined) {
+ const link = this.findLink(this.selectedFileMeta);
+ if (link != undefined) {
+ return this.contextFilesService.loadFile(link, this.getIdent());
+ }
+ return Observable.throwError('Cannot find link!');
+ }
+ return Observable.throwError('ContextGroup is undefined!');
+ } else {
+ // case for files attached to filesAttachables
+ return this.filesAttachableService.loadFile(this.selectedFileMeta.remotePath, this.node);
+ }
+ }
+
+ // listener for file preview
+ public onPreviewFile(event: MouseEvent) {
+ if (this.selectedFileMeta != undefined) {
+ this.loadFile().subscribe(blob => this.handlePreview(blob));
+ }
+ }
+
+ // handle preview for different browsers. Opens download dialog if preview not possible.
+ private handlePreview(blob: Blob) {
+ if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+ window.navigator.msSaveOrOpenBlob(blob, this.selectedFileMeta.filename);
+ } else {
+ window.open(URL.createObjectURL(blob));
+ }
+ }
+
+ // listener for delete file button. Opens confirm dialog.
+ public onDeleteFile(event: MouseEvent) {
+ this.translateService.get('file-explorer.file-explorer.msg-confirm-delete-file-from-db')
+ .subscribe(msg =>
+ this.confirmationService.confirm({
+ message: msg,
+ key: 'fileExplorerConfirmation',
+ accept: () => this.deleteFileConfirmed()
+ })
+ );
+ }
+
+ // Actually triggers file delete from db, when confirmed in delete dialog
+ public deleteFileConfirmed() {
+ if (this.contextDescribable != undefined) {
+ const fileLink = this.findLink(this.selectedFileMeta);
+ if (fileLink != undefined) {
+ this.contextFilesService.deleteFile(fileLink, this.getIdent()).subscribe(link => this.handleDelete(link));
+ }
+ } else { // case for files attached to filesAttachables
+ this.filesAttachableService.deleteFile(this.selectedFileMeta.remotePath, this.node)
+ .subscribe(link => this.handleDelete(link));
+ }
+ this.selectedFileMeta = undefined;
+ }
+
+
+ // removes row to fileMetas to reflect server side file delete in client state.
+ private removeRow(link: MDMLink) {
+ if (link != undefined) {
+ const i = this.fileMetas.findIndex(row => link.remotePath === row.remotePath);
+ if (i >= 0) {
+ this.fileMetas.splice(i, 1);
+ }
+ }
+ }
+
+ // adds row to fileMetas to reflect file upload in client state. Lazy loads filesize.
+ private addRow(link: MDMLink) {
+ if (link != undefined) {
+ this.fileMetas.push(this.link2Row(link));
+ if (link.size == undefined) {
+ this.loadSizeLazy(link.remotePath);
+ }
+ }
+ }
+
+ private findLink(fileMeta: FileExplorerRow) {
+ if (fileMeta != undefined) {
+ return this.links.find(l => l.remotePath === fileMeta.remotePath);
+ }
+ }
+
+ private getValues<T>() {
+ if (this.attribute != undefined && this.attribute.value != undefined) {
+ const tmp = this.contextGroup != undefined ? this.attribute.value[this.contextGroup] : this.attribute.value;
+ return tmp !== '' ? tmp : [];
+ }
+ }
+
+ private handleUpload(link: MDMLink) {
+ this.addRow(link);
+ if (this.contextGroup != undefined) {
+ let value = this.attribute.value[this.contextGroup];
+ if (value == undefined || value === '') {
+ value = [];
+ }
+ value.push(link);
+ this.fireOnChange();
+ }
+ }
+
+ private handleDelete(link: MDMLink) {
+ this.removeRow(link);
+ let index = this.attribute.value[this.contextGroup].findIndex( p => p.remotePath === link.remotePath);
+ if (this.contextGroup != undefined) {
+ this.attribute.value[this.contextGroup].splice(index, 1 );
+ this.fireOnChange();
+ }
+ }
+
+ private fireOnChange() {
+ const fileLinkContextWrapper = new FileLinkContextWrapper();
+ fileLinkContextWrapper.attribute = this.attribute;
+ fileLinkContextWrapper.contextComponent = this.node;
+ fileLinkContextWrapper.contextType = this.contextType;
+ this.fileService.fireOnFileChanged(fileLinkContextWrapper);
+ }
+
+ private getIdent() {
+ return new ContextAttributeIdentifier(this.contextDescribable, this.node, this.attribute, this.contextGroup, this.contextType);
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor-dialog/file-link-editor-dialog.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor-dialog/file-link-editor-dialog.component.html
new file mode 100644
index 0000000..2253833
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor-dialog/file-link-editor-dialog.component.html
@@ -0,0 +1,137 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+<div class="p-grid p-align-center">
+ <div class="p-col-2">
+ <label for="name" class="no-margin-bot">{{'file-explorer.file-explorer.hdr-filename' | translate}}</label>
+ </div>
+ <div class="p-col-8">
+ <div *ngIf="file != undefined" id="name">
+ {{file.name}}
+ </div>
+ <div *ngIf="file == undefined">
+ {{link | fileName}}
+ </div>
+ </div>
+ <div class="p-col-2" style="text-align: right;">
+ <!-- upload -->
+ <div class="fileupload btn btn-mdm"
+ title="{{'file-explorer.file-link-editor-dialog.btn-change-file' | translate }}">
+ <input #fileinput
+ id="fileUploadInput"
+ title="{{'file-explorer.file-link-editor-dialog.btn-change-file' | translate }}"
+ class="upload"
+ name="datei"
+ type="file"
+ (change)=onSelectFileForUpload($event)>
+ <span class="fa fa-pencil"></span>
+ </div>
+ <!-- delete -->
+ <button type="button"
+ class="btn btn-mdm"
+ (click)="onDeleteFile($event)"
+ title="{{'file-explorer.file-explorer.btn-delete-file' | translate }}">
+ <span class="fa fa-times"></span>
+ </button>
+ <!-- download -->
+ <!-- <button type="button"
+ class="btn btn-mdm"
+ (click)="onDownloadFile($event)"
+ title="{{'file-explorer.file-explorer.btn-download-file' | translate }}">
+ <span class="fa fa-arrow-circle-o-down"></span>
+ </button> -->
+ <!-- preview -->
+ <!-- <button type="button"
+ class="btn btn-mdm"
+ (click)="onPreviewFile($event)"
+ title="{{'file-explorer.file-explorer.btn-preview-file' | translate }}">
+ <span class="fa fa-search"></span>
+ </button> -->
+
+ </div>
+</div>
+
+<div class="p-grid p-align-center">
+ <div class="p-col-2">
+ <label for="description" class="no-margin-bot">{{'file-explorer.file-explorer.hdr-description' | translate}}</label>
+ </div>
+ <div class="p-col">
+ <input pInputText
+ id="description"
+ [(ngModel)]="link.description"
+ style ="width: 100%">
+ </div>
+</div>
+
+<div class="p-grid p-align-center" >
+ <div class="p-col-2">
+ <label for="type" class="no-margin-bot">{{'file-explorer.file-explorer.hdr-type' | translate}}</label>
+ </div>
+ <div class="p-col">
+ <input pInputText
+ id="type"
+ type="text"
+ [(ngModel)]="link.mimeType"
+ style ="width: 100%">
+ </div>
+</div>
+
+<div class="p-grid p-align-center">
+ <div class="p-col-2">
+ <label for="size" class="no-margin-bot">{{'file-explorer.file-explorer.hdr-size' | translate}}</label>
+ </div>
+ <div class="p-col" id="size">
+ {{link.size}}
+ </div>
+</div>
+
+
+<div class="p-grid p-align-center">
+ <div class="p-col-3 p-offset-6" style="text-align: right;">
+ <button type="button"
+ class="btn btn-mdm"
+ (click)="onSave($event)"
+ title="{{'file-explorer.file-link-editor-dialog.btn-save-changes' | translate }}">
+ <span class="fa fa-check"></span>
+ {{'file-explorer.file-link-editor-dialog.btn-save-changes' | translate }}
+ </button>
+ </div>
+ <div class="p-col-3">
+ <button type="button"
+ class="btn btn-mdm"
+ (click)="onCancel($event)"
+ title="{{'file-explorer.file-link-editor-dialog.btn-cancel' | translate }}">
+ <span class="fa fa-ban"></span>
+ {{'file-explorer.file-link-editor-dialog.btn-cancel' | translate }}
+ </button>
+ </div>
+</div>
+
+<!-- confirm dialog for delete file from data base -->
+<p-confirmDialog #cd key="filePopUpConfirmation"
+ header="{{'file-explorer.file-explorer.ttl-confirmation' | translate }}"
+ icon="fa fa-exclamation-triangle"
+ appendTo="body">
+ <p-footer>
+ <button type="button"
+ (click)="cd.accept()"
+ class="btn btn-mdm">
+ <span class="fa fa-check"></span>
+ </button>
+ <button type="button"
+ (click)="cd.reject()"
+ class="btn btn-mdm">
+ <span class="fa fa-times"></span>
+ </button>
+ </p-footer>
+</p-confirmDialog>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor-dialog/file-link-editor-dialog.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor-dialog/file-link-editor-dialog.component.ts
new file mode 100644
index 0000000..63c586c
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor-dialog/file-link-editor-dialog.component.ts
@@ -0,0 +1,171 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit, ViewChild, ElementRef} from '@angular/core';
+import { ConfirmationService, DynamicDialogRef, DynamicDialogConfig } from 'primeng/api';
+import { TranslateService } from '@ngx-translate/core';
+
+import { MDMLink } from '@navigator/node';
+
+import { FileUploadRow } from '../../model/file-explorer.model';
+import { FileReaderService } from '../../services/file-reader.service';
+import { ContextFilesService } from '../../services/context-files.service';
+import { FileService } from '../../services/file.service';
+import { ContextAttributeIdentifier } from '@details/model/details.model';
+import { FileSizePipe } from '@file-explorer/pipes/file-size.pipe';
+
+@Component({
+ selector: 'mdm5-file-link-editor-dialog',
+ templateUrl: './file-link-editor-dialog.component.html',
+ styleUrls: ['../file-explorer.css'],
+ providers: [ConfirmationService]
+})
+export class FileLinkEditorDialogComponent implements OnInit {
+
+ @ViewChild('fileinput') input: ElementRef;
+
+ public ident: ContextAttributeIdentifier;
+ public link: MDMLink;
+ public file: File;
+
+ // private translationSub: Subscription;
+
+ constructor(private translateService: TranslateService,
+ private contextFilesService: ContextFilesService,
+ private confirmationService: ConfirmationService,
+ private fileReaderService: FileReaderService,
+ private fileService: FileService,
+ public ref: DynamicDialogRef,
+ public config: DynamicDialogConfig,
+ private fileSizePipe: FileSizePipe) {}
+
+ ngOnInit() {
+ if (this.config != undefined) {
+ this.ident = this.config.data.ident as ContextAttributeIdentifier;
+ }
+ this.link = this.getLink();
+ this.loadSizeLazy();
+ }
+
+ public onUpload(event: Event) {
+ this.input.nativeElement.click();
+ }
+
+ private loadSizeLazy() {
+ if (this.link != undefined && Object.keys(this.link).length !== 0) {
+ this.contextFilesService.loadFileSize(this.link, this.ident)
+ .subscribe(fileSize => this.link.size = fileSize.size);
+ }
+ }
+
+ // listener to add files to upload selection
+ public onSelectFileForUpload(event: Event) {
+ const target = event.target as HTMLInputElement;
+ const files: FileList = target.files;
+ for (let i = 0; i < files.length; i++) {
+ this.file = files[i];
+ const l = new MDMLink();
+ l.description = this.file.name;
+ l.mimeType = this.file.type || 'application/octet-stream';
+ l.size = this.fileSizePipe.transform(this.file.size);
+ this.link = l;
+ }
+ }
+
+ private getLink() {
+ if (this.ident != undefined && this.ident.attribute != undefined) {
+ const value = this.ident.attribute.value[this.ident.contextGroup];
+ // if (value != undefined && value !== '') {
+ return Object.assign(new MDMLink(), value as MDMLink);
+ // }
+ }
+ }
+
+ // // listener to load blob from db and initialize download dialog for saving file to local filesystem.
+ // public onDownloadFile(event: Event) {
+ // // const link = this.getLink();
+ // if (this.link != undefined && this.ident.contextComponent != undefined && this.ident.contextGroup != undefined) {
+ // this.contextFilesService.loadFile(this.link, this.ident).subscribe(blob => FileSaver.saveAs(blob, this.link.getFileName()));
+ // }
+ // }
+
+ // // listener for file preview
+ // public onPreviewFile(event: Event) {
+ // // const link = this.getLink();
+ // if (this.link != undefined && this.ident.contextComponent != undefined && this.ident.contextGroup != undefined) {
+ // this.contextFilesService.loadFile(this.link, this.ident)
+ // .subscribe(blob => this.preview(blob));
+ // }
+ // }
+
+ // // handle preview for different browsers. Opens download dialog if preview not possible.
+ // private preview(blob: Blob) {
+ // // const link = this.getLink();
+ // if (this.link != undefined) {
+ // if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+ // window.navigator.msSaveOrOpenBlob(blob, this.link.getFileName());
+ // } else {
+ // window.open(URL.createObjectURL(blob), this.link.getFileName());
+ // }
+ // }
+ // }
+
+ // listener for delete file button. Opens confirm dialog.
+ public onDeleteFile(event: Event) {
+ this.translateService.get('file-explorer.file-explorer.msg-confirm-delete-file-from-db')
+ .subscribe(msg =>
+ this.confirmationService.confirm({
+ message: msg,
+ key: 'filePopUpConfirmation',
+ accept: () => this.deleteFileConfirmed()
+ })
+ );
+ }
+
+ // Actually triggers file delete from db, when confirmed in delete dialog
+ private deleteFileConfirmed() {
+ const link = this.getLink();
+ if (link != undefined) {
+ this.contextFilesService.deleteFile(link, this.ident).subscribe(l => this.handleDelete(l));
+ }
+ this.ref.close();
+ }
+
+ /**
+ * Handles delete.
+ * @param link the deleted link
+ */
+ private handleDelete(link: MDMLink) {
+ this.ident.attribute.value[this.ident.contextGroup] = undefined;
+ }
+
+ private handleUplaod(link: MDMLink) {
+ this.ident.attribute.value[this.ident.contextGroup] = link;
+ }
+
+ public async onSave(event: Event) {
+ if (this.file != undefined && this.link.remotePath == undefined) {
+ const dataUrl = await this.fileReaderService.readFile(this.file);
+ const row = new FileUploadRow(this.file, this.link.description, dataUrl);
+ this.contextFilesService.uploadFile(row, this.ident).subscribe(link => this.handleUplaod(link));
+ } else {
+ this.ident.attribute.value[this.ident.contextGroup] = this.link;
+ }
+ this.ref.close();
+ }
+
+ public onCancel(event: Event) {
+ this.ref.close();
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor/file-link-editor.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor/file-link-editor.component.html
new file mode 100644
index 0000000..af308b3
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor/file-link-editor.component.html
@@ -0,0 +1,17 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+
+<a title="{{ident?.attribute?.value[ident?.contextGroup]?.description}}" href="{{ident?.attribute?.value[ident?.contextGroup]?.remotePath}}">
+ {{ident?.attribute?.value[ident?.contextGroup] | fileName}}
+</a>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor/file-link-editor.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor/file-link-editor.component.ts
new file mode 100644
index 0000000..cbad4a3
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-editor/file-link-editor.component.ts
@@ -0,0 +1,64 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit, Input } from '@angular/core';
+
+import { DialogService } from 'primeng/api';
+
+import { ContextAttributeIdentifier } from '@details/model/details.model';
+import { MDMLink } from '@navigator/node';
+import { FileLinkEditorDialogComponent } from '../file-link-editor-dialog/file-link-editor-dialog.component';
+import { FileService } from '@file-explorer/services/file.service';
+
+@Component({
+ selector: 'mdm5-file-link-editor',
+ templateUrl: './file-link-editor.component.html'
+})
+export class FileLinkEditorComponent implements OnInit {
+
+ @Input() ident: ContextAttributeIdentifier;
+
+ public link: MDMLink;
+ constructor(private dialogService: DialogService) { }
+
+ ngOnInit() {
+ if (this.ident.attribute != undefined && this.ident.attribute.value != undefined) {
+ this.link = Object.assign(new MDMLink(), this.getValue<MDMLink>());
+ }
+ setTimeout(() => {
+ this.showFileExplorerDialog();
+ });
+ }
+
+ private getValue<T>() {
+ if (this.ident.attribute != undefined && this.ident.attribute.value != undefined) {
+ return <T> (this.ident.contextGroup != undefined ? this.ident.attribute.value[this.ident.contextGroup] : this.ident.attribute.value);
+ }
+ }
+
+ public showFileExplorerDialog() {
+ let title = 'File upload wizard for ' + this.ident.contextComponent.name;
+ if (this.ident.attribute != undefined) {
+ title += '.' + this.ident.attribute.name;
+ }
+
+ const ref = this.dialogService.open(FileLinkEditorDialogComponent, {
+ data: {
+ ident: this.ident
+ },
+ header: title,
+ width: '650px'
+ });
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-sequence-editor/file-link-sequence-editor.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-sequence-editor/file-link-sequence-editor.component.html
new file mode 100644
index 0000000..58e5f07
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-sequence-editor/file-link-sequence-editor.component.html
@@ -0,0 +1,19 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+
+<div *ngFor="let link of attribute.value[ident.contextGroup]; index as i">
+ <a title="{{attribute.value[ident.contextGroup][i].description}}" href="{{attribute.value[ident.contextGroup][i].remotePath}}">
+ {{attribute.value[ident.contextGroup][i] | fileName}}
+ </a>
+</div>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-sequence-editor/file-link-sequence-editor.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-sequence-editor/file-link-sequence-editor.component.ts
new file mode 100644
index 0000000..9fad876
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-link-sequence-editor/file-link-sequence-editor.component.ts
@@ -0,0 +1,77 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, Input, OnInit } from '@angular/core';
+
+import { DialogService } from 'primeng/api';
+import { Observable } from 'rxjs';
+
+import { Attribute, MDMLink } from '@navigator/node';
+import { ContextAttributeIdentifier } from '@details/model/details.model';
+
+import { FileExplorerDialogComponent } from '../file-explorer-dialog/file-explorer-dialog.component';
+
+@Component({
+ selector: 'file-link-sequence-editor',
+ templateUrl: './file-link-sequence-editor.component.html'
+})
+export class FileLinkSequenceEditorComponent implements OnInit {
+
+ @Input() ident: ContextAttributeIdentifier;
+ @Input() attribute: Attribute;
+
+ public link: MDMLink;
+ public links: MDMLink[];
+
+ constructor(private dialogService: DialogService) { }
+
+ ngOnInit() {
+ if (this.attribute != undefined && this.attribute.value != undefined) {
+ if (this.getValues() != undefined) {
+ this.links = (this.getValues<MDMLink[]>()).map(l => Object.assign(new MDMLink(), l));
+ }
+ }
+
+ setTimeout(() => {
+ this.onShowFileExplorerDialog();
+ });
+ }
+
+ private getValues<T>() {
+ if (this.attribute != undefined && this.attribute.value != undefined) {
+ const tmp = this.ident.contextGroup != undefined ? this.attribute.value[this.ident.contextGroup] : this.attribute.value;
+ return tmp !== '' ? tmp : undefined;
+ }
+ }
+
+ public onShowFileExplorerDialog() {
+ let title = 'File upload wizard for ' + this.ident.contextComponent.name;
+ if (this.attribute != undefined) {
+ title += '.' + this.attribute.name;
+ }
+
+ const ref = this.dialogService.open(FileExplorerDialogComponent, {
+ data: {
+ contextDescribable: this.ident.contextDescribable,
+ contextComponent: this.ident.contextComponent,
+ attribute: this.attribute,
+ contextGroup: this.ident.contextGroup,
+ contextType: this.ident.contextType,
+ readOnly: false
+ },
+ header: title,
+ width: '70%'
+ });
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-upload-dialog/file-upload-dialog.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-upload-dialog/file-upload-dialog.component.html
new file mode 100644
index 0000000..4a5d6ef
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-upload-dialog/file-upload-dialog.component.html
@@ -0,0 +1,98 @@
+<!--********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************-->
+<p-table [value]="selectedFileMetasUpload">
+ <!-- caption -->
+ <ng-template pTemplate="caption">
+ <!-- add -->
+ <div class="fileupload btn btn-mdm"
+ title="{{'file-explorer.file-explorer.btn-add-files' | translate }}">
+ <span class="fa fa-plus"></span>
+ <input #fileinput
+ id="fileUploadInput"
+ title="{{'file-explorer.file-explorer.btn-add-files' | translate }}"
+ class="upload"
+ name="datei"
+ type="file"
+ (change)=onSelectFileForUpload($event)
+ multiple>
+ </div>
+ <!-- upload -->
+ <button type="button"
+ class="btn btn-mdm"
+ (click)="onUploadSelectedFiles($event)"
+ title="{{'file-explorer.file-explorer.btn-upload-file-selection' | translate }}"
+ [disabled]="selectedFileMetasUpload?.length == 0">
+ <span class="fa fa-check"></span>
+ </button>
+ <!-- remove all -->
+ <button type="button"
+ class="btn btn-mdm"
+ (click)="onClearSelectedFileMetasUpload($event)"
+ title="{{'file-explorer.file-explorer.btn-remove-all-files-from-selection' | translate }}"
+ [disabled]="selectedFileMetasUpload?.length == 0">
+ <span class="fa fa-eraser"></span>
+ </button>
+ </ng-template>
+
+ <!-- header -->
+ <ng-template pTemplate="header">
+ <tr>
+ <th style="width: 50px;"></th>
+ <th>{{'file-explorer.file-explorer.hdr-filename' | translate}}</th>
+ <th>{{'file-explorer.file-explorer.hdr-description' | translate}}</th>
+ <!-- <th>{{'file-explorer.file-explorer.hdr-type' | translate}}</th> -->
+ <th>{{'file-explorer.file-explorer.hdr-size' | translate}}</th>
+ <th style="width: 68px;"></th>
+ </tr>
+ </ng-template>
+
+ <!-- body -->
+ <ng-template pTemplate="body" let-filedata>
+ <tr>
+ <td>
+ <thumbnail [imgUrl]="filedata.dataUrl" [type]="filedata.file.type"></thumbnail>
+ </td>
+ <td>{{filedata.file.name}}</td>
+ <td pEditableColumn>
+ <p-cellEditor>
+ <ng-template pTemplate="input">
+ <input pInputText type="text" [(ngModel)]="filedata.description">
+ </ng-template>
+ <ng-template pTemplate="output">
+ {{filedata.description}}
+ </ng-template>
+ </p-cellEditor>
+ </td>
+ <!-- <td pEditableColumn>
+ <p-cellEditor>
+ <ng-template pTemplate="input">
+ <input pInputText type="text" [(ngModel)]="filedata.file.type">
+ </ng-template>
+ <ng-template pTemplate="output">
+ {{filedata.file.type}}
+ </ng-template>
+ </p-cellEditor>
+ </td> -->
+ <td>{{filedata.file.size | fileSize: formatSize.BINARY}}</td>
+ <td>
+ <button type="button"
+ class="btn btn-mdm"
+ (click)="onRemoveFile($event, filedata)"
+ title="{{'file-explorer.file-explorer.btn-remove-file-from-selection' | translate }}">
+ <span class="fa fa-times"></span>
+ </button>
+ </td>
+ </tr>
+ </ng-template>
+</p-table>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-upload-dialog/file-upload-dialog.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-upload-dialog/file-upload-dialog.component.ts
new file mode 100644
index 0000000..c491cfe
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/file-upload-dialog/file-upload-dialog.component.ts
@@ -0,0 +1,125 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Component, OnInit, ViewChild, ElementRef, AfterViewInit } from '@angular/core';
+
+import { DynamicDialogRef, DynamicDialogConfig } from 'primeng/primeng';
+
+import { Node, Attribute, ContextGroup } from '@navigator/node';
+import { MDMNotificationService } from '@core/mdm-notification.service';
+
+import { FileUploadRow, FormatSize } from '../../model/file-explorer.model';
+import { FilesAttachableService } from '../../services/files-attachable.service';
+import { ContextFilesService } from './../../services/context-files.service';
+import { FileReaderService } from '../../services/file-reader.service';
+import { ContextAttributeIdentifier } from '@details/model/details.model';
+
+@Component({
+ selector: 'mdm5-file-upload-dialog',
+ templateUrl: './file-upload-dialog.component.html',
+ styleUrls: ['../file-explorer.css']
+})
+export class FileUploadDialogComponent implements OnInit, AfterViewInit {
+
+ @ViewChild('fileinput') input: ElementRef;
+
+ // make enum accessible from html template
+ public formatSize = FormatSize;
+
+ // holding table selection for context menu
+ public selectedFileMetasUpload: FileUploadRow[] = [];
+ // holding selected node and context info incase files is uploaded to context attribute
+ public node: Node;
+ public contextDescribable?: Node;
+ public attribute: Attribute;
+ public contextGroup?: ContextGroup;
+ public contextType?: string;
+
+ constructor(public ref: DynamicDialogRef,
+ public config: DynamicDialogConfig,
+ private filesAttachableService: FilesAttachableService,
+ private contextFilesService: ContextFilesService,
+ private fileReaderService: FileReaderService,
+ private notificationService: MDMNotificationService) { }
+
+ ngOnInit() {
+ this.node = this.config.data.node;
+ this.contextDescribable = this.config.data.contextDescribable;
+ this.attribute = this.config.data.attribute;
+ this.contextGroup = this.config.data.contextGroup;
+ this.contextType = this.config.data.contextType;
+ }
+
+ // opens file select menu for upload on initialization
+ ngAfterViewInit(): void {
+ if ( this.input != undefined) {
+ setTimeout(() => this.input.nativeElement.click());
+ }
+ }
+
+ // helping function to clear file selection for upload overlay panel
+ private resetFileUploadSelection() {
+ this.selectedFileMetasUpload = [];
+ }
+
+ // listener to removeFiles from selection for upload
+ public onRemoveFile(event: MouseEvent, row: FileUploadRow) {
+ let index = this.selectedFileMetasUpload.findIndex(fm => fm === row);
+ if (index > -1) {
+ this.selectedFileMetasUpload.splice(index, 1);
+ }
+ }
+
+ // listener to clear file selection for upload
+ public onClearSelectedFileMetasUpload(event: MouseEvent) {
+ this.resetFileUploadSelection();
+ }
+
+ // listener to add files to upload selection
+ public async onSelectFileForUpload(event: MouseEvent) {
+ const target = event.target as HTMLInputElement;
+ const files: FileList = target.files;
+ for (let i = 0; i < files.length; i++) {
+ const dataUrl = await this.fileReaderService.readFile(files[i]);
+ if (this.selectedFileMetasUpload.findIndex(fm => fm.file.name === files[i].name) === -1) {
+ this.selectedFileMetasUpload.push(new FileUploadRow(files[i], '', dataUrl));
+ } else {
+ this.notificationService.notifyWarn('File could not be added.',
+ 'The selection already contains a file with the name \'' + files[i].name + '\'.');
+ }
+ }
+ }
+
+ // listener to upload selected files
+ // uploads selected files, closes dialog, and returns Observable for server response
+ public onUploadSelectedFiles(event: MouseEvent) {
+ this.ref.close(this.uploadFiles(this.selectedFileMetasUpload));
+ }
+
+ // upload selected files
+ public uploadFiles(fileUploadRows: FileUploadRow[]) {
+ if (fileUploadRows != undefined && this.node != undefined) {
+ if (this.contextDescribable != undefined && this.contextType != undefined && this.contextGroup != undefined
+ && this.attribute != undefined) {
+ return this.contextFilesService.uploadFiles(fileUploadRows, this.getIdent());
+ } else {
+ return this.filesAttachableService.uploadFiles(this.node, fileUploadRows);
+ }
+ }
+ }
+
+ private getIdent() {
+ return new ContextAttributeIdentifier(this.contextDescribable, this.node, this.attribute, this.contextGroup, this.contextType);
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/thumbnail/thumbnail.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/thumbnail/thumbnail.component.html
new file mode 100644
index 0000000..b743089
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/thumbnail/thumbnail.component.html
@@ -0,0 +1,61 @@
+<!-- ********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ******************************************************************************** -->
+<div [ngSwitch]="superType">
+ <!-- audio -->
+ <div *ngSwitchCase="'audio'">
+ <div [ngSwitch]="subType">
+ <span *ngSwitchDefault [ngClass]="'fa fa-file-audio-o fa-' + size + 'x'"></span>
+ </div>
+ </div>
+ <!-- application -->
+ <div *ngSwitchCase="'application'">
+ <div [ngSwitch]="subType">
+ <span *ngSwitchCase="'vnd.openxmlformats-officedocument.wordprocessingml.document'" [ngClass]="'fa fa-file-word-o fa-' + size + 'x'"></span>
+ <span *ngSwitchCase="'vnd.openxmlformats-officedocument.presentationml.presentation'" [ngClass]="'fa fa-file-powerpoint-o fa-' + size + 'x'"></span>
+ <span *ngSwitchCase="'vnd.openxmlformats-officedocument.spreadsheetml.sheet'" [ngClass]="'fa fa-file-excel-o fa-' + size + 'x'"></span>
+ <span *ngSwitchCase="'pdf'" [ngClass]="'fa fa-file-pdf-o fa-' + size + 'x'"></span>
+ <span *ngSwitchCase="'x-zip-compressed'" [ngClass]="'fa fa-file-archive-o fa-' + size + 'x'"></span>
+ <span *ngSwitchDefault [ngClass]="'fa fa-file-o fa-' + size + 'x'"></span>
+ </div>
+ </div>
+ <!-- image -->
+ <div *ngSwitchCase="'image'">
+ <div *ngIf="!imgUrl">
+ <span *ngSwitchDefault [ngClass]="'fa fa-file-image-o fa-' + size + 'x'"></span>
+ </div>
+ <div *ngIf="imgUrl" [ngSwitch]="subType">
+ <img *ngSwitchCase="'png'" [src]="imgUrl" style="max-height: 28px; max-width: 24px;">
+ <img *ngSwitchCase="'jpg'" [src]="imgUrl" style="max-height: 28px; max-width: 24px;">
+ <img *ngSwitchCase="'jpeg'" [src]="imgUrl" style="max-height: 28px; max-width: 24px;">
+ <img *ngSwitchCase="'bmp'" [src]="imgUrl" style="max-height: 28px; max-width: 24px;">
+ <span *ngSwitchDefault [ngClass]="'fa fa-file-image-o fa-' + size + 'x'"></span>
+ </div>
+ </div>
+ <!-- text -->
+ <div *ngSwitchCase="'text'">
+ <div [ngSwitch]="subType">
+ <span *ngSwitchDefault [ngClass]="'fa fa-file-text-o fa-' + size + 'x'"></span>
+ </div>
+ </div>
+ <!-- video -->
+ <div *ngSwitchCase="'video'">
+ <div [ngSwitch]="subType">
+ <span *ngSwitchDefault [ngClass]="'fa fa-file-video-o fa-' + size + 'x'"></span>
+ </div>
+ </div>
+ <!-- default -->
+ <div *ngSwitchDefault>
+ <span [ngClass]="'fa fa-file-o fa-' + size + 'x'"></span>
+ </div>
+</div>
\ No newline at end of file
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/thumbnail/thumbnail.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/thumbnail/thumbnail.component.ts
new file mode 100644
index 0000000..2a99815
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/components/thumbnail/thumbnail.component.ts
@@ -0,0 +1,38 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+import { Component, OnInit, Input } from '@angular/core';
+
+@Component({
+ selector: 'thumbnail',
+ templateUrl: 'thumbnail.component.html'
+})
+export class ThumbnailComponent implements OnInit {
+
+ @Input() imgUrl?: any;
+ @Input() type: string;
+ @Input() size = '2';
+
+ public superType: string;
+ public subType: string;
+
+ public ngOnInit() {
+ if (this.type != undefined) {
+ let parts = this.type.split('/');
+ this.superType = parts[0];
+ this.subType = parts[1];
+ }
+ }
+
+ // TODO: support more documents type. render thumbnail for movie files. render thumbnail for more image files.
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/file-explorer.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/file-explorer.module.ts
new file mode 100644
index 0000000..70911dc
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/file-explorer.module.ts
@@ -0,0 +1,94 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+ // Angular Imports
+import { NgModule } from '@angular/core';
+
+// 3rd party modules
+import { TableModule } from 'primeng/table';
+import { FileUploadModule } from 'primeng/fileupload';
+import { ConfirmDialogModule } from 'primeng/confirmdialog';
+import { ConfirmationService, DialogService } from 'primeng/api';
+import { InputTextModule } from 'primeng/inputtext';
+import { DynamicDialogModule } from 'primeng/dynamicdialog';
+import { MenuModule } from 'primeng/menu';
+import { ContextMenuModule } from 'primeng/contextmenu';
+import {SplitButtonModule} from 'primeng/splitbutton';
+
+// MDM modules
+import { MDMCoreModule } from '../core/mdm-core.module';
+
+// This Module's Components
+import { FileSizePipe } from './pipes/file-size.pipe';
+import { ThumbnailComponent } from './components/thumbnail/thumbnail.component';
+import { FileUploadDialogComponent } from './components/file-upload-dialog/file-upload-dialog.component';
+import { FileLinkEditorDialogComponent } from './components/file-link-editor-dialog/file-link-editor-dialog.component';
+import { FileNamePipe } from './pipes/file-name.pipe';
+import { FileExplorerComponent } from './components/file-explorer/file-explorer.component';
+import { FileExplorerDialogComponent } from './components/file-explorer-dialog/file-explorer-dialog.component';
+import { FileAttributeDisplayComponent } from './components/file-attribute-display/file-attribute-display.component';
+import { FileExplorerNavCardComponent } from './components/file-explorer-nav-card/file-explorer-nav-card.component';
+import { FileAttributeViewerComponent } from './components/file-attribute-viewer/file-attribute-viewer.component';
+import { FileLinkSequenceEditorComponent } from './components/file-link-sequence-editor/file-link-sequence-editor.component';
+import { FileLinkEditorComponent } from './components/file-link-editor/file-link-editor.component';
+
+
+@NgModule({
+ imports: [
+ MDMCoreModule,
+ TableModule,
+ DynamicDialogModule,
+ FileUploadModule,
+ ConfirmDialogModule,
+ ContextMenuModule,
+ InputTextModule,
+ MenuModule,
+ SplitButtonModule
+ ],
+ declarations: [
+ ThumbnailComponent,
+ FileSizePipe,
+ FileUploadDialogComponent,
+ FileLinkEditorDialogComponent,
+ FileNamePipe,
+ FileExplorerComponent,
+ FileExplorerDialogComponent,
+ FileAttributeDisplayComponent,
+ FileAttributeViewerComponent,
+ FileLinkSequenceEditorComponent,
+ FileExplorerNavCardComponent,
+ FileLinkEditorComponent
+ ],
+ exports: [
+ FileExplorerDialogComponent,
+ FileExplorerNavCardComponent,
+ FileAttributeViewerComponent,
+ FileLinkSequenceEditorComponent,
+ FileLinkEditorComponent,
+ FileAttributeDisplayComponent,
+ FileLinkEditorDialogComponent
+ ],
+ providers: [
+ FileNamePipe,
+ FileSizePipe,
+ DialogService
+ ],
+ entryComponents: [
+ FileUploadDialogComponent,
+ FileExplorerDialogComponent,
+ FileLinkEditorDialogComponent
+ ]
+})
+export class FileExplorerModule {
+
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/file-explorer.model.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/file-explorer.model.ts
new file mode 100644
index 0000000..3da9bdf
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/file-explorer.model.ts
@@ -0,0 +1,21 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+// Grouping file to enable import from central point.
+export { FileExplorerColumn } from './types/file-explorer-column.model';
+export { FileExplorerRow } from './types/file-explorer-row.model';
+export { FileUploadRow } from './types/file-upload-row.model';
+export { FormatSize } from './types/format-size.model';
+export { MDMBlob } from './types/mdm-blob.model';
+export { FileLinkContextWrapper } from './types/filelink-context-wrapper.model';
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/file-explorer-column.model.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/file-explorer-column.model.ts
new file mode 100644
index 0000000..fa18213
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/file-explorer-column.model.ts
@@ -0,0 +1,23 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+export class FileExplorerColumn {
+ field: string;
+ header: string;
+
+ constructor (field: string, header: string) {
+ this.field = field;
+ this.header = header;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/file-explorer-row.model.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/file-explorer-row.model.ts
new file mode 100644
index 0000000..e31def7
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/file-explorer-row.model.ts
@@ -0,0 +1,31 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+export class FileExplorerRow {
+ filename: string;
+ description: string;
+ type: string;
+ size: string;
+ // remotePath is unique for one file-attachable MDM object
+ // and is used as identifier: fileExplorerRow <-> MDMLink
+ remotePath: string;
+
+ constructor (remotePath: string, filename: string, description: string, type: string, size: string) {
+ this.remotePath = remotePath;
+ this.filename = filename;
+ this.description = description;
+ this.type = type;
+ this.size = size;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/file-upload-row.model.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/file-upload-row.model.ts
new file mode 100644
index 0000000..be7afec
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/file-upload-row.model.ts
@@ -0,0 +1,25 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+export class FileUploadRow {
+ file: File;
+ description: string;
+ dataUrl: any;
+
+ constructor (file: File, description: string, dataUrl: any) {
+ this.file = file;
+ this.description = description;
+ this.dataUrl = dataUrl;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/filelink-context-wrapper.model.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/filelink-context-wrapper.model.ts
new file mode 100644
index 0000000..82dd640
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/filelink-context-wrapper.model.ts
@@ -0,0 +1,22 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { MDMLink, Attribute, Node } from 'src/app/navigator/node';
+
+export class FileLinkContextWrapper {
+ fileLink: MDMLink;
+ contextType: string;
+ contextComponent: Node;
+ attribute: Attribute;
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/format-size.model.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/format-size.model.ts
new file mode 100644
index 0000000..b4df183
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/format-size.model.ts
@@ -0,0 +1,18 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+export enum FormatSize {
+ DECIMAL = 1000,
+ BINARY = 1024
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/mdm-blob.model.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/mdm-blob.model.ts
new file mode 100644
index 0000000..da6b8b7
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/model/types/mdm-blob.model.ts
@@ -0,0 +1,17 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+export class MDMBlob {
+ mimeType: string;
+ blob: Blob;
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/pipes/file-name.pipe.spec.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/pipes/file-name.pipe.spec.ts
new file mode 100644
index 0000000..c40680e
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/pipes/file-name.pipe.spec.ts
@@ -0,0 +1,22 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { FileNamePipe } from './file-name.pipe';
+
+describe('FileNamePipe', () => {
+ it('create an instance', () => {
+ const pipe = new FileNamePipe();
+ expect(pipe).toBeTruthy();
+ });
+});
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/pipes/file-name.pipe.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/pipes/file-name.pipe.ts
new file mode 100644
index 0000000..cbec201
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/pipes/file-name.pipe.ts
@@ -0,0 +1,27 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Pipe, PipeTransform } from '@angular/core';
+import { MDMLink } from '@navigator/node';
+
+@Pipe({
+ name: 'fileName'
+})
+export class FileNamePipe implements PipeTransform {
+
+ transform(link: MDMLink): any {
+ return link != undefined ? Object.assign(new MDMLink(), link).getFileName() : '';
+ }
+
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/pipes/file-size.pipe.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/pipes/file-size.pipe.ts
new file mode 100644
index 0000000..263d0f8
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/pipes/file-size.pipe.ts
@@ -0,0 +1,55 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Pipe, PipeTransform } from '@angular/core';
+// this projects imports
+import { FormatSize } from '../model/file-explorer.model';
+
+@Pipe({name: 'fileSize'})
+export class FileSizePipe implements PipeTransform {
+
+ constructor() {}
+
+ public transform(bytes: number | string, format?: FormatSize) {
+ let result = '-';
+ if (typeof(bytes) === 'string') {
+ result = bytes;
+ } else {
+ if (bytes == undefined) {
+ result = '-';
+ }
+ if (format == undefined) {
+ format = FormatSize.BINARY;
+ }
+ if (Math.abs(bytes) < format) {
+ result = bytes + ' B';
+ }
+ let units: string[];
+ switch (format) {
+ case FormatSize.DECIMAL:
+ units = ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+ break;
+ case FormatSize.BINARY:
+ units = ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+ }
+ let u = -1;
+ do {
+ bytes /= format;
+ ++u;
+ } while (Math.abs(bytes) >= format && u < units.length - 1);
+ result = bytes.toFixed(1) + ' ' + units[u];
+ }
+ return result;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/context-files.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/context-files.service.ts
new file mode 100644
index 0000000..9ab6c93
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/context-files.service.ts
@@ -0,0 +1,147 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Injectable } from '@angular/core';
+import { Http, Headers, RequestMethod, ResponseContentType } from '@angular/http';
+
+import { map, tap, concatMap } from 'rxjs/operators';
+import { from } from 'rxjs';
+import { plainToClass } from 'class-transformer';
+
+import { HttpErrorHandler } from '@core/http-error-handler';
+import { MDMNotificationService } from '@core/mdm-notification.service';
+import { PropertyService } from '@core/property.service';
+import { MDMLink, FileSize, Node, Attribute, ContextGroup } from '@navigator/node';
+import { FileUploadRow } from '../model/file-explorer.model';
+import { ContextAttributeIdentifier } from '@details/model/details.model';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class ContextFilesService {
+
+ private contextUrl: string;
+
+ constructor (private http: Http,
+ private httpErrorHandler: HttpErrorHandler,
+ private notificationService: MDMNotificationService,
+ private _prop: PropertyService) {
+ this.contextUrl = _prop.getUrl('mdm/environments');
+ }
+
+ public getUrl(ident: ContextAttributeIdentifier, remotePath: string) {
+ return this.getFileEndpoint(ident) + '/' + this.escapeUrlCharacters(remotePath);
+ }
+
+ private getFileEndpoint(ident: ContextAttributeIdentifier) {
+ return this.contextUrl
+ + '/' + ident.contextComponent.sourceName
+ + '/' + this.contextGroupToUrl(ident.contextGroup)
+ + '/' + ident.contextDescribable.id
+ + '/contexts'
+ + '/' + ident.contextType
+ + '/' + this.escapeUrlCharacters(ident.contextComponent.name)
+ + '/' + this.escapeUrlCharacters(ident.attribute.name)
+ + '/files';
+ }
+
+ // loads file size from server for file with given remote path
+ public loadFileSize(link: MDMLink, ident: ContextAttributeIdentifier) {
+
+ const endpoint = this.getFileEndpoint(ident)
+ + '/size/' + this.escapeUrlCharacters(link.remotePath);
+
+ return this.http.get(endpoint)
+ .pipe(
+ map(res => plainToClass(FileSize, res.json() as FileSize))
+ )
+ .catch(this.httpErrorHandler.handleError);
+ }
+
+ // loads file in context from server, returns file as blob.
+ public loadFile(link: MDMLink, ident: ContextAttributeIdentifier) {
+
+ const headers = new Headers({});
+ const endpoint = this.getFileEndpoint(ident)
+ + '/' + this.escapeUrlCharacters(link.remotePath);
+
+ return this.http.get(endpoint, { method: RequestMethod.Get,
+ responseType: ResponseContentType.Blob,
+ headers: headers })
+ .pipe(
+ map(res => res.blob())
+ )
+ .catch(this.httpErrorHandler.handleError);
+ }
+
+ // Uploads multiple files. Http requests are chained to avoid concurrency in server side update process.
+ public uploadFiles(files: FileUploadRow[], ident: ContextAttributeIdentifier) {
+ return from(files).pipe(
+ concatMap(file => this.uploadFile(file, ident))
+ );
+ }
+
+ // upload file
+ public uploadFile(fileData: FileUploadRow, ident: ContextAttributeIdentifier) {
+
+ const fd = new FormData();
+ fd.append('file', fileData.file, fileData.file.name);
+ fd.append('mimeType', fileData.file.type);
+ fd.append('description', fileData.description);
+
+ const endpoint = this.getFileEndpoint(ident);
+
+ return this.http.post(endpoint , fd)
+ .pipe(
+ map(res => plainToClass(MDMLink, res.json() as MDMLink)),
+ tap(link => this.notificationService.notifySuccess(
+ 'File created.',
+ 'The file ' + link.remotePath.substring(link.remotePath.lastIndexOf('/') + 1)
+ + ' has been successfully created.'
+ ))
+ )
+ .catch(this.httpErrorHandler.handleError);
+ }
+
+ // delete file from server
+ public deleteFile(link: MDMLink, ident: ContextAttributeIdentifier) {
+ const endpoint = this.getFileEndpoint(ident)
+ + '/' + this.escapeUrlCharacters(link.remotePath);
+
+ return this.http.delete(endpoint)
+ .pipe(
+ map(res => plainToClass(MDMLink, res.json() as MDMLink)),
+ tap(flink => this.notificationService.notifySuccess(
+ 'File deleted.',
+ 'The file ' + flink.remotePath.substring(flink.remotePath.lastIndexOf('/') + 1)
+ + ' has been successfully deleted from file system.'
+ ))
+ )
+ .catch(this.httpErrorHandler.handleError);
+ }
+
+ private contextGroupToUrl(type: number) {
+ switch (type) {
+ case 0:
+ return 'teststeps';
+ case 1:
+ return 'measurements';
+ }
+ }
+
+ // replaces / by %2F to not break url
+ private escapeUrlCharacters(urlString: string) {
+ return urlString.replace(/\//g, '%2F').replace(/\./g, '%2E').replace(/ /g, '%20');
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/file-reader.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/file-reader.service.ts
new file mode 100644
index 0000000..d04b08d
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/file-reader.service.ts
@@ -0,0 +1,35 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+import { Injectable } from '@angular/core';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class FileReaderService {
+
+ constructor() { }
+
+ // reads file from filesystem.
+ public readFile(inputFile: File) {
+ const reader = new FileReader();
+ return new Promise((resolve, reject) => {
+ reader.onerror = () => {
+ reader.abort();
+ reject(new DOMException('Problem parsing input file.'));
+ };
+ reader.onloadend = () => resolve(reader.result);
+ reader.readAsDataURL(inputFile);
+ });
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/file.service.spec.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/file.service.spec.ts
new file mode 100644
index 0000000..84fcefc
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/file.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { FileService } from './file.service';
+
+describe('FileService', () => {
+ beforeEach(() => TestBed.configureTestingModule({}));
+
+ it('should be created', () => {
+ const service: FileService = TestBed.get(FileService);
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/file.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/file.service.ts
new file mode 100644
index 0000000..95b983e
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/file.service.ts
@@ -0,0 +1,37 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Injectable } from '@angular/core';
+import { Subject } from 'rxjs';
+import { FileLinkContextWrapper } from '../model/file-explorer.model';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class FileService {
+
+ private fileChangedSubject = new Subject<FileLinkContextWrapper>();
+
+ constructor() { }
+
+ // Emitter for attributes to save for default saving mechanism
+ public fireOnFileChanged(fileLinkContextWrapper: FileLinkContextWrapper) {
+ this.fileChangedSubject.next(fileLinkContextWrapper);
+ }
+
+ // Returns Observable for listners to subscribe to attributes to save for default saving mechanism
+ public onFileChanged() {
+ return this.fileChangedSubject.asObservable();
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/files-attachable.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/files-attachable.service.ts
new file mode 100644
index 0000000..2559380
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/file-explorer/services/files-attachable.service.ts
@@ -0,0 +1,150 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Injectable} from '@angular/core';
+import { Http, Headers, RequestMethod, ResponseContentType} from '@angular/http';
+
+import { plainToClass } from 'class-transformer';
+import { map, tap, concatMap } from 'rxjs/operators';
+import { from } from 'rxjs';
+
+import { MDMNotificationService } from '@core/mdm-notification.service';
+import { HttpErrorHandler } from '@core/http-error-handler';
+import { PropertyService } from '@core/property.service';
+import { Node, MDMLink, FileSize } from '@navigator/node';
+
+import { FileUploadRow } from '../model/file-explorer.model';
+
+@Injectable()
+export class FilesAttachableService {
+
+ public static readonly MDM_LINKS = 'MDMLinks';
+
+ private contextUrl: string;
+
+ constructor (private http: Http,
+ private httpErrorHandler: HttpErrorHandler,
+ private notificationService: MDMNotificationService,
+ private _prop: PropertyService) {
+ this.contextUrl = _prop.getUrl('mdm/environments');
+ }
+
+ public getFilesEndpoint(node: Node) {
+ const urlType = this.typeToUrl(node.sourceType);
+
+ return this.contextUrl
+ + '/' + node.sourceName
+ + '/' + urlType
+ + '/' + node.id
+ + '/files';
+ }
+
+ // loads file for fileatachable from server, returns file as blob.
+ public loadFile(remotePath: string, node: Node) {
+ const headers = new Headers({});
+
+ const endpoint = this.getFilesEndpoint(node) + '/' + this.escapeUrlCharacters(remotePath);
+
+ return this.http.get(endpoint, { method: RequestMethod.Get,
+ responseType: ResponseContentType.Blob,
+ headers: headers })
+ .pipe(
+ map(res => res.blob())
+ )
+ .catch(this.httpErrorHandler.handleError);
+ }
+
+ // loads file size from server for file with given remote path
+ public loadFileSize(remotePath: string, node: Node) {
+ const endpoint = this.getFilesEndpoint(node) + '/size/' + this.escapeUrlCharacters(remotePath);
+
+ return this.http.get(endpoint)
+ .pipe(
+ map(res => plainToClass(FileSize, res.json() as FileSize))
+ )
+ .catch(this.httpErrorHandler.handleError);
+ }
+
+ // loads file sizes from server for all files attached to given entity
+ public loadFileSizes(node: Node) {
+ const endpoint = this.getFilesEndpoint(node) + '/sizes';
+
+ return this.http.get(endpoint)
+ .pipe(
+ map(res => plainToClass(FileSize, res.json() as FileSize[]))
+ )
+ .catch(this.httpErrorHandler.handleError);
+ }
+
+ // Uploads multiple files. Http requests are chained to avoid concurrency in server side update process.
+ public uploadFiles(node: Node, files: FileUploadRow[]) {
+ return from(files).pipe(
+ concatMap(file => this.uploadFile(node, file))
+ );
+ }
+
+ // upload file
+ public uploadFile(node: Node, fileData: FileUploadRow) {
+ const fd = new FormData();
+ fd.append('file', fileData.file, fileData.file.name);
+ // fd.append('size', fileData.file.size.toString());
+ fd.append('mimeType', fileData.file.type);
+ fd.append('description', fileData.description);
+
+ const endpoint = this.getFilesEndpoint(node);
+ return this.http.post(endpoint , fd)
+ .pipe(
+ map(res => plainToClass(MDMLink, res.json() as MDMLink)),
+ tap(link => this.notificationService.notifySuccess(
+ 'File created.',
+ 'The file ' + link.remotePath.substring(link.remotePath.lastIndexOf('/') + 1)
+ + ' has been successfully created.'
+ ))
+ )
+ .catch(this.httpErrorHandler.handleError);
+ }
+
+ // delete file from server
+ public deleteFile(remotePath: string, node: Node) {
+ const endpoint = this.getFilesEndpoint(node) + '/' + this.escapeUrlCharacters(remotePath);
+
+ return this.http.delete(endpoint)
+ .pipe(
+ map(res => plainToClass(MDMLink, res.json() as MDMLink)),
+ tap(link => this.notificationService.notifySuccess(
+ 'File deleted.',
+ 'The file ' + link.remotePath.substring(link.remotePath.lastIndexOf('/') + 1)
+ + ' has been successfully deleted from file system.'
+ ))
+ )
+ .catch(this.httpErrorHandler.handleError);
+ }
+
+ // helping function to map sourceType to proper url for endpoint.
+ private typeToUrl(type: string) {
+ if (type != undefined) {
+ switch (type) {
+ case 'MeaResult':
+ return 'measurements';
+ default:
+ return type.toLowerCase() + 's';
+ }
+ }
+ }
+
+ // replaces / by %2F to not break url
+ private escapeUrlCharacters(urlString: string) {
+ return urlString.replace(/\//g, '%2F').replace(/\./g, '%2E');
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules-routing.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules-routing.module.ts
index de09afc..9921f6b 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules-routing.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules-routing.module.ts
@@ -12,18 +12,23 @@
*
********************************************************************************/
-
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { MDMModulesComponent } from '../modules/mdm-modules.component';
import { MDMSearchComponent } from '../search/mdm-search.component';
+import { ChartViewerNavCardComponent } from '../chartviewer/components/chatviewer-nav-card/chart-viewer-nav-card.component';
+import { XyChartViewerNavCardComponent } from '../chartviewer/components/xy-chart-viewer-nav-card/xy-chart-viewer-nav-card.component';
+import { FileExplorerNavCardComponent } from '../file-explorer/components/file-explorer-nav-card/file-explorer-nav-card.component';
const moduleRoutes: Routes = [
{ path: '', component: MDMModulesComponent, children: [
{ path: '', redirectTo: 'search', pathMatch: 'full' },
{ path: 'details', loadChildren: '../details/mdm-detail.module#MDMDetailModule'},
{ path: 'search', component: MDMSearchComponent },
+ { path: 'quickviewer', component: ChartViewerNavCardComponent },
+ { path: 'xychartviewer', component: XyChartViewerNavCardComponent },
+ { path: 'files', component: FileExplorerNavCardComponent },
]}
];
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.ts
index adf791f..aab9a85 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.component.ts
@@ -27,7 +27,10 @@
links = [
{ name: TRANSLATE('modules.mdm-modules.details'), path: 'details'},
- { name: TRANSLATE('modules.mdm-modules.mdm-search'), path: 'search'}
+ { name: TRANSLATE('modules.mdm-modules.mdm-search'), path: 'search'},
+ { name: 'QuickViewer', path: 'quickviewer'},
+ { name: 'X/Y-ChartViewer', path: 'xychartviewer'},
+ { name: TRANSLATE('modules.mdm-modules.file-explorer'), path: 'files'}
];
constructor(private router: Router) {}
}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.module.ts
index 12b9dc0..1194a7d 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/modules/mdm-modules.module.ts
@@ -21,13 +21,17 @@
import { MDMCoreModule } from '../core/mdm-core.module';
import { MDMDetailModule } from '../details/mdm-detail.module';
import { MDMSearchModule } from '../search/mdm-search.module';
+import { ChartviewerModule } from '../chartviewer/chartviewer.module';
+import { FileExplorerModule} from '../file-explorer/file-explorer.module';
@NgModule({
imports: [
MDMCoreModule,
MDMModulesRoutingModule,
MDMDetailModule,
- MDMSearchModule
+ MDMSearchModule,
+ ChartviewerModule,
+ FileExplorerModule
],
declarations: [
MDMModulesComponent
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.css b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.css
index 98b0555..7ba52f7 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.css
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.css
@@ -71,3 +71,12 @@
margin: 0;
border: none !important;
}
+
+.navigator .navbar-right > li {
+ text-align: right;
+}
+
+.navigator .navbar-right > li > ul.dropdown-menu {
+ position: absolute;
+ left: -75px !important;
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.html
index 8f2e657..0215a8c 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.html
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.html
@@ -11,43 +11,41 @@
* SPDX-License-Identifier: EPL-2.0
*
********************************************************************************-->
-
-
-<vertical-split-pane primary-component-minsize="{{minWidthLeft()}}" secondary-component-minsize="{{minWidthRight()}}" primary-component-initialratio="{{initRatio()}}">
- <div class="split-pane-content-primary">
- <nav class="navigator">
- <div class="navbar navbar-default container-fluid" style="padding: 0px 5px;">
- <div class="navbar-header">
- <a class="navbar-brand" (click)="activate('Navigation')" style="cursor:pointer;">{{ 'navigator-view.mdm-navigator-view.navigator' | translate }}</a>
- </div>
- <div>
- <ul class="nav navbar-nav navbar-right">
- <li [ngClass]="isDropActive('Dropdown')" title="{{ 'navigator-view.mdm-navigator-view.select-node-provider' | translate }}" dropdown>
- <a (click)="activate('Dropdown')" class="dropdown-toggle" dropdownToggle aria-haspopup="true" aria-expanded="false" style="cursor:pointer;">
+ <div class="mainnavigation">
+ <div id="leftsidenav" class="split">
+ <nav class="navigator">
+ <div class="navbar navbar-default container-fluid" style="padding: 0px 5px;">
+ <div class="navbar-header">
+ <a class="navbar-brand" (click)="activate('Navigation')" style="cursor:pointer;">{{ 'navigator-view.mdm-navigator-view.navigator' | translate }}</a>
+ </div>
+ <div>
+ <ul class="nav navbar-nav navbar-right">
+ <li [ngClass]="isDropActive('Dropdown')" title="{{ 'navigator-view.mdm-navigator-view.select-node-provider' | translate }}" dropdown>
+ <a (click)="activate('Dropdown')" class="dropdown-toggle" dropdownToggle aria-haspopup="true" aria-expanded="false" style="cursor:pointer;">
{{activeNodeprovider.name}}
- <em class="caret" ></em>
- </a>
- <ul class="dropdown-menu" *dropdownMenu>
- <li *ngFor="let np of getNodeproviders()">
- <a class="dropdown-item" (click)="activateNodeProvider(np)" style="cursor:pointer;">
+ <em class="caret"></em>
+ </a>
+ <ul class="dropdown-menu" *dropdownMenu>
+ <li *ngFor="let np of getNodeproviders()">
+ <a class="dropdown-item" (click)="activateNodeProvider(np)" style="cursor:pointer;">
{{np.name}}
- </a>
- </li>
- </ul>
- </li>
- </ul>
+ </a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </div>
</div>
- </div>
- <mdm-navigator></mdm-navigator>
- </nav>
- </div>
- <div class="split-pane-content-secondary">
- <div class="navigator-content" (scroll)=onScroll($event)>
- <router-outlet></router-outlet>
- <mdm-basket (onSelect)="updateSelectedNode($event)" [activeNode]=activeNode (onActive)="updateActiveNode($event)"></mdm-basket>
- <div *ngIf="scrollBtnVisible" style="position: fixed; bottom: 30px; right: 35px;">
- <button class="btn btn-default" (click)="onScrollTop()" style="z-index: 10000;"><span class="fa fa-arrow-up" style="z-index: 10000;" title="{{ 'navigator-view.mdm-navigator-view.tooltip-scroll-up' | translate }}"></span></button>
+ <mdm-navigator></mdm-navigator>
+ </nav>
+ </div>
+ <div id="rightsidenav" class="split">
+ <div class="navigator-content" (scroll)=onScroll($event)>
+ <router-outlet></router-outlet>
+ <mdm-basket (onSelect)="updateSelectedNode($event)" [activeNode]=activeNode (onActive)="updateActiveNode($event)"></mdm-basket>
+ <div *ngIf="scrollBtnVisible" style="position: fixed; bottom: 30px; right: 35px;">
+ <button class="btn btn-default" (click)="onScrollTop()" style="z-index: 10000;"><span class="fa fa-arrow-up" style="z-index: 10000;" title="{{ 'navigator-view.mdm-navigator-view.tooltip-scroll-up' | translate }}"></span></button>
+ </div>
</div>
</div>
</div>
-</vertical-split-pane>
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.ts
index 7b4a84f..10f3dc3 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.component.ts
@@ -13,18 +13,18 @@
********************************************************************************/
-import {Component, ViewEncapsulation, OnInit, OnDestroy} from '@angular/core';
+import { Component, ViewEncapsulation, OnInit, OnDestroy, AfterViewInit } from '@angular/core';
import { BsDropdownModule, AccordionConfig, BsDropdownConfig } from 'ngx-bootstrap';
import {NodeService} from '../navigator/node.service';
import {Node} from '../navigator/node';
import {NodeproviderService} from '../navigator/nodeprovider.service';
-import { SplitPaneModule } from 'ng2-split-pane/lib/ng2-split-pane';
import {MDMNotificationService} from '../core/mdm-notification.service';
import { TranslateService } from '@ngx-translate/core';
+import Split from 'split.js';
@Component({
selector: 'mdm-navigator-view',
@@ -33,7 +33,7 @@
providers: [BsDropdownConfig, AccordionConfig],
encapsulation: ViewEncapsulation.None
})
-export class MDMNavigatorViewComponent implements OnInit, OnDestroy {
+export class MDMNavigatorViewComponent implements OnInit, OnDestroy, AfterViewInit {
selectedNode = new Node;
activeNode: Node;
@@ -46,6 +46,8 @@
div: any;
scrollBtnVisible = false;
+ split: Split;
+
constructor(private nodeProviderService: NodeproviderService,
private notificationService: MDMNotificationService,
private translateService: TranslateService) {}
@@ -84,7 +86,22 @@
np => this.activeNodeprovider = np,
error => this.notificationService.notifyError(
this.translateService.instant('navigator-view.mdm-navigator-view.err-cannot-update-node-provider'), error)
- );
+ );
+
+ }
+
+ ngAfterViewInit(): void {
+ this.split = Split(['#leftsidenav', '#rightsidenav'], {
+ sizes: [this.initRatio(), this.initRatioRight()],
+ minSize: this.minWidthLeft(),
+ gutterSize: 10,
+ gutterStyle: function (dimension, gutterSize) {
+ return {
+ 'width': gutterSize + 'px',
+ 'height': (document.getElementById('leftsidenav').clientHeight - 5) + 'px'
+ };
+ },
+ });
}
ngOnDestroy() {
@@ -115,7 +132,11 @@
return 0.20 * window.innerWidth;
}
- initRatio() {
- return Math.max(250 / window.innerWidth, 0.20);
- }
+ initRatio() {
+ return Math.floor(Math.max(250 / window.innerWidth, 0.20) * 100);
+ }
+ initRatioRight() {
+ return 100 - this.initRatio();
+ }
+
}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.module.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.module.ts
index e1b5464..6db2fae 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.module.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator-view/mdm-navigator-view.module.ts
@@ -24,7 +24,6 @@
import { MDMNavigatorModule } from '../navigator/mdm-navigator.module';
import { MDMModulesModule } from '../modules/mdm-modules.module';
import { MDMBasketModule } from '../basket/mdm-basket.module';
-import { SplitPaneModule } from 'ng2-split-pane/lib/ng2-split-pane';
@NgModule({
imports: [
@@ -32,8 +31,7 @@
MDMNavigatorViewRoutingModule,
MDMNavigatorModule,
MDMModulesModule,
- MDMBasketModule,
- SplitPaneModule
+ MDMBasketModule
],
declarations: [
MDMNavigatorViewComponent
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/attribute-value.pipe.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/attribute-value.pipe.ts
new file mode 100644
index 0000000..ed5bef2
--- /dev/null
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/attribute-value.pipe.ts
@@ -0,0 +1,60 @@
+/********************************************************************************
+ * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+import { Pipe, PipeTransform } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable, of } from 'rxjs';
+import { Attribute, MDMLink, ContextGroup } from '../navigator/node';
+
+@Pipe({name: 'attributeValue'})
+export class AttributeValuePipe implements PipeTransform {
+
+ constructor(private translateService: TranslateService) {}
+
+ transform(attr: Attribute, contextGroup?: ContextGroup) {
+ let display = new Observable<string>();
+
+ if (attr != undefined && attr.value != undefined) {
+
+ const value = contextGroup != undefined ? attr.value[contextGroup] : attr.value;
+
+ if (value != undefined) {
+ switch (attr.dataType) {
+ case 'FILE_LINK':
+ const link: MDMLink = Object.assign(new MDMLink(), value);
+ display = of(link.getFileName());
+ break;
+ case 'FILE_LINK_SEQUENCE':
+ const links = value as MDMLink[];
+ if (links != undefined) {
+ switch (links.length) {
+ case 0:
+ display = this.translateService.get('navigator.attribute-value.msg-no-files-attached');
+ break;
+ case 1:
+ display = this.translateService.get('navigator.attribute-value.msg-one-file-attached');
+ break;
+ default:
+ display = this.translateService.get('navigator.attribute-value.msg-x-files-attached', {numberOfFiles: links.length});
+ }
+ }
+ break;
+ default:
+ display = of(value);
+ }
+ }
+ }
+ return display;
+ }
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.ts
index f871ea1..7b56a98 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/mdm-navigator.component.ts
@@ -84,7 +84,7 @@
this.nodes = treeNodes;
this.loadNavigateItems().subscribe(selectItems => {
this.navigatorService.fireOnOpenInTree(selectItems);
- })
+ });
},
error => this.notificationService.notifyError(
this.translateService.instant('navigator.mdm-navigator.err-cannot-update-navigation-tree'), error)
@@ -184,24 +184,8 @@
this.basketService.addAll(this.selectedNodes.map(node => <MDMItem>node.data));
}
- typeToUrl(type: string) {
- switch (type) {
- case 'StructureLevel':
- return 'pools';
- case 'MeaResult':
- return 'measurements';
- case 'SubMatrix':
- return 'channelgroups';
- case 'MeaQuantity':
- return 'channels';
- default:
- return type.toLowerCase() + 's';
- }
- }
-
openInTree(items: MDMItem[]) {
this.selectedNodes = [];
- console.log(items);
items.forEach(item => {
let pathTypes = this.nodeproviderService.getPathTypes(item.type);
if (pathTypes.length === 0) {
@@ -232,7 +216,7 @@
expander(item: MDMItem, current: TreeNode, pathTypes: string[], iii: number) {
let expandList: string[] = [];
this.nodeService.searchNodes('filter=' + item.type + '.Id eq "' + item.id + '"',
- item.source, this.typeToUrl(pathTypes[iii]))
+ item.source, pathTypes[iii])
.subscribe(
nodes => {
expandList = nodes.map(n => n.id);
@@ -254,7 +238,7 @@
error => this.notificationService.notifyError(
this.translateService.instant('navigator.mdm-navigator.err-cannot-open-node'), error)
);
- };
+ }
this.scrollToSelectionPrimeNgDataTable(node);
}
});
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.service.ts
index cfebb86..b7dea7d 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.service.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.service.ts
@@ -44,7 +44,7 @@
}
searchNodes(query, env, type) {
- return this.http.get(this._nodeUrl + '/' + env + '/' + type + '?' + query).pipe(
+ return this.http.get(this._nodeUrl + '/' + env + '/' + this.typeToUrl(type) + '?' + query).pipe(
map(res => plainToClass(Node, res.json().data)),
catchError(this.httpErrorHandler.handleError));
}
@@ -82,7 +82,7 @@
if (node1 == undefined || node2 == undefined) { return; }
let n1 = node1.name + node1.id + node1.type + node1.sourceName;
let n2 = node2.name + node2.id + node2.type + node2.sourceName;
- if (n1 === n2) { return true; };
+ if (n1 === n2) { return true; }
return false;
}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.ts
index ad3a18b..f97e60d 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/node.ts
@@ -13,13 +13,50 @@
********************************************************************************/
-import {Type} from 'class-transformer';
+import { Type } from 'class-transformer';
+
+export enum ContextGroup {
+ ORDERED = 0,
+ MEASURED = 1
+}
export class Attribute {
name: string;
- value: string;
unit: string;
dataType: string;
+ value: string | string [] | MDMLink | MDMLink[] | MDMLink[][];
+ sortIndex?: number;
+ readOnly?: boolean;
+ mandatory?: boolean;
+ description?: string;
+}
+
+export class MergedSensorAttribute {
+ name: string[];
+ unit: string[];
+ dataType: string[];
+ value: (string | MDMLink | MDMLink[])[];
+}
+
+export class MDMLink {
+ remotePath: string;
+ mimeType: string;
+ description: string;
+ size: string;
+
+ public getFileName() {
+ let fileName = '';
+ if (this.remotePath != undefined) {
+ const index = this.remotePath.lastIndexOf('/') + 1;
+ fileName = this.remotePath.substring(index);
+ }
+ return fileName;
+ }
+}
+
+export class FileSize {
+ remotePath: string;
+ size: string;
}
export class Relation {
@@ -28,6 +65,7 @@
entityType: string;
contextType: string;
ids: string[];
+ parentId: string;
}
export class Node {
@@ -37,7 +75,7 @@
sourceType: string;
sourceName: string;
@Type(() => Attribute)
- attributes: Attribute[];
+ attributes: (Attribute)[];
@Type(() => Relation)
relations: Relation[];
active: boolean;
@@ -57,5 +95,3 @@
}
}
}
-
-
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.ts
index 6b395ea..5ba4f4b 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/navigator/nodeprovider.service.ts
@@ -63,12 +63,17 @@
this.preferenceService.getPreferenceForScope(Scope.SYSTEM, 'nodeprovider.').pipe(
map(prefs => prefs.map(p => JSON.parse(p.value))))
.subscribe(
- nodeproviders => this.nodeproviders = nodeproviders,
+ nodeproviders => this.setNewNodeproviders(nodeproviders),
error => this.notificationService.notifyError(
this.translateService.instant('navigator.nodeprovider.err-cannot-load-node-provider-from-settings'), error)
);
}
+ setNewNodeproviders(nodeproviders) {
+ this.nodeproviders = nodeproviders;
+ this.nodeproviders.unshift(defaultNodeProvider);
+ }
+
getQueryForChildren(item: MDMItem) {
return this.replace(this.getSubNodeprovider(item), item);
}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.ts
index 379d385..64bef6b 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/search/filter.service.ts
@@ -105,7 +105,7 @@
@Injectable()
export class FilterService {
public readonly NO_FILTER_NAME = TRANSLATE('search.filter.no-filter-selected');
- public readonly NEW_FILTER_NAME = TRANSLATE('search.filter.new-filter')
+ public readonly NEW_FILTER_NAME = TRANSLATE('search.filter.new-filter');
public readonly EMPTY_FILTER: SearchFilter = new SearchFilter(this.NO_FILTER_NAME, [], 'Test', '', []);
constructor(private http: Http,
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.html b/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.html
index ea5792e..5252208 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.html
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.html
@@ -19,9 +19,9 @@
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(0, 0, 0,.6);
}
-:host /deep/ .ui-multiselect .ui-multiselect-label {
+/* :host /deep/ .ui-multiselect .ui-multiselect-label {
padding: .25em 2em .25em .25em;
-}
+} */
</style>
<div class="container" style="padding: 0;">
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.ts
index cd95850..ca98675 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/search/mdm-search.component.ts
@@ -150,7 +150,7 @@
init(envs: Node[], attrs: { [type: string]: { [env: string]: SearchAttribute[] }},
filters: SearchFilter[], definitions: SearchDefinition[]) {
- this.environments = envs
+ this.environments = envs;
this.allSearchAttributes = attrs;
this.filters = filters;
this.definitions = definitions;
@@ -393,7 +393,7 @@
showSaveModal(e: Event) {
e.stopPropagation();
if (this.currentFilter.name === this.filterService.NO_FILTER_NAME
- || this.currentFilter.name === this.filterService.NEW_FILTER_NAME) {
+ || this.currentFilter.name === this.filterService.NEW_FILTER_NAME) {
this.filterName = '';
} else {
this.filterName = this.currentFilter.name;
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.ts b/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.ts
index 674cb6b..d1ccecc 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.ts
+++ b/org.eclipse.mdm.application/src/main/webapp/src/app/tableview/tableview.component.ts
@@ -59,6 +59,7 @@
@Input() view: View;
@Input() results: SearchResult;
+
/** @todo: Bad practice. value defined in template will be assumed to be a string.
example: in template: [isShopable]="false", in component if(isShopable) {console.log('yes')} else { console.log('no')} will log yes!
**/
@@ -77,7 +78,7 @@
public readonly buttonColStyle = {'width': '3%'};
public btnColHidden = false;
- public viewRows: Row[]
+ public viewRows: Row[];
public turboViewColumns: TurboViewColumn[];
public selectedViewRows: Row[] = [];
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/de.json b/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/de.json
index 0bd55fb..52b4e18 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/de.json
+++ b/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/de.json
@@ -1,35 +1,74 @@
{
- "administration": {
- "admin-modules": {
- "scope": "Geltungsbereich",
- "source": "Quelle",
- "system": "System",
- "user": "Benutzer"
- },
- "edit-preference": {
- "btn-cancel": "Abbrechen",
- "btn-save": "Speichern",
- "err-cannot-load-data-source": "Datenquelle kann nicht geladen werden.",
- "err-cannot-load-scope": "Geltungsbereich kann nicht geladen werden.",
- "lbl-key": "Schlüssel",
- "lbl-scope": "Geltungsbereich",
- "lbl-source": "Quelle",
- "lbl-value": "Wert",
- "title-preferences-editor": "Einstellungseditor",
- "tooltip-close": "Schließen"
- },
- "preference": {
- "btn-add-preference": "Einstellung hinzufügen",
- "btn-tooltip-delete-preference": "Entfernen",
- "btn-tooltip-edit-preference": "Bearbeiten",
- "err-cannot-save-preference": "Einstellung kann nicht gespeichert werden.",
- "err-cannot-update-preference": "Einstellung kann nicht aktualisiert werden."
- }
- },
+ "administration": {
+ "admin-modules": {
+ "scope": "Geltungsbereich",
+ "modules": "Module",
+ "source": "Quelle",
+ "system": "System",
+ "user": "Benutzer",
+ "extsystems": "Externe Systeme",
+ "preferences": "Präferenzen"
+ },
+ "edit-preference": {
+ "btn-cancel": "Abbrechen",
+ "btn-save": "Speichern",
+ "err-cannot-load-data-source": "Datenquelle kann nicht geladen werden.",
+ "err-cannot-load-scope": "Geltungsbereich kann nicht geladen werden.",
+ "lbl-key": "Schlüssel",
+ "lbl-scope": "Geltungsbereich",
+ "lbl-source": "Quelle",
+ "lbl-value": "Wert",
+ "title-preferences-editor": "Einstellungseditor",
+ "tooltip-close": "Schließen"
+ },
+ "preference": {
+ "btn-add-preference": "Einstellung hinzufügen",
+ "btn-tooltip-delete-preference": "Entfernen",
+ "btn-tooltip-edit-preference": "Bearbeiten",
+ "err-cannot-save-preference": "Einstellung kann nicht gespeichert werden.",
+ "err-cannot-update-preference": "Einstellung kann nicht aktualisiert werden."
+ },
+ "extsystem": {
+ "loading": "Lade Daten...",
+ "loading-short": "Lade",
+ "dropdown-please-select": "Bitte auswählen",
+ "select-system": "Datenquelle auswählen",
+ "selected-system": "Gewählte Datenquelle",
+ "name": "Name",
+ "description": "Beschreibung",
+ "ext-system-attributes": "Externes System Attribute",
+ "mdm-attributes": "MDM Attribute",
+ "btn-add": "Neu hinzufügen",
+ "btn-edit": "Bearbeiten",
+ "btn-del": "Entfernen",
+ "btn-save": "Speichern",
+ "btn-cancel": "Abbrechen",
+ "btn-back": "Zurück",
+ "component-type": "Komponenten-Typ",
+ "component-name": "Komponenten-Name",
+ "attribute-name": "Attribut-Name",
+ "dialog-ext-system-title": "Externes System",
+ "dialog-ext-system-attr-title": "Externes System Attribute",
+ "dialog-ext-system-mdm-attr-title": "MDM Attribute",
+ "dialog-ext-system-delete-title": "Externes System löschen",
+ "dialog-ext-system-delete-text": "Bitte bestätigen Sie das Löschen des Externen Systems",
+ "err-cannot-update-ext-system": "Externes System kann nicht gespeichert werden",
+ "err-cannot-save-ext-system": "Externes System kann nicht aktualisiert werden",
+ "err-cannot-save-ext-system-attr": "Externes System Attribut kann nicht gespeichert werden",
+ "err-cannot-save-ext-mdm-attr": "MDM Attribut kann nicht gespeichert werden",
+ "err-cannot-load-comp-types": "Komponententypen konnten nicht geladen werden",
+ "loading-attributes": "Lade Attribute...",
+ "sensor": "Sensor",
+ "test-equipment": "Messgerät",
+ "test-sequence": "Testablauf",
+ "unit-under-test": "Prüfling"
+ }
+ },
"app": {
"about": "Über",
"language": "Sprache",
- "logout": "Logout"
+ "logout": "Logout",
+ "roles": "Rollen"
},
"basket": {
"mdm-basket": {
@@ -83,17 +122,24 @@
"err-cannot-load-data": "Daten können nicht geladen werden.",
"err-cannot-load-scope": "Bereich kann nicht geladen werden.",
"status-loading": "Lädt...",
+ "status-saving": "Speichert...",
"status-no-descriptive-data-available": "Keine beschriebenden Daten verfügbar.",
"status-no-nodes-available": "Keine Knoten verfügbar.",
"tblhdr-measured": "Gemessen",
"tblhdr-name": "Name",
- "tblhdr-ordered": "Beauftragt"
+ "tblhdr-ordered": "Beauftragt",
+ "btn-edit": "Bearbeiten",
+ "btn-cancel": "Abbrechen",
+ "btn-save": "Speichern",
+ "input-dateformat": "dd.mm.yy",
+ "transform-dateformat": "dd.MM.yyyy HH:mm"
},
"mdm-detail-view": {
"cannot-update-node": "Knoten kann nicht aktualisiert werden."
},
"mdm-detail-panel": {
"btn-into-shopping-basket": "In den Warenkorb",
+ "cannot-update-node": "Knoten kann nicht aktualisiert werden.",
"tblhdr-attribute": "Attribut",
"tblhdr-unit": "Einheit",
"tblhdr-value": "Wert"
@@ -115,7 +161,57 @@
"tblhdr-measured": "Gemessen",
"tblhdr-name": "Name",
"tblhdr-ordered": "Beauftragt"
- }
+ },
+ "attribute-editor": {
+ "cal-sunday": "Sonntag",
+ "cal-monday": "Montag",
+ "cal-tuesday": "Dienstag",
+ "cal-wednesday": "Mittwoch",
+ "cal-thursday": "Donnerstag",
+ "cal-friday": "Freitag",
+ "cal-saturday": "Samstag",
+ "cal-sun": "Son",
+ "cal-mon": "Mon",
+ "cal-tue": "Die",
+ "cal-wed": "Mit",
+ "cal-thu": "Don",
+ "cal-fri": "Fre",
+ "cal-sat": "Sam",
+ "cal-su": "So",
+ "cal-mo": "Mo",
+ "cal-tu": "Di",
+ "cal-we": "Mi",
+ "cal-th": "Do",
+ "cal-fr": "Fr",
+ "cal-sa": "Sa",
+ "cal-today": "Heute",
+ "cal-clear": "Löschen",
+ "cal-week": "Wo",
+ "cal-january": "Januar",
+ "cal-february": "Februar",
+ "cal-march": "März",
+ "cal-april": "April",
+ "cal-may": "Mai",
+ "cal-june": "Juni",
+ "cal-july": "Juli",
+ "cal-august": "August",
+ "cal-september": "September",
+ "cal-october": "Oktober",
+ "cal-november": "November",
+ "cal-december": "Dezember",
+ "cal-jan": "Jan",
+ "cal-feb": "Feb",
+ "cal-mar": "Mär",
+ "cal-apr": "Apr",
+ "cal-jun": "Jun",
+ "cal-jul": "Jul",
+ "cal-aug": "Aug",
+ "cal-sep": "Sep",
+ "cal-oct": "Okt",
+ "cal-nov": "Nov",
+ "cal-dec": "Dez",
+ "cal-format": "dd.mm.yy"
+ }
},
"filerelease": {
"filerelease": {
@@ -176,7 +272,8 @@
"modules": {
"mdm-modules": {
"details": "Details",
- "mdm-search": "MDM Suche"
+ "mdm-search": "MDM Suche",
+ "file-explorer": "Dokumente"
}
},
"navigator-view": {
@@ -203,6 +300,11 @@
"nodeprovider": {
"err-cannot-load-node-provider-from-settings": "Nodeprovider kann nicht aus den Einstellungen geladen werden.",
"err-unsupported-type": "Typ {{ type }} wird nicht unterstützt! Es sollte Typ {{ typeToUse }} verwendet werden."
+ },
+ "attribute-value": {
+ "msg-no-files-attached": "Keine Dateien angehangen",
+ "msg-one-file-attached": "1 Datei angehangen",
+ "msg-x-files-attached": "{{numberOfFiles}} Dateien angehangen"
}
},
"search": {
@@ -247,6 +349,7 @@
"results": "Ergebnisse",
"search-attributes-from": "Suchattribute aus",
"search-filter-name": "Filtername",
+ "select-search-filter": "Suchfilter auswählen",
"title-save-search-filter-as": "Suchfilter speichern unter",
"tooltip-add-selection-to-shopping-basket": "Auswahl zum Warenkorb hinzufügen",
"tooltip-clear-search-results": "Suchergebnisliste leeren",
@@ -320,5 +423,68 @@
"tooltip-save-view": "Ansicht speichern",
"tooltip-select-view": "Ansicht auswählen"
}
+ },
+ "chartviewer": {
+ "request-options": {},
+ "xy-chart-data-selection-panel": {
+ "select-channel-placeholder": "Kanal wählen",
+ "no-x-channel-dialog-header": "Information",
+ "no-x-channel-dialog-message": "Die aktuelle Kanalgruppe hat keine Kanäle die als X-Achse bzw. XY-Achse definiert sind. Wenn Sie auch als Y-Achse definierte Kanäle zulassen möchten, deaktivieren Sie bitte den Filter in der Werkzeugleiste."
+ },
+ "xy-chart-viewer": {},
+ "xy-chart-viewer-nav-card": {
+ "no-node-selected": "Kein Knoten ausgewählt"
+ },
+ "xy-chart-viewer-toolbar": {
+ "hide-data-selection-panel": "Datenauswahlpanel verbergen",
+ "show-data-selection-panel": "Datenauswahlpanel anzeigen",
+ "activate-xy-mode": "Kanal Auswahloptionen nach Achsentyp filtern",
+ "deactivate-xy-mode": "Alle Kanäle als Auswahloptionen anzeigen",
+ "hide-chart-legend": "Legende des Diagramms verbergen",
+ "show-chart-legend": "Legende des Diagramms anzeigen",
+ "line-width": "Linienstärke",
+ "show-lines": "Verbindungslinien anzeigen",
+ "hide-lines": "Verbindungslinien verbergen",
+ "fill-area": "Fläche unter dem Graph füllen",
+ "clear-area": "Fläche unter dem Graph leeren",
+ "show-datapoints": "Datenpunkte markieren",
+ "hide-datapoints": "Datenpunkte verbergen",
+ "tension": "Tension: 0 = Linear, 0.4 = Bezierkurve"
+ }
+ },
+ "file-explorer": {
+ "file-explorer": {
+ "btn-add-files": "Dateien hinzufügen",
+ "btn-delete-file": "Datei löschen",
+ "btn-download-file": "Datei herunterladen",
+ "btn-preview-file": "Vorschau",
+ "btn-refresh": "Aktualisieren",
+ "btn-remove-all-files-from-selection": "Dateiauswahl leeren",
+ "btn-remove-file-from-selection": "Datei aus Auswahl entfernen",
+ "btn-upload-file-selection": "Ausgewählte Dateien hochladen",
+ "btn-upload-file": "Datei hochladen",
+ "btn-upload-files": "Dateien hochladen",
+
+ "hdr-description": "Beschreibung",
+ "hdr-filename": "Dateiname",
+ "hdr-size": "Größe",
+ "hdr-type": "Typ",
+ "hdr-file-upload-wizzard": "File upload wizzard for ",
+
+ "msg-no-files-attached": "Keine Dateien angehangen.",
+ "msg-confirm-delete-file-from-db": "Sind Sie sicher, dass Sie die ausgewählte Datei von der Datenbank löschen möchten?",
+
+ "ttl-attached-to": "Dateien angehangen an: ",
+ "ttl-confirmation": "Bestätigung"
+ },
+ "file-explorer-nav-card": {
+ "status-node-is-no-files-attachable": "An {{type}}s können keine Dateien angehangen werden.",
+ "status-no-node-selected": "Kein Knoten ausgewählt."
+ },
+ "file-link-editor-dialog": {
+ "btn-cancel": "Abbrechen",
+ "btn-save-changes": "Speichern",
+ "btn-change-file": "Datei ändern"
+ }
}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/en.json b/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/en.json
index 973741b..1b1f927 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/en.json
+++ b/org.eclipse.mdm.application/src/main/webapp/src/assets/i18n/en.json
@@ -1,11 +1,14 @@
{
"administration": {
- "admin-modules": {
- "scope": "Scope",
- "source": "Source",
- "system": "System",
- "user": "User"
- },
+ "admin-modules": {
+ "scope": "Scope",
+ "modules": "Module",
+ "source": "Source",
+ "system": "System",
+ "user": "User",
+ "extsystems": "External Systems",
+ "preferences": "Preferences"
+ },
"edit-preference": {
"btn-cancel": "Cancel",
"btn-save": "Save",
@@ -18,18 +21,54 @@
"title-preferences-editor": "Preferences Editor",
"tooltip-close": "Close"
},
- "preference": {
- "btn-add-preference": "Add preference",
- "btn-tooltip-delete-preference": "Delete",
- "btn-tooltip-edit-preference": "Edit",
- "err-cannot-save-preference": "Cannot save preference.",
- "err-cannot-update-preference": "Cannot update preference."
- }
+ "preference": {
+ "btn-add-preference": "Add preference",
+ "btn-tooltip-delete-preference": "Delete",
+ "btn-tooltip-edit-preference": "Edit",
+ "err-cannot-save-preference": "Cannot save preference.",
+ "err-cannot-update-preference": "Cannot update preference."
+ },
+ "extsystem": {
+ "loading": "Loading data...",
+ "loading-short": "Loading",
+ "dropdown-please-select": "Please select...",
+ "select-system": "Select environment",
+ "selected-system": "Selected environment",
+ "name": "Name",
+ "description": "Description",
+ "ext-system-attributes": "Ext. system attributes",
+ "mdm-attributes": "MDM attributes",
+ "btn-add": "Add new",
+ "btn-edit": "Edit",
+ "btn-del": "Remove",
+ "btn-save": "Save",
+ "btn-cancel": "Cancel",
+ "btn-back": "Back",
+ "component-type": "Component type",
+ "component-name": "Component name",
+ "attribute-name": "Attribute name",
+ "dialog-ext-system-title": "External system",
+ "dialog-ext-system-attr-title": "External system attribute",
+ "dialog-ext-system-mdm-attr-title": "MDM attribute",
+ "dialog-ext-system-delete-title": "External system deletion",
+ "dialog-ext-system-delete-text": "Please confirm the deletion of the external system",
+ "err-cannot-update-ext-system": "External system cannot be saved",
+ "err-cannot-save-ext-system": "External system cannot be refreshed",
+ "err-cannot-save-ext-system-attr": "External system attribute cannot be saved",
+ "err-cannot-save-ext-mdm-attr": "MDM attribute cannot be saved",
+ "err-cannot-load-comp-types": "Cannot load component types",
+ "loading-attributes": "Loading attributes...",
+ "sensor": "Sensor",
+ "test-equipment": "Test equipment",
+ "test-sequence": "Test sequence",
+ "unit-under-test": "Unit under test"
+ }
},
"app": {
"about": "About",
"language": "Language",
- "logout": "Logout"
+ "logout": "Logout",
+ "roles": "Roles"
},
"basket": {
"mdm-basket": {
@@ -78,22 +117,29 @@
"err-cannot-load-preference-for-attributes-to-ignore": "Cannot load preference for attributes to ignore.",
"err-faulty-preference-for-attributes-to-ignore": "Faulty preference for attributes to ignore."
},
- "mdm-detail-descriptive-data": {
- "err-cannot-load-context": "Cannot load context.",
- "err-cannot-load-data": "Cannot load data.",
- "err-cannot-load-scope": "Cannot load scope.",
- "status-loading": "Loading...",
- "status-no-descriptive-data-available": "No descriptive data available.",
- "status-no-nodes-available": "No nodes available.",
- "tblhdr-measured": "Measured",
- "tblhdr-name": "Name",
- "tblhdr-ordered": "Ordered"
- },
+ "mdm-detail-descriptive-data": {
+ "err-cannot-load-context": "Cannot load context.",
+ "err-cannot-load-data": "Cannot load data.",
+ "err-cannot-load-scope": "Cannot load scope.",
+ "status-loading": "Loading...",
+ "status-saving": "Saving...",
+ "status-no-descriptive-data-available": "No descriptive data available.",
+ "status-no-nodes-available": "No nodes available.",
+ "tblhdr-measured": "Measured",
+ "tblhdr-name": "Name",
+ "tblhdr-ordered": "Ordered",
+ "btn-edit": "Edit",
+ "btn-cancel": "Cancel",
+ "btn-save": "Save",
+ "input-dateformat": "mm/dd/yy",
+ "transform-dateformat": "MM/dd/yyyy HH:mm"
+ },
"mdm-detail-view": {
"cannot-update-node": "Cannot update node."
},
"mdm-detail-panel": {
"btn-into-shopping-basket": "Into shopping basket",
+ "cannot-update-node": "Cannot update node.",
"tblhdr-attribute": "Attribute",
"tblhdr-unit": "Unit",
"tblhdr-value": "Value"
@@ -115,7 +161,57 @@
"tblhdr-measured": "Measured",
"tblhdr-name": "Name",
"tblhdr-ordered": "Ordered"
- }
+ },
+ "attribute-editor": {
+ "cal-sunday": "Sunday",
+ "cal-monday": "Monday",
+ "cal-tuesday": "Tuesday",
+ "cal-wednesday": "Wednesday",
+ "cal-thursday": "Thursday",
+ "cal-friday": "Friday",
+ "cal-saturday": "Saturday",
+ "cal-sun": "Sun",
+ "cal-mon": "Mon",
+ "cal-tue": "Tue",
+ "cal-wed": "Wed",
+ "cal-thu": "Thu",
+ "cal-fri": "Fri",
+ "cal-sat": "Sat",
+ "cal-su": "Su",
+ "cal-mo": "Mo",
+ "cal-tu": "Tu",
+ "cal-we": "We",
+ "cal-th": "Th",
+ "cal-fr": "Fr",
+ "cal-sa": "Sa",
+ "cal-today": "Today",
+ "cal-clear": "Clear",
+ "cal-week": "We",
+ "cal-january": "January",
+ "cal-february": "February",
+ "cal-march": "March",
+ "cal-april": "April",
+ "cal-may": "May",
+ "cal-june": "June",
+ "cal-july": "July",
+ "cal-august": "August",
+ "cal-september": "September",
+ "cal-october": "October",
+ "cal-november": "November",
+ "cal-december": "December",
+ "cal-jan": "Jan",
+ "cal-feb": "Feb",
+ "cal-mar": "Mar",
+ "cal-apr": "Apr",
+ "cal-jun": "Jun",
+ "cal-jul": "Jul",
+ "cal-aug": "Aug",
+ "cal-sep": "Sep",
+ "cal-oct": "Oct",
+ "cal-nov": "Nov",
+ "cal-dec": "Dec",
+ "cal-format": "mm-dd-yy"
+ }
},
"filerelease": {
"filerelease": {
@@ -176,7 +272,8 @@
"modules": {
"mdm-modules": {
"details": "Details",
- "mdm-search": "MDM Search"
+ "mdm-search": "MDM Search",
+ "file-explorer": "Files"
}
},
"navigator-view": {
@@ -203,6 +300,11 @@
"nodeprovider": {
"err-cannot-load-node-provider-from-settings": "Cannot load node provider from settings",
"err-unsupported-type": "Type {{ type }} is not supported. Type {{ typeToUse }} should be used instead."
+ },
+ "attribute-value": {
+ "msg-no-files-attached": "No files attached",
+ "msg-one-file-attached": "1 file attached",
+ "msg-x-files-attached": "{{numberOfFiles}} files attached"
}
},
"search": {
@@ -248,6 +350,7 @@
"search-attributes-from": "Search attributes from",
"search-filter-name": "Filter name",
"title-save-search-filter-as": "Save search filter as",
+ "select-search-filter": "Select search filter",
"tooltip-add-selection-to-shopping-basket": "Add selection to shopping basket",
"tooltip-clear-search-results": "Clear search results",
"tooltip-create-new-search-filter": "Create new search filter",
@@ -320,5 +423,67 @@
"tooltip-save-view": "Save view",
"tooltip-select-view": "Select view"
}
+ },
+ "chartviewer": {
+ "request-options": {},
+ "xy-chart-data-selection-panel": {
+ "select-channel-placeholder": "Select Channel",
+ "no-x-channel-dialog-header": "Information",
+ "no-x-channel-dialog-message": "The current ChannelGroup has no Channels defined as X-axis or XY-axis. If you want to also allow Channels marked as Y-axis, toggle the corresponding filter in the toolbar."
+ },
+ "xy-chart-viewer": {},
+ "xy-chart-viewer-nav-card": {
+ "no-node-selected": "No node selected"
+ },
+ "xy-chart-viewer-toolbar": {
+ "hide-data-selection-panel": "Hide data selection panel",
+ "show-data-selection-panel": "Show data selection panel",
+ "activate-xy-mode": "Filter channel options by axis-type",
+ "deactivate-xy-mode": "Provide all channel options",
+ "hide-chart-legend": "Hide chart legend",
+ "show-chart-legend": "Show chart legend",
+ "line-width": "Line width",
+ "show-lines": "Draw lines",
+ "hide-lines": "Hide lines",
+ "fill-area": "Fill area underneath the graph",
+ "clear-area": "Clear area underneath the graph",
+ "show-datapoints": "Mark datapoints",
+ "hide-datapoints": "Hide datapoints",
+ "tension": "Line tension: 0 = linear, 0.4 = Bezier curve"
+ }
+ },
+ "file-explorer": {
+ "file-explorer": {
+ "btn-add-files": "Add files",
+ "btn-delete-file": "Delete file",
+ "btn-download-file": "Download file",
+ "btn-preview-file": "Preview",
+ "btn-refresh": "Update",
+ "btn-remove-all-files-from-selection": "Clean file selection",
+ "btn-remove-file-from-selection": "Remove file from selection",
+ "btn-upload-file-selection": "Upload selected files",
+ "btn-upload-file": "Upload file",
+ "btn-upload-files": "Upload files",
+
+ "hdr-description": "Description",
+ "hdr-filename": "Filename",
+ "hdr-size": "Size",
+ "hdr-type": "Type",
+ "hdr-file-upload-wizzard": "File upload wizzard for ",
+ "msg-no-files-attached": "No files attached.",
+ "msg-confirm-delete-file-from-db": "Are you sure you want to delete the selected file from database?",
+
+ "ttl-attached-to": "Files attached to: ",
+ "ttl-confirmation": "Confirmation"
+ },
+ "file-explorer-nav-card": {
+ "status-node-is-no-files-attachable": "It is not possible to attach files to {{type}}s.",
+ "status-no-node-selected": "No node selected."
+ },
+ "file-link-editor-dialog": {
+ "btn-cancel": "Cancel",
+ "btn-save-changes": "Save",
+ "btn-change-file": "Change file"
+ }
}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/src/styles.css b/org.eclipse.mdm.application/src/main/webapp/src/styles.css
index 3933f90..d95fce8 100644
--- a/org.eclipse.mdm.application/src/main/webapp/src/styles.css
+++ b/org.eclipse.mdm.application/src/main/webapp/src/styles.css
@@ -25,7 +25,7 @@
.navbar {
font-size: 1em;
- margin-bottom: 1em;
+ margin-bottom: 0.5em;
padding: 0rem 1rem;
}
@@ -142,7 +142,7 @@
label {
display: inline-block;
max-width: 100%;
- margin-bottom: 5px;
+ margin-bottom: 0px;
margin-left: 3px;
margin-right: 3px;
font-weight: bold;
@@ -165,4 +165,66 @@
.mdm-link-list > li > a {
cursor: pointer;
color: #888;
-}
\ No newline at end of file
+}
+
+/**
+ Define style sheets for the MDM detail component viewer
+ All units in EM as they are scalable
+*/
+.mdm-details-attributes .ui-treetable-table thead > tr > th {
+ position: relative;
+}
+.mdm-details-attributes .ui-treetable-table thead > tr > th .inlinebuttons {
+ position: absolute;
+ right: 0.25em;
+ top: 0.25em;
+}
+.mdm-details-attributes .ui-treetable-table thead > tr > th .inlinebuttons button {
+ margin-left: 0.1em;
+}
+.mdm-details-attributes .ui-treetable-table tbody > tr > td {
+ position: relative;
+}
+.mdm-details-attributes .ui-treetable-table tbody > tr > td .inlinecontent {
+ position: absolute;
+ right: 0.25em;
+ top: 0.25em;
+}
+.mdm-details-attributes .ui-treetable-table tbody td {
+ line-height: 1;
+ padding: 0.15em 0.15em !important;
+}
+.mdm-details-attributes .ui-treetable-table tbody .mdm-component-row {
+ background-color: #e3e3e3;
+}
+
+.mainnavigation {
+ display: block;
+ position: relative;
+}
+.mainnavigation #leftsidenav .navbar {
+ margin-bottom: 0.5em !important;
+}
+.mainnavigation .split {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ overflow-y: auto;
+ overflow-x: hidden;
+ height: 100%;
+}
+.mainnavigation .gutter {
+ background-color: #eee;
+ background-repeat: no-repeat;
+ background-position: 50%;
+ margin-left: 2px;
+ width: 8px !important;
+}
+.mainnavigation .gutter.gutter-horizontal {
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAeCAYAAADkftS9AAAAIklEQVQoU2M4c+bMfxAGAgYYmwGrIIiDjrELjpo5aiZeMwF+yNnOs5KSvgAAAABJRU5ErkJggg==');
+}
+.mainnavigation .split,
+.mainnavigation .gutter.gutter-horizontal {
+ display: inline-block;
+ vertical-align: top;
+}
diff --git a/org.eclipse.mdm.application/src/main/webapp/tsconfig.json b/org.eclipse.mdm.application/src/main/webapp/tsconfig.json
index b271fd9..d8a9675 100644
--- a/org.eclipse.mdm.application/src/main/webapp/tsconfig.json
+++ b/org.eclipse.mdm.application/src/main/webapp/tsconfig.json
@@ -10,6 +10,14 @@
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true,
+ "paths": {
+ "@file-explorer/*": ["src/app/file-explorer/*"],
+ "@core/*": ["src/app/core/*"],
+ "@details/*": ["src/app/details/*"],
+ "@navigator/*": ["src/app/navigator/*"],
+ "@basket/*": ["src/app/basket/*"],
+ "@localization/*": ["src/app/localization/*"]
+ },
"target": "es5",
"typeRoots": [
"node_modules/@types"
diff --git a/org.eclipse.mdm.application/src/main/webapp/tslint.json b/org.eclipse.mdm.application/src/main/webapp/tslint.json
index ee67f6f..086e897 100644
--- a/org.eclipse.mdm.application/src/main/webapp/tslint.json
+++ b/org.eclipse.mdm.application/src/main/webapp/tslint.json
@@ -16,6 +16,7 @@
"import-spacing": true,
"indent": [
true,
+ "spaces",
2
],
"interface-over-type-literal": true,
@@ -27,8 +28,14 @@
"member-access": false,
"member-ordering": [
true,
- "static-before-instance",
- "variables-before-functions"
+ {
+ "order": [
+ "static-field",
+ "instance-field",
+ "static-method",
+ "instance-method"
+ ]
+ }
],
"no-arg": true,
"no-bitwise": true,
@@ -70,6 +77,7 @@
],
"radix": true,
"semicolon": [
+ true,
"always"
],
"triple-equals": [
diff --git a/org.eclipse.mdm.application/src/main/webconfig/glassfish-web.xml b/org.eclipse.mdm.application/src/main/webconfig/glassfish-web.xml
index 9726dca..764fd88 100644
--- a/org.eclipse.mdm.application/src/main/webconfig/glassfish-web.xml
+++ b/org.eclipse.mdm.application/src/main/webconfig/glassfish-web.xml
@@ -1,5 +1,5 @@
<!--********************************************************************************
- * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -10,17 +10,27 @@
*
* SPDX-License-Identifier: EPL-2.0
*
- ********************************************************************************-->
+ ********************************************************************************-->
<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD
GlassFish Application Server 3.1 Servlet 3.0//EN"
"http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
<glassfish-web-app>
- <context-root>/org.eclipse.mdm.nucleus</context-root>
- <security-role-mapping>
- <role-name>MDM</role-name>
- <group-name>MDM</group-name>
- </security-role-mapping>
+ <context-root>/org.eclipse.mdm.nucleus</context-root>
+ <security-role-mapping>
+ <role-name>Admin</role-name>
+ <group-name>Admin</group-name>
+ </security-role-mapping>
+
+ <security-role-mapping>
+ <role-name>DescriptiveDataAuthor</role-name>
+ <group-name>DescriptiveDataAuthor</group-name>
+ </security-role-mapping>
+
+ <security-role-mapping>
+ <role-name>Guest</role-name>
+ <group-name>Guest</group-name>
+ </security-role-mapping>
</glassfish-web-app>
diff --git a/org.eclipse.mdm.application/src/main/webconfig/web.xml b/org.eclipse.mdm.application/src/main/webconfig/web.xml
index 3f38a2a..1f9d321 100644
--- a/org.eclipse.mdm.application/src/main/webconfig/web.xml
+++ b/org.eclipse.mdm.application/src/main/webconfig/web.xml
@@ -1,5 +1,5 @@
<!--********************************************************************************
- * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -20,7 +20,9 @@
<url-pattern>/*</url-pattern>
</web-resource-collection>
<auth-constraint>
- <role-name>MDM</role-name>
+ <role-name>Admin</role-name>
+ <role-name>DescriptiveDataAuthor</role-name>
+ <role-name>Guest</role-name>
</auth-constraint>
</security-constraint>
@@ -50,7 +52,15 @@
</filter-mapping>
<security-role>
- <role-name>MDM</role-name>
+ <role-name>Admin</role-name>
+ </security-role>
+
+ <security-role>
+ <role-name>User</role-name>
+ </security-role>
+
+ <security-role>
+ <role-name>Guest</role-name>
</security-role>
<login-config>
diff --git a/org.eclipse.mdm.businessobjects/build.gradle b/org.eclipse.mdm.businessobjects/build.gradle
index dbb45ff..f4de9e0 100644
--- a/org.eclipse.mdm.businessobjects/build.gradle
+++ b/org.eclipse.mdm.businessobjects/build.gradle
@@ -22,8 +22,9 @@
dependencies {
compile project(':org.eclipse.mdm.connector')
- compileOnly 'com.fasterxml.jackson.core:jackson-databind:2.5.1'
+ compile 'com.fasterxml.jackson.core:jackson-databind:2.5.1'
compile 'io.vavr:vavr:0.9.1'
+ compile 'org.glassfish.jersey.media:jersey-media-multipart:2.23.2'
compile 'com.google.protobuf:protobuf-java:3.2.0'
compile 'com.google.protobuf:protobuf-java-util:3.2.0'
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationResource.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationResource.java
index 47fead1..ed3bc01 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationResource.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationResource.java
@@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*
- ********************************************************************************/
+ ********************************************************************************/
package org.eclipse.mdm.businessobjects.boundary;
@@ -29,7 +29,6 @@
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
-import org.eclipse.mdm.api.base.model.Environment;
import org.eclipse.mdm.api.base.model.TestStep;
import org.eclipse.mdm.api.dflt.model.Classification;
import org.eclipse.mdm.api.dflt.model.Domain;
@@ -43,6 +42,7 @@
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
import io.vavr.Value;
import io.vavr.collection.List;
import io.vavr.collection.Seq;
@@ -51,6 +51,9 @@
* @author Alexander Knoblauch
*
*/
+@Tag(name = "Status")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
@Path("/environments/{" + REQUESTPARAM_SOURCENAME + "}/classifications")
public class ClassificationResource {
@@ -60,18 +63,23 @@
@EJB
private ClassificationService classificationService;
+ @Parameter(description = "Name of the MDM datasource", required = true)
+ @PathParam(REQUESTPARAM_SOURCENAME)
+ private String sourceName;
+
/**
* delegates the request to the {@link EntityService}
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param id id of the {@link Classification}
+ * @param id id of the {@link Classification}
* @return the result of the delegated request as {@link Response}
*/
@GET
- @Produces(MediaType.APPLICATION_JSON)
+ @Operation(summary = "Find a Classification by ID", responses = {
+ @ApiResponse(description = "The Classification", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
@Path("/{" + REQUESTPARAM_ID + "}")
- public Response findClassification(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
- @PathParam(REQUESTPARAM_ID) String id) {
+ public Response findClassification(
+ @Parameter(description = "ID of the Classification", required = true) @PathParam(REQUESTPARAM_ID) String id) {
return entityService.find(V(sourceName), Classification.class, V(id))
.map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
.getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
@@ -80,19 +88,14 @@
/**
* Returns the created/existing {@link Classification}.
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param body The {@link Classification} to create.
+ * @param body The {@link Classification} to create.
* @return the created {@link TestStep} as {@link Response}.
*/
@POST
- @Operation(summary = "Create a new Classification or return if already exists", responses = {
+ @Operation(summary = "Create a new Classification or return a existing Classification which references the same Status, ProjectDomain and Domain.", responses = {
@ApiResponse(description = "The created Classification", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
@ApiResponse(responseCode = "500", description = "Error") })
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- public Response create(
- @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
- String body) {
+ public Response createOrFind(String body) {
Seq<Value<?>> extractRequestBody = entityService.extractRequestBody(body, sourceName, io.vavr.collection.List
.of(org.eclipse.mdm.api.dflt.model.Status.class, ProjectDomain.class, Domain.class));
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationService.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationService.java
index 5a4fc74..b26cd3c 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationService.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ClassificationService.java
@@ -10,9 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
-/**
- *
- */
+
package org.eclipse.mdm.businessobjects.boundary;
import java.util.Optional;
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ContextFilesSubresource.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ContextFilesSubresource.java
new file mode 100644
index 0000000..c38dd3a
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ContextFilesSubresource.java
@@ -0,0 +1,191 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.mdm.businessobjects.boundary;
+
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_ATTRIBUTENAME;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_CONTEXTCOMPONENTNAME;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_CONTEXTTYPE;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_ID;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_REMOTEPATH;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_SOURCENAME;
+import static org.eclipse.mdm.businessobjects.service.EntityService.V;
+
+import java.io.InputStream;
+
+import javax.ejb.EJB;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.eclipse.mdm.api.base.model.ContextDescribable;
+import org.eclipse.mdm.api.base.model.ContextType;
+import org.eclipse.mdm.api.base.model.Environment;
+import org.eclipse.mdm.api.base.model.FileLink;
+import org.eclipse.mdm.api.base.model.MimeType;
+import org.eclipse.mdm.api.base.model.TestStep;
+import org.eclipse.mdm.businessobjects.control.FileLinkActivity;
+import org.eclipse.mdm.businessobjects.entity.FileSize;
+import org.eclipse.mdm.businessobjects.entity.MDMEntityResponse;
+import org.eclipse.mdm.businessobjects.entity.MDMFileLink;
+import org.eclipse.mdm.businessobjects.service.EntityService;
+import org.eclipse.mdm.businessobjects.utils.Serializer;
+import org.eclipse.mdm.businessobjects.utils.ServiceUtils;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.vavr.Tuple;
+
+/**
+ * context files subresource
+ *
+ * @author Johannes Stamm, peak-Solution GmbH
+ *
+ */
+public class ContextFilesSubresource {
+
+ @EJB
+ private FileLinkActivity fileLinkActivity;
+
+ @EJB
+ private EntityService entityService;
+
+ private Class<? extends ContextDescribable> contextDescribableClass;
+
+ /**
+ * Set the Entity class of the parent resource. This method has to be called
+ * right after the resource was initialized by the container. The entity class
+ * is used to distinguish the type of the parent resource.
+ *
+ * This method is package-private to workaround an issue in WELD complaining
+ * about: Parameter 1 of type ... is not resolvable to a concrete type.
+ *
+ * @param contextDescribableClass the Entity class of the parent resource
+ */
+ void setEntityClass(Class<? extends ContextDescribable> contextDescribableClass) {
+ this.contextDescribableClass = contextDescribableClass;
+ }
+
+ /**
+ * Creates new {@link FileLink} for {@link TestStep}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param body The {@link FileLink} to create.
+ * @return
+ */
+ @POST
+ @Operation(summary = "Creates a new file on a context attribute.", responses = {
+ @ApiResponse(description = "The stored file link.", content = @Content(schema = @Schema(implementation = MDMFileLink.class))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ public Response createFile(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the parent ContextDescribable", required = true) @PathParam(REQUESTPARAM_ID) String contextDescribableId,
+ @Parameter(description = "ContextType of the Component holding the attribute with the FileLink", required = true) @PathParam(REQUESTPARAM_CONTEXTTYPE) ContextType contextType,
+ @Parameter(description = "Name of the ContextComponent holding the attribute with the FileLink", required = true) @PathParam(REQUESTPARAM_CONTEXTCOMPONENTNAME) String contextComponentName,
+ @Parameter(description = "Name of the Attribute holding the FileLink", required = true) @PathParam(REQUESTPARAM_ATTRIBUTENAME) String attributeName,
+ @Parameter(description = "InputStream containing file data", required = true) @FormDataParam("file") InputStream fileInputStream,
+ @Parameter(description = "Meta data describing file", required = true) @FormDataParam("file") FormDataContentDisposition cdh,
+ @Parameter(description = "File description", required = true) @FormDataParam("description") String description,
+ @Parameter(description = "Mimetype of the file", required = true) @FormDataParam("mimeType") MimeType mimeType) {
+
+ return entityService.find(V(sourceName), contextDescribableClass, V(contextDescribableId))
+ .map(contextDescribable -> fileLinkActivity.createFile(sourceName, contextDescribable,
+ cdh.getFileName(), fileInputStream, description, mimeType, contextType, contextComponentName,
+ attributeName))
+ .map(fileLink -> ServiceUtils.toResponse(Serializer.serializeFileLink(fileLink), Status.OK))
+ .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ @GET
+ @Operation(summary = "Stream the contents of a file link", responses = {
+ @ApiResponse(description = "The content of the file link as a stream. MimeType is set to that of the file link.", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID or remote path supplied") })
+ @Path("/{" + REQUESTPARAM_REMOTEPATH + "}")
+ public Response streamFileLink(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the parent ContextDescribable", required = true) @PathParam(REQUESTPARAM_ID) String contextDescribableId,
+ @Parameter(description = "ContextType of the Component holding the attribute with the FileLink", required = true) @PathParam(REQUESTPARAM_CONTEXTTYPE) ContextType contextType,
+ @Parameter(description = "Name of the ContextComponent holding the attribute with the FileLink", required = true) @PathParam(REQUESTPARAM_CONTEXTCOMPONENTNAME) String contextComponentName,
+ @Parameter(description = "Name of the Attribute holding the FileLink", required = true) @PathParam(REQUESTPARAM_ATTRIBUTENAME) String attributeName,
+ @Parameter(description = "The remote path of the file link whose content is to be retrieved", required = true) @PathParam(REQUESTPARAM_REMOTEPATH) String remotePath) {
+ return entityService.find(V(sourceName), contextDescribableClass, V(contextDescribableId))
+ .map(contextDescribable -> Tuple.of(contextDescribable,
+ fileLinkActivity.findFileLinkInContext(remotePath, sourceName, contextDescribable, contextType,
+ contextComponentName, attributeName)))
+ .map(tuple -> Tuple.of(fileLinkActivity.toStreamingOutput(sourceName, tuple._1, tuple._2),
+ tuple._2.getMimeType().toString()))
+ .map(tuple -> Response.ok(tuple._1, tuple._2).build()).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
+ .getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ @GET
+ @Operation(summary = "Returns the size of a file in bytes.", responses = {
+ @ApiResponse(description = "The file size of the requested remote path.", content = @Content(schema = @Schema(implementation = FileSize.class))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/size/{" + REQUESTPARAM_REMOTEPATH + "}")
+ public Response loadFileSize(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the parent ContextDescribable", required = true) @PathParam(REQUESTPARAM_ID) String contextDescribableId,
+ @Parameter(description = "The remote path of the file link whose content is to be retrieved", required = true) @PathParam(REQUESTPARAM_REMOTEPATH) String remotePath) {
+
+ return entityService.find(V(sourceName), contextDescribableClass, V(contextDescribableId))
+ .map(contextDescribabale -> fileLinkActivity.loadFileSize(sourceName, contextDescribabale,
+ FileLink.newRemote(remotePath, null, null)))
+ .map(fileSize -> Response.ok(fileSize).build()).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
+ .getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Deletes attached file from {@link ContextDescirbable}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id The identifier of the {@link ContextDescirbable} which
+ * contains the {@link FileLink}
+ * @param remotePath The remote path of the {@link FileLink} to delete.
+ * @return
+ */
+ @DELETE
+ @Operation(summary = "Deletes an attached file from a context attribute.", responses = {
+ @ApiResponse(description = "The deleted file link", content = @Content(schema = @Schema(implementation = MDMFileLink.class))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/{" + REQUESTPARAM_REMOTEPATH + "}")
+ public Response deleteFile(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the parent ContextDescribable", required = true) @PathParam(REQUESTPARAM_ID) String contextDescribableId,
+ @Parameter(description = "ContextType of the Component holding the attribute with the FileLink", required = true) @PathParam(REQUESTPARAM_CONTEXTTYPE) ContextType contextType,
+ @Parameter(description = "Name of the ContextComponent holding the attribute with the FileLink", required = true) @PathParam(REQUESTPARAM_CONTEXTCOMPONENTNAME) String contextComponentName,
+ @Parameter(description = "Name of the Attribute holding the FileLink", required = true) @PathParam(REQUESTPARAM_ATTRIBUTENAME) String attributeName,
+ @Parameter(description = "The remote path of the file link whose content is to be retrieved", required = true) @PathParam(REQUESTPARAM_REMOTEPATH) String remotePath) {
+
+ return entityService.find(V(sourceName), contextDescribableClass, V(contextDescribableId))
+ .map(contextDescribable -> fileLinkActivity.deleteFileLink(sourceName, contextDescribable, contextType,
+ contextComponentName, attributeName, remotePath))
+ .map(fileLink -> ServiceUtils.toResponse(Serializer.serializeFileLink(fileLink), Status.OK))
+ .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ExtSystemResource.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ExtSystemResource.java
new file mode 100644
index 0000000..09f518f
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ExtSystemResource.java
@@ -0,0 +1,359 @@
+/********************************************************************************
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+package org.eclipse.mdm.businessobjects.boundary;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.vavr.collection.List;
+import io.vavr.control.Try;
+import org.eclipse.mdm.api.base.model.*;
+import org.eclipse.mdm.api.dflt.model.ExtSystem;
+import org.eclipse.mdm.api.dflt.model.ExtSystemAttribute;
+import org.eclipse.mdm.api.dflt.model.MDMAttribute;
+import org.eclipse.mdm.api.dflt.model.ValueList;
+import org.eclipse.mdm.businessobjects.control.FileLinkActivity;
+import org.eclipse.mdm.businessobjects.entity.*;
+import org.eclipse.mdm.businessobjects.service.ContextService;
+import org.eclipse.mdm.businessobjects.service.EntityService;
+import org.eclipse.mdm.businessobjects.utils.RequestBody;
+import org.eclipse.mdm.businessobjects.utils.ServiceUtils;
+
+import javax.ejb.EJB;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_ID;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_SOURCENAME;
+import static org.eclipse.mdm.businessobjects.service.EntityService.V;
+
+/**
+ * {@link MDMEntity} REST interface for external systems
+ *
+ * @author Juergen Kleck, Peak Solution GmbH
+ *
+ */
+@Tag(name = "ExtSystem")
+@Path("/administration/{" + REQUESTPARAM_SOURCENAME + "}/externalsystems")
+public class ExtSystemResource {
+
+ @EJB
+ private ExtSystemService extSystemService;
+
+ @EJB
+ private EntityService entityService;
+
+ @EJB
+ private ContextService contextService;
+
+ @EJB
+ private FileLinkActivity fileLinkActivity;
+
+
+ /**
+ * delegates the request to the {@link ExtSystemService}
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param filter filter string to filter the ExtSystem result
+ * @return the result of the delegated request as {@link Response}
+ */
+ @GET
+ @Operation(summary = "Find ExtSystems by filter", description = "Get list of ExtSystems", responses = {
+ @ApiResponse(description = "The ExtSystems", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response getExtSystems(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName) {
+
+ return Try.of(() -> extSystemService.getExtSystems(sourceName)).map(List::ofAll).map(e -> ServiceUtils.buildEntityResponse(e, Status.OK, ExtSystem.class))
+ .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
+ .getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * delegates the request to the {@link ExtSystemService}
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param filter filter string to filter the ExtSystem result
+ * @return the result of the delegated request as {@link Response}
+ */
+ @GET
+ @Operation(summary = "Find ExtSystems by filter", description = "Get list of ExtSystems", responses = {
+ @ApiResponse(description = "The ExtSystems", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/attributes/{" + REQUESTPARAM_ID + "}")
+ public Response getExtSystemAttributes(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the ExtSystem", required = true) @PathParam(REQUESTPARAM_ID) String id) {
+
+ java.util.List all = new java.util.ArrayList<>();
+ java.util.List extSystems = extSystemService.getExtSystemAttributes(sourceName, id);
+ // the ext. system attributes
+ all.addAll(extSystems);
+ // the mdm attributes
+ extSystems.stream().forEach(e -> all.addAll(((ExtSystemAttribute) e).getAttributes()));
+
+ return ServiceUtils.buildEntityResponse(List.ofAll(all), Status.OK, ExtSystemAttribute.class);
+ }
+
+ /**
+ * delegates the request to the {@link ExtSystemService}
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id id of the {@link MDMEntity}
+ * @return the result of the delegated request as {@link Response}
+ */
+ @GET
+ @Operation(summary = "Find a ExtSystem by ID", description = "Returns ExtSystem based on ID", responses = {
+ @ApiResponse(description = "The Project", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/{" + REQUESTPARAM_ID + "}")
+ public Response findExtSystem(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the ExtSystem", required = true) @PathParam(REQUESTPARAM_ID) String id) {
+ return entityService.find(V(sourceName), ExtSystem.class, V(id))
+ .map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
+ .getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Returns the created {@link MDMEntity}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param body The {@link MDMEntity} to create.
+ * @return the created {@link MDMEntity} as {@link Response}.
+ */
+ @POST
+ @Operation(summary = "Create a new ExtSystem", responses = {
+ @ApiResponse(description = "The created ExtSystem", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public Response createExtSystem(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName, String body) {
+
+ return entityService
+ .create(V(sourceName), ExtSystem.class,
+ entityService.extractRequestBody(body, sourceName, List.of(ExtSystem.class)))
+ .map(e -> ServiceUtils.buildEntityResponse(e, Status.CREATED))
+ .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Returns the created {@link MDMEntity}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param body The {@link MDMEntity} to create.
+ * @return the created {@link MDMEntity} as {@link Response}.
+ */
+ @POST
+ @Operation(summary = "Create a new ExtSystem", responses = {
+ @ApiResponse(description = "The created ExtSystem", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Path("/attribute")
+ public Response createExtSystemAttribute(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName, String body) {
+
+ return entityService
+ .create(V(sourceName), ExtSystemAttribute.class,
+ entityService.extractRequestBody(body, sourceName, List.of(ExtSystem.class, ExtSystemAttribute.class)))
+ .map(e -> ServiceUtils.buildEntityResponse(e, Status.CREATED))
+ .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Returns the created {@link MDMEntity}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param body The {@link MDMEntity} to create.
+ * @return the created {@link MDMEntity} as {@link Response}.
+ */
+ @POST
+ @Operation(summary = "Create a new ExtSystem", responses = {
+ @ApiResponse(description = "The created ExtSystem", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Path("/mdmattribute")
+ public Response createMDMAttribute(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName, String body) {
+
+ return entityService
+ .create(V(sourceName), MDMAttribute.class,
+ entityService.extractRequestBody(body, sourceName, List.of(ExtSystemAttribute.class, MDMAttribute.class)))
+ .map(e -> ServiceUtils.buildEntityResponse(e, Status.CREATED))
+ .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Updates the {@link MDMEntity} with all parameters set in the given JSON
+ * body of the request.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id the identifier of the {@link MDMEntity} to update.
+ * @param body the body of the request containing the attributes to update
+ * @return the updated {@link MDMEntity}
+ */
+ @PUT
+ @Operation(summary = "Update an existing ExtSystem", description = "Updates the ExtSystem with all parameters set in the body of the request.", responses = {
+ @ApiResponse(description = "The updated ExtSystem", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Path("/{" + REQUESTPARAM_ID + "}")
+ public Response updateExtSystem(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the ExtSystem", required = true) @PathParam(REQUESTPARAM_ID) String id,
+ String body) {
+ RequestBody requestBody = RequestBody.create(body);
+
+ return entityService
+ .update(V(sourceName), entityService.find(V(sourceName), ExtSystem.class, V(id)),
+ requestBody.getValueMapSupplier())
+ .map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
+ .getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Updates the {@link MDMEntity} with all parameters set in the given JSON
+ * body of the request.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id the identifier of the {@link MDMEntity} to update.
+ * @param body the body of the request containing the attributes to update
+ * @return the updated {@link MDMEntity}
+ */
+ @PUT
+ @Operation(summary = "Update an existing ExtSystem", description = "Updates the ExtSystem with all parameters set in the body of the request.", responses = {
+ @ApiResponse(description = "The updated ExtSystem", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Path("/attribute/{" + REQUESTPARAM_ID + "}")
+ public Response updateExtSystemAttribute(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the ExtSystem", required = true) @PathParam(REQUESTPARAM_ID) String id,
+ String body) {
+ RequestBody requestBody = RequestBody.create(body);
+
+ return entityService
+ .update(V(sourceName), entityService.find(V(sourceName), ExtSystemAttribute.class, V(id)),
+ requestBody.getValueMapSupplier())
+ .map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
+ .getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Updates the {@link MDMEntity} with all parameters set in the given JSON
+ * body of the request.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id the identifier of the {@link MDMEntity} to update.
+ * @param body the body of the request containing the attributes to update
+ * @return the updated {@link MDMEntity}
+ */
+ @PUT
+ @Operation(summary = "Update an existing ExtSystem", description = "Updates the ExtSystem with all parameters set in the body of the request.", responses = {
+ @ApiResponse(description = "The updated ExtSystem", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Path("/mdmattribute/{" + REQUESTPARAM_ID + "}")
+ public Response updateMDMAttribute(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the ExtSystem", required = true) @PathParam(REQUESTPARAM_ID) String id,
+ String body) {
+ RequestBody requestBody = RequestBody.create(body);
+
+ return entityService
+ .update(V(sourceName), entityService.find(V(sourceName), MDMAttribute.class, V(id)),
+ requestBody.getValueMapSupplier())
+ .map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
+ .getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Deletes and returns the deleted {@link MDMEntity}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id The identifier of the {@link MDMEntity} to delete.
+ * @return the deleted {@link ValueList }s as {@link Response}
+ */
+ @DELETE
+ @Operation(summary = "Delete an existing ExtSystem", responses = {
+ @ApiResponse(description = "The deleted ExtSystem", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/{" + REQUESTPARAM_ID + "}")
+ public Response deleteExtSystem(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the ExtSystem", required = true) @PathParam(REQUESTPARAM_ID) String id) {
+ return entityService.delete(V(sourceName), entityService.find(V(sourceName), ExtSystem.class, V(id)))
+ .map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
+ .getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Deletes and returns the deleted {@link MDMEntity}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id The identifier of the {@link MDMEntity} to delete.
+ * @return the deleted {@link ValueList }s as {@link Response}
+ */
+ @DELETE
+ @Operation(summary = "Delete an existing ExtSystem", responses = {
+ @ApiResponse(description = "The deleted ExtSystem", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/attribute/{" + REQUESTPARAM_ID + "}")
+ public Response deleteExtSystemAttribute(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the ExtSystem", required = true) @PathParam(REQUESTPARAM_ID) String id) {
+ return entityService.delete(V(sourceName), entityService.find(V(sourceName), ExtSystemAttribute.class, V(id)))
+ .map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
+ .getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Deletes and returns the deleted {@link MDMEntity}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id The identifier of the {@link MDMEntity} to delete.
+ * @return the deleted {@link ValueList }s as {@link Response}
+ */
+ @DELETE
+ @Operation(summary = "Delete an existing ExtSystem", responses = {
+ @ApiResponse(description = "The deleted ExtSystem", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/mdmattribute/{" + REQUESTPARAM_ID + "}")
+ public Response deleteMDMAttribute(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the ExtSystem", required = true) @PathParam(REQUESTPARAM_ID) String id) {
+ return entityService.delete(V(sourceName), entityService.find(V(sourceName), MDMAttribute.class, V(id)))
+ .map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
+ .getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ExtSystemService.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ExtSystemService.java
new file mode 100644
index 0000000..9049ac9
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ExtSystemService.java
@@ -0,0 +1,105 @@
+/********************************************************************************
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+package org.eclipse.mdm.businessobjects.boundary;
+
+import org.eclipse.mdm.api.base.model.*;
+import org.eclipse.mdm.api.base.query.DataAccessException;
+import org.eclipse.mdm.api.dflt.EntityManager;
+import org.eclipse.mdm.api.dflt.model.ExtSystem;
+import org.eclipse.mdm.api.dflt.model.ExtSystemAttribute;
+import org.eclipse.mdm.businessobjects.control.*;
+import org.eclipse.mdm.connector.boundary.ConnectorService;
+
+import javax.ejb.Stateless;
+import javax.inject.Inject;
+import java.util.*;
+
+/**
+ * ExtSystemService Bean implementation with available
+ * operations
+ *
+ * @author Juergen Kleck, Peak Solution GmbH
+ *
+ */
+@Stateless
+public class ExtSystemService {
+
+ @Inject
+ private ConnectorService connectorService;
+
+ /**
+ * returns the matching {@link ExtSystem}s using the given filter or all
+ * {@link ExtSystem}s if no filter is available
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @return the found {@link ExtSystem}s
+ */
+ public List<ExtSystem> getExtSystems(String sourceName) {
+ List<ExtSystem> list = new ArrayList<>();
+ try {
+ Optional<List<ExtSystem>> values = this.connectorService.getContextByName(sourceName).getEntityManager()
+ .map(em -> em.loadAll(ExtSystem.class));
+
+ if(values.isPresent()) {
+ list = values.get();
+ }
+ } catch (DataAccessException e) {
+ throw new MDMEntityAccessException(e.getMessage(), e);
+ }
+ return list;
+ }
+
+ /**
+ * returns a {@link ExtSystem} identified by the given id.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param extSystemId id of the {@link ExtSystem}
+ * @return the matching {@link ExtSystem}
+ */
+ public ExtSystem getExtSystem(String sourceName, String extSystemId) {
+ try {
+ EntityManager em = this.connectorService.getContextByName(sourceName).getEntityManager()
+ .orElseThrow(() -> new MDMEntityAccessException("Entity manager not present!"));
+ return em.load(ExtSystem.class, extSystemId);
+ } catch (DataAccessException e) {
+ throw new MDMEntityAccessException(e.getMessage(), e);
+ }
+ }
+
+ /**
+ * returns the matching {@link ExtSystemAttribute}s using the given filter or all
+ * {@link ExtSystemAttribute}s if no filter is available
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id the id of the external system
+ * @return the found {@link ExtSystemAttribute}s
+ */
+ public List<ExtSystemAttribute> getExtSystemAttributes(String sourceName, String id) {
+ List<ExtSystemAttribute> list = new ArrayList<>();
+ try {
+
+ Optional<List<ExtSystemAttribute>> values = this.connectorService.getContextByName(sourceName).getEntityManager()
+ .map(em -> em.loadChildren(em.load(ExtSystem.class, id), ExtSystemAttribute.class));
+
+ if(values.isPresent()) {
+ list = values.get();
+ }
+ } catch (DataAccessException e) {
+ throw new MDMEntityAccessException(e.getMessage(), e);
+ }
+ return list;
+ }
+
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/FilesAttachableSubresource.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/FilesAttachableSubresource.java
new file mode 100644
index 0000000..5049624
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/FilesAttachableSubresource.java
@@ -0,0 +1,225 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.mdm.businessobjects.boundary;
+
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_ID;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_REMOTEPATH;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_SOURCENAME;
+import static org.eclipse.mdm.businessobjects.service.EntityService.V;
+
+import java.io.InputStream;
+
+import javax.ejb.EJB;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
+import org.eclipse.mdm.api.base.model.Environment;
+import org.eclipse.mdm.api.base.model.FileLink;
+import org.eclipse.mdm.api.base.model.FilesAttachable;
+import org.eclipse.mdm.api.base.model.MimeType;
+import org.eclipse.mdm.businessobjects.control.FileLinkActivity;
+import org.eclipse.mdm.businessobjects.entity.FileSize;
+import org.eclipse.mdm.businessobjects.entity.MDMEntityResponse;
+import org.eclipse.mdm.businessobjects.entity.MDMFileLink;
+import org.eclipse.mdm.businessobjects.service.EntityService;
+import org.eclipse.mdm.businessobjects.utils.Serializer;
+import org.eclipse.mdm.businessobjects.utils.ServiceUtils;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.vavr.Tuple;
+
+/**
+ * Subresource for {@link FilesAttachable}s.
+ *
+ * @author Johannes Stamm, peak-Solution GmbH
+ *
+ */
+public class FilesAttachableSubresource {
+
+ @EJB
+ private EntityService entityService;
+
+ @EJB
+ private FileLinkActivity fileLinkActivity;
+
+ private Class<? extends FilesAttachable> fileAttachableClass;
+
+ /**
+ * Set the Entity class of the parent resource. This method has to be called
+ * right after the resource was initialized by the container. The entity class
+ * is used to distinguish the type of the parent resource.
+ *
+ * This method is package-private to workaround an issue in WELD complaining
+ * about: Parameter 1 of type ... is not resolvable to a concrete type.
+ *
+ * @param fileAttachableClass the Entity class of the parent resource
+ */
+ void setEntityClass(Class<? extends FilesAttachable> fileAttachableClass) {
+ this.fileAttachableClass = fileAttachableClass;
+ }
+
+ /**
+ * Stream the contents of a file link.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id The identifier of the {@link FilesAttachable} which
+ * contains the {@link FileLink}
+ * @param remotePath The remote path of the {@link FileLink} to identify, which
+ * {@link FileLink}'s content is requests.
+ * @return The content of the file as {@link javax.ws.rs.core.StreamingOutput}.
+ * The response also has the MimeType set according to
+ * {@link FileLink#getMimeType()}.
+ */
+ @GET
+ @Operation(summary = "Stream the contents of a file link", responses = {
+ @ApiResponse(description = "The content of the file link as a stream. MimeType is set to that of the file link.", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID or remote path supplied") })
+ @Path("/{" + REQUESTPARAM_REMOTEPATH + "}")
+ public Response streamFileLink(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the Test containing the file link", required = true) @PathParam(REQUESTPARAM_ID) String id,
+ @Parameter(description = "The remote path of the file link whose content is to be retrieved", required = true) @PathParam(REQUESTPARAM_REMOTEPATH) String remotePath) {
+
+ return entityService.find(V(sourceName), fileAttachableClass, V(id))
+ .map(filesAttachable -> Tuple.of(filesAttachable,
+ fileLinkActivity.findFileLinkAtFileAttachable(remotePath, filesAttachable)))
+ .map(tuple -> Tuple.of(fileLinkActivity.toStreamingOutput(sourceName, tuple._1, tuple._2),
+ tuple._2.getMimeType().toString()))
+ .map(tuple -> Response.ok(tuple._1, tuple._2).build()).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
+ .getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Deletes attached file from {@link FilesAttachable}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id The identifier of the {@link FilesAttachable} which
+ * contains the {@link FileLink}
+ * @param remotePath The remote path of the {@link FileLink} to delete.
+ * @return
+ */
+ @DELETE
+ @Operation(summary = "Deletes an attached file.", responses = {
+ @ApiResponse(description = "The deleted file link", content = @Content(schema = @Schema(implementation = MDMFileLink.class))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/{" + REQUESTPARAM_REMOTEPATH + "}")
+ public Response deleteFile(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the FilesAttachable containing the file link", required = true) @PathParam(REQUESTPARAM_ID) String id,
+ @Parameter(description = "The remote path of the file link whose content is to be retrieved", required = true) @PathParam(REQUESTPARAM_REMOTEPATH) String remotePath) {
+
+ return entityService.find(V(sourceName), fileAttachableClass, V(id))
+ .map(fileAttachable -> fileLinkActivity.deleteFileLink(sourceName, fileAttachable, remotePath))
+ .map(fileLink -> ServiceUtils.toResponse(Serializer.serializeFileLink(fileLink), Status.OK))
+ .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Creates new {@link FileLink} for {@link FilesAttachable}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param body The {@link FileLink} to create.
+ * @return
+ */
+ @POST
+ @Operation(summary = "Attaches a new file.", responses = {
+ @ApiResponse(description = "The stored file link.", content = @Content(schema = @Schema(implementation = MDMFileLink.class))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ public Response createFile(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the FilesAttachable containing the file link", required = true) @PathParam(REQUESTPARAM_ID) String id,
+ @Parameter(description = "InputStream containing file data", required = true) @FormDataParam("file") InputStream fileInputStream,
+ @Parameter(description = "Meta data describing file", required = true) @FormDataParam("file") FormDataContentDisposition cdh,
+ @Parameter(description = "File description", required = true) @FormDataParam("description") String description,
+ @Parameter(description = "Mimetype of the file", required = true) @FormDataParam("mimeType") MimeType mimeType) {
+
+ return entityService.find(V(sourceName), fileAttachableClass, V(id))
+ .map(fileAttachable -> fileLinkActivity.createFile(sourceName, fileAttachable, cdh.getFileName(),
+ fileInputStream, description, mimeType))
+ .map(fileLink -> ServiceUtils.toResponse(Serializer.serializeFileLink(fileLink), Status.OK))
+ .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Load the file size of a file link.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id The identifier of the {@link FilesAttachable} which
+ * contains the {@link FileLink}
+ * @param remotePath The remote path of the {@link FileLink} to identify, which
+ * {@link FileLink}'s content is requests.
+ * @return The serialized {@link FileLink} with the size.
+ */
+ @GET
+ @Operation(summary = "Returns the file size of file link.", responses = {
+ @ApiResponse(description = "The file size of the requested file link.", content = @Content(schema = @Schema(implementation = FileSize.class))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/size/{" + REQUESTPARAM_REMOTEPATH + "}")
+ public Response loadFileSize(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "The identifier of the FilesAttachable containing the file links", required = true) @PathParam(REQUESTPARAM_ID) String id,
+ @Parameter(description = "The remote path of the file link whose size is to be retrieved", required = true) @PathParam(REQUESTPARAM_REMOTEPATH) String remotePath) {
+
+ return entityService.find(V(sourceName), fileAttachableClass, V(id))
+ .map(filesAttachable -> Tuple.of(filesAttachable,
+ fileLinkActivity.findFileLinkAtFileAttachable(remotePath, filesAttachable)))
+ .map(tuple -> fileLinkActivity.loadFileSize(sourceName, tuple._1, tuple._2))
+ .map(fileSize -> ServiceUtils.toResponse(fileSize, Status.OK))
+ .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
+ /**
+ * Load the file sizes for all {@link FileLink}s of the {@link FilesAttachable}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id The identifier of the {@link FilesAttachable} which
+ * contains the {@link FileLink}
+ * @param remotePath The remote path of the {@link FileLink} to identify, which
+ * {@link FileLink}'s content is requests.
+ * @return The serialized {@link FileLink} with the size.
+ */
+ @GET
+ @Operation(summary = "Returns the sizes of all file links attached to a FilesAttachable.", responses = {
+ @ApiResponse(description = "The file size of the requested file link.", content = @Content(array = @ArraySchema(schema = @Schema(implementation = FileSize.class)))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/sizes")
+ public Response loadFileSizes(
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "ID of the FilesAttachable containing the file link", required = true) @PathParam(REQUESTPARAM_ID) String id) {
+
+ return entityService.find(V(sourceName), fileAttachableClass, V(id))
+ .map(filesAttachable -> fileLinkActivity.loadFileSizes(sourceName, filesAttachable))
+ .map(fileSizes -> ServiceUtils.toResponse(fileSizes, Status.OK))
+ .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementResource.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementResource.java
index a676844..a29e890 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementResource.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/MeasurementResource.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -14,6 +14,9 @@
package org.eclipse.mdm.businessobjects.boundary;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_ATTRIBUTENAME;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_CONTEXTCOMPONENTNAME;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_CONTEXTTYPE;
import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_ID;
import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_SOURCENAME;
import static org.eclipse.mdm.businessobjects.service.EntityService.V;
@@ -28,6 +31,8 @@
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
@@ -35,7 +40,6 @@
import org.eclipse.mdm.api.base.model.ContextRoot;
import org.eclipse.mdm.api.base.model.ContextType;
import org.eclipse.mdm.api.base.model.Environment;
-import org.eclipse.mdm.api.base.model.FileLink;
import org.eclipse.mdm.api.base.model.Measurement;
import org.eclipse.mdm.api.base.model.TestStep;
import org.eclipse.mdm.api.dflt.model.ValueList;
@@ -46,7 +50,6 @@
import org.eclipse.mdm.businessobjects.entity.MDMEntityResponse;
import org.eclipse.mdm.businessobjects.entity.SearchAttributeResponse;
import org.eclipse.mdm.businessobjects.service.ContextService;
-import org.eclipse.mdm.businessobjects.service.EntityFileLink;
import org.eclipse.mdm.businessobjects.service.EntityService;
import org.eclipse.mdm.businessobjects.utils.RequestBody;
import org.eclipse.mdm.businessobjects.utils.ServiceUtils;
@@ -84,6 +87,9 @@
@EJB
private FileLinkActivity fileLinkActivity;
+ @Context
+ private ResourceContext resourceContext;
+
/**
* delegates the request to the {@link MeasurementService}
*
@@ -154,6 +160,9 @@
* @return the result of the delegated request as {@link Response}
*/
@GET
+ @Operation(summary = "Get the complete context data for a Mesurement", description = "Returns the complete context", responses = {
+ @ApiResponse(responseCode = "200", description = "The Measurement context data", content = @Content(schema = @Schema(implementation = ContextResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
@Produces(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts")
public Response findContext(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@@ -194,6 +203,9 @@
* @return the result of the delegated request as {@link Response}
*/
@GET
+ @Operation(summary = "Get the UnitUnderTest context data for a Measurment", description = "Returns the complete context", responses = {
+ @ApiResponse(responseCode = "200", description = "The UnitUnderTest context data", content = @Content(schema = @Schema(implementation = ContextResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
@Produces(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts/unitundertest")
public Response findContextUUT(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@@ -237,6 +249,9 @@
* @return the result of the delegated request as {@link Response}
*/
@GET
+ @Operation(summary = "Get the TestSequence context data for a Measurement", description = "Returns the TestSequence context data", responses = {
+ @ApiResponse(responseCode = "200", description = "The TestSequence context data", content = @Content(schema = @Schema(implementation = ContextResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
@Produces(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts/testsequence")
public Response findContextTSQ(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@@ -280,6 +295,9 @@
* @return the result of the delegated request as {@link Response}
*/
@GET
+ @Operation(summary = "Get the TestEquipment context data for a Measurement", description = "Returns the TestEquipment context data", responses = {
+ @ApiResponse(responseCode = "200", description = "The TestEquipment context data", content = @Content(schema = @Schema(implementation = ContextResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
@Produces(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts/testequipment")
public Response findContextTEQ(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@@ -323,6 +341,9 @@
* @return the result of the delegated request as {@link Response}
*/
@GET
+ @Operation(summary = "Get the Sensor context data", description = "Returns the Sensor context data of TestEquipments", responses = {
+ @ApiResponse(responseCode = "200", description = "The Sensor context data", content = @Content(schema = @Schema(implementation = ContextResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
@Produces(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts/testequipment/sensors")
public Response getContextTEQSensors(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@@ -363,13 +384,14 @@
* @return the created {@link Measurement} as {@link Response}.
*/
@POST
- @Operation(summary = "Create a new Measurement", responses = {
+ @Operation(summary = "Create a new Measurement", responses = {
@ApiResponse(description = "The created Measurement", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
@ApiResponse(responseCode = "500", description = "Error") })
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public Response create(
- @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName, String body) {
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ String body) {
Seq<Value<?>> args = entityService
.extractRequestBody(body, sourceName, io.vavr.collection.List.of(TestStep.class))
.append(V(new ContextRoot[] {}));
@@ -395,7 +417,7 @@
@Consumes(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}")
public Response update(
- @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@Parameter(description = "ID of the Measurement", required = true) @PathParam(REQUESTPARAM_ID) String id,
String body) {
RequestBody requestBody = RequestBody.create(body);
@@ -428,31 +450,18 @@
.getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
}
- /**
- * Stream the contents of a file link.
- *
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param id The identifier of the {@link Measurement} which contains
- * the {@link FileLink}
- * @param remotePath The remote path of the {@link FileLink} to identify, which
- * {@link FileLink}'s content is requests.
- * @return The content of the file as {@link javax.ws.rs.core.StreamingOutput}.
- * The response also has the MimeType set according to
- * {@link FileLink#getMimeType()}.
- */
- @GET
- @Operation(summary = "Stream the contents of a file link", responses = {
- @ApiResponse(description = "The content of the file link as a stream. MimeType is set to that of the file link.", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
- @ApiResponse(responseCode = "400", description = "Invalid ID or remote path supplied") })
- @Path("/{" + REQUESTPARAM_ID + "}/files/{remotePath}")
- public Response streamFileLink(
- @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
- @Parameter(description = "ID of the Measurement containing the file link", required = true) @PathParam(REQUESTPARAM_ID) String id,
- @Parameter(description = "The remote path of the file link whose content is to be retrieved", required = true) @PathParam("remotePath") String remotePath) {
+ @Path("/{" + REQUESTPARAM_ID + "}/contexts/{" + REQUESTPARAM_CONTEXTTYPE + "}/{" + REQUESTPARAM_CONTEXTCOMPONENTNAME
+ + "}/{" + REQUESTPARAM_ATTRIBUTENAME + "}/files")
+ public ContextFilesSubresource getContextFilesSubresource() {
+ ContextFilesSubresource resource = resourceContext.getResource(ContextFilesSubresource.class);
+ resource.setEntityClass(Measurement.class);
+ return resource;
+ }
- return entityService.find(V(sourceName), Measurement.class, V(id)).map(fa -> new EntityFileLink(fa, remotePath))
- .map(efl -> Response.ok(efl.toStreamingOutput(fileLinkActivity, sourceName),
- efl.getFileLink().getMimeType().toString()).build())
- .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ @Path("/{" + REQUESTPARAM_ID + "}/files/")
+ public FilesAttachableSubresource getFilesAttachableSubresource() {
+ FilesAttachableSubresource resource = resourceContext.getResource(FilesAttachableSubresource.class);
+ resource.setEntityClass(Measurement.class);
+ return resource;
}
}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectDomainResource.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectDomainResource.java
index ba5e51b..415fdaf 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectDomainResource.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ProjectDomainResource.java
@@ -29,41 +29,55 @@
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
-import org.eclipse.mdm.api.base.model.Environment;
import org.eclipse.mdm.api.dflt.model.ProjectDomain;
-import org.eclipse.mdm.businessobjects.entity.SearchAttribute;
+import org.eclipse.mdm.businessobjects.entity.MDMEntityResponse;
import org.eclipse.mdm.businessobjects.service.EntityService;
import org.eclipse.mdm.businessobjects.utils.RequestBody;
import org.eclipse.mdm.businessobjects.utils.ServiceUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
/**
* {@link ProjectDomain} resource handling REST requests
*
* @author Alexander Knoblauch, Peak Solution GmbH
*
*/
+@Tag(name = "Status")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
@Path("/environments/{" + REQUESTPARAM_SOURCENAME + "}/projectdomains")
public class ProjectDomainResource {
@EJB
private EntityService entityService;
+ @Parameter(description = "Name of the MDM datasource", required = true)
+ @PathParam(REQUESTPARAM_SOURCENAME)
+ private String sourceName;
+
/**
* Returns the found {@link ProjectDomain}.
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param id id of the {@link ProjectDomain}
+ * @param id id of the {@link ProjectDomain}
* @return the found {@link ProjectDomain} as {@link Response}
*/
@GET
- @Produces(MediaType.APPLICATION_JSON)
+ @Operation(summary = "Find a ProjectDomain by ID", description = "Returns ProjectDomain based on ID", responses = {
+ @ApiResponse(description = "The ProjectDomain", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
@Path("/{" + REQUESTPARAM_ID + "}")
- public Response find(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName, @PathParam(REQUESTPARAM_ID) String id) {
+ public Response find(
+ @Parameter(description = "ID of the ProjectDomain", required = true) @PathParam(REQUESTPARAM_ID) String id) {
return entityService.find(V(sourceName), ProjectDomain.class, V(id))
.map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
.getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
@@ -72,14 +86,14 @@
/**
* Returns the (filtered) {@link ProjectDomain}s.
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param filter filter string to filter the {@link ProjectDomain} result
+ * @param filter filter string to filter the {@link ProjectDomain} result
* @return the (filtered) {@link ValueList}s as {@link Response}
*/
@GET
- @Produces(MediaType.APPLICATION_JSON)
- public Response findAll(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
- @QueryParam("filter") String filter) {
+ @Operation(summary = "Find ProjectDomain by filter", description = "Get list of ProjectDomains", responses = {
+ @ApiResponse(description = "The ProjectDomains", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ public Response findAll(@Parameter(description = "Filter expression", required = false) String filter) {
return entityService.findAll(V(sourceName), ProjectDomain.class, filter)
.map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
.getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
@@ -88,14 +102,14 @@
/**
* Returns the created {@link ProjectDomain}.
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param body The {@link ProjectDomain} to create.
+ * @param body The {@link ProjectDomain} to create.
* @return the created {@link ProjectDomain} as {@link Response}.
*/
@POST
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- public Response create(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName, String body) {
+ @Operation(summary = "Create a new ProjectDomain", responses = {
+ @ApiResponse(description = "The created ProjectDomain", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
+ public Response create(String body) {
RequestBody requestBody = RequestBody.create(body);
return entityService
@@ -105,19 +119,20 @@
}
/**
- * Updates the {@link ProjectDomain} with all parameters set in the given JSON body
- * of the request.
+ * Updates the {@link ProjectDomain} with all parameters set in the given JSON
+ * body of the request.
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param id the identifier of the {@link ProjectDomain} to update.
- * @param body the body of the request containing the attributes to update
+ * @param id the identifier of the {@link ProjectDomain} to update.
+ * @param body the body of the request containing the attributes to update
* @return the updated {@link ProjectDomain}
*/
@PUT
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
+ @Operation(summary = "Update an existing ProjectDomain", description = "Updates the ProjectDomain with all parameters set in the body of the request.", responses = {
+ @ApiResponse(description = "The updated ProjectDomain", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
@Path("/{" + REQUESTPARAM_ID + "}")
- public Response update(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName, @PathParam(REQUESTPARAM_ID) String id,
+ public Response update(
+ @Parameter(description = "ID of the ProjectDomain", required = true) @PathParam(REQUESTPARAM_ID) String id,
String body) {
RequestBody requestBody = RequestBody.create(body);
@@ -131,43 +146,18 @@
/**
* Deletes and returns the deleted {@link ProjectDomain}.
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param id The identifier of the {@link ProjectDomain} to delete.
+ * @param id The identifier of the {@link ProjectDomain} to delete.
* @return the deleted {@link ProjectDomain }s as {@link Response}
*/
@DELETE
- @Produces(MediaType.APPLICATION_JSON)
+ @Operation(summary = "Delete an existing ProjectDomain", responses = {
+ @ApiResponse(description = "The deleted ProjectDomain", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
@Path("/{" + REQUESTPARAM_ID + "}")
- public Response delete(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
- @PathParam(REQUESTPARAM_ID) String id) {
+ public Response delete(
+ @Parameter(description = "ID of the ProjectDomain", required = true) @PathParam(REQUESTPARAM_ID) String id) {
return entityService.delete(V(sourceName), entityService.find(V(sourceName), ProjectDomain.class, V(id)))
.map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
.getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
}
-
- /**
- * Returns the search attributes for the {@link ProjectDomain} type.
- *
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @return the {@link SearchAttribute}s as {@link Response}
- */
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/searchattributes")
- public Response getSearchAttributes(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName) {
- return ServiceUtils.buildSearchAttributesResponse(V(sourceName), ProjectDomain.class, entityService);
- }
-
- /**
- * Returns a map of localization for the entity type and the attributes.
- *
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @return the I18N as {@link Response}
- */
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/localizations")
- public Response localize(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName) {
- return ServiceUtils.buildLocalizationResponse(V(sourceName), ProjectDomain.class, entityService);
- }
}
\ No newline at end of file
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ResourceConstants.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ResourceConstants.java
index a9ee4cb..2aee5ba 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ResourceConstants.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/ResourceConstants.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -18,6 +18,7 @@
import org.eclipse.mdm.api.base.model.ContextType;
import org.eclipse.mdm.api.base.model.Entity;
import org.eclipse.mdm.api.base.model.Environment;
+import org.eclipse.mdm.api.base.model.FileLink;
import org.eclipse.mdm.api.base.model.Quantity;
import org.eclipse.mdm.api.base.model.Unit;
import org.eclipse.mdm.api.base.model.ValueType;
@@ -74,12 +75,50 @@
public static final String REQUESTPARAM_ID4 = "ID4";
/**
+ * Parameter holding the name of the context attribute in the URI path
+ */
+ public static final String REQUESTPARAM_ATTRIBUTENAME = "ATTRIBUTENAME";
+
+ /**
+ * Parameter holding the name of the context attribute in the URI path
+ */
+ public static final String REQUESTPARAM_CONTEXTCOMPONENTNAME = "CONTEXTCOMPONENTNAME";
+
+ /**
* Parameter holding the {@link ContextType} of the {@link Entity} in the URI
* path
*/
public static final String REQUESTPARAM_CONTEXTTYPE = "CONTEXTTYPE";
/**
+ * Parameter holding the {@code remotePath} of the {@link FileLink} in the URI
+ * path
+ */
+ public static final String REQUESTPARAM_REMOTEPATH = "REMOTEPATH";
+
+ /**
+ * Parameter holding the {@code mimeType} of the {@link FileLink} in the URI
+ * path
+ */
+ public static final String REQUESTPARAM_MIMETYPE = "MIMETYPE";
+
+ /**
+ * Parameter holding the {@code size} of the {@code file} in the URI path
+ */
+ public static final String REQUESTPARAM_SIZE = "SIZE";
+
+ /**
+ * Parameter holding the {@code size} of the {@code file} in the URI path
+ */
+ public static final String REQUESTPARAM_SOURCETYPE = "SOURCETYPE";
+
+ /**
+ * Parameter holding the {@code description} of the {@link FileLink} in the URI
+ * path
+ */
+ public static final String REQUESTPARAM_DESCRIPTION = "DESCRIPTION";
+
+ /**
* Parameter holding the name of the {@link Entity} in the request body
*/
public static final String ENTITYATTRIBUTE_NAME = "Name";
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/StatusResource.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/StatusResource.java
index 5a2cffc..3d940b4 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/StatusResource.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/StatusResource.java
@@ -34,35 +34,51 @@
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
-import org.eclipse.mdm.api.base.model.Environment;
-import org.eclipse.mdm.businessobjects.entity.SearchAttribute;
+import org.eclipse.mdm.businessobjects.entity.MDMEntityResponse;
import org.eclipse.mdm.businessobjects.service.EntityService;
import org.eclipse.mdm.businessobjects.utils.RequestBody;
import org.eclipse.mdm.businessobjects.utils.ServiceUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
/**
* {@link org.eclipse.mdm.api.dflt.model.Status} resource handling REST requests
*
* @author Alexander Knoblauch, Peak Solution GmbH
*
*/
+@Tag(name = "Status")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
@Path("/environments/{" + REQUESTPARAM_SOURCENAME + "}/status")
public class StatusResource {
@EJB
private EntityService entityService;
+ @Parameter(description = "Name of the MDM datasource", required = true)
+ @PathParam(REQUESTPARAM_SOURCENAME)
+ private String sourceName;
+
/**
* Returns the found {@link org.eclipse.mdm.api.dflt.model.Status}.
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param id id of the {@link org.eclipse.mdm.api.dflt.model.Status}
- * @return the found {@link org.eclipse.mdm.api.dflt.model.Status} as {@link Response}
+ * @param id id of the {@link org.eclipse.mdm.api.dflt.model.Status}
+ * @return the found {@link org.eclipse.mdm.api.dflt.model.Status} as
+ * {@link Response}
*/
@GET
- @Produces(MediaType.APPLICATION_JSON)
+ @Operation(summary = "Find a Status by ID", description = "Returns Status based on ID", responses = {
+ @ApiResponse(description = "The Status", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
@Path("/{" + REQUESTPARAM_ID + "}")
- public Response find(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName, @PathParam(REQUESTPARAM_ID) String id) {
+ public Response find(
+ @Parameter(description = "ID of the ProjectDomain", required = true) @PathParam(REQUESTPARAM_ID) String id) {
return entityService.find(V(sourceName), org.eclipse.mdm.api.dflt.model.Status.class, V(id))
.map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
.getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
@@ -71,14 +87,16 @@
/**
* Returns the (filtered) {@link org.eclipse.mdm.api.dflt.model.Status}s.
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param filter filter string to filter the {@link org.eclipse.mdm.api.dflt.model.Status} result
+ * @param filter filter string to filter the
+ * {@link org.eclipse.mdm.api.dflt.model.Status} result
* @return the (filtered) {@link ValueList}s as {@link Response}
*/
@GET
- @Produces(MediaType.APPLICATION_JSON)
- public Response findAll(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
- @QueryParam("filter") String filter) {
+ @Operation(summary = "Find Status by filter", description = "Get list of Status", responses = {
+ @ApiResponse(description = "The Status", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ public Response findAll(
+ @Parameter(description = "Filter expression", required = false) @QueryParam("filter") String filter) {
return entityService.findAll(V(sourceName), org.eclipse.mdm.api.dflt.model.Status.class, filter)
.map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
.getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
@@ -87,86 +105,71 @@
/**
* Returns the created {@link org.eclipse.mdm.api.dflt.model.Status}.
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param body The {@link org.eclipse.mdm.api.dflt.model.Status} to create.
- * @return the created {@link org.eclipse.mdm.api.dflt.model.Status} as {@link Response}.
+ * @param body The {@link org.eclipse.mdm.api.dflt.model.Status} to create.
+ * @return the created {@link org.eclipse.mdm.api.dflt.model.Status} as
+ * {@link Response}.
*/
@POST
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- public Response create(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName, String body) {
+ @Operation(summary = "Create a new Status", responses = {
+ @ApiResponse(description = "The created Status", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
+ public Response create(String body) {
RequestBody requestBody = RequestBody.create(body);
return entityService
- .create(V(sourceName), org.eclipse.mdm.api.dflt.model.Status.class, L(requestBody.getStringValueSupplier(ENTITYATTRIBUTE_NAME)))
+ .create(V(sourceName), org.eclipse.mdm.api.dflt.model.Status.class,
+ L(requestBody.getStringValueSupplier(ENTITYATTRIBUTE_NAME)))
.map(e -> ServiceUtils.buildEntityResponse(e, Status.CREATED))
.recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
}
/**
- * Updates the {@link org.eclipse.mdm.api.dflt.model.Status} with all parameters set in the given JSON body
- * of the request.
+ * Updates the {@link org.eclipse.mdm.api.dflt.model.Status} with all parameters
+ * set in the given JSON body of the request.
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param id the identifier of the {@link org.eclipse.mdm.api.dflt.model.Status} to update.
- * @param body the body of the request containing the attributes to update
+ * @param id the identifier of the
+ * {@link org.eclipse.mdm.api.dflt.model.Status} to update.
+ * @param body the body of the request containing the attributes to update
* @return the updated {@link org.eclipse.mdm.api.dflt.model.Status}
*/
@PUT
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
+ @Operation(summary = "Update an existing Status", description = "Updates the Status with all parameters set in the body of the request.", responses = {
+ @ApiResponse(description = "The updated Status", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
@Path("/{" + REQUESTPARAM_ID + "}")
- public Response update(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName, @PathParam(REQUESTPARAM_ID) String id,
+ public Response update(
+ @Parameter(description = "ID of the Status", required = true) @PathParam(REQUESTPARAM_ID) String id,
String body) {
RequestBody requestBody = RequestBody.create(body);
return entityService
- .update(V(sourceName), entityService.find(V(sourceName), org.eclipse.mdm.api.dflt.model.Status.class, V(id)),
+ .update(V(sourceName),
+ entityService.find(V(sourceName), org.eclipse.mdm.api.dflt.model.Status.class, V(id)),
requestBody.getValueMapSupplier())
.map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
.getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
}
/**
- * Deletes and returns the deleted {@link org.eclipse.mdm.api.dflt.model.Status}.
+ * Deletes and returns the deleted
+ * {@link org.eclipse.mdm.api.dflt.model.Status}.
*
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param id The identifier of the {@link org.eclipse.mdm.api.dflt.model.Status} to delete.
- * @return the deleted {@link org.eclipse.mdm.api.dflt.model.Status }s as {@link Response}
+ * @param id The identifier of the {@link org.eclipse.mdm.api.dflt.model.Status}
+ * to delete.
+ * @return the deleted {@link org.eclipse.mdm.api.dflt.model.Status }s as
+ * {@link Response}
*/
@DELETE
- @Produces(MediaType.APPLICATION_JSON)
+ @Operation(summary = "Delete an existing Status", responses = {
+ @ApiResponse(description = "The deleted Status", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
+ @ApiResponse(responseCode = "400", description = "Invalid ID supplied") })
@Path("/{" + REQUESTPARAM_ID + "}")
- public Response delete(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
- @PathParam(REQUESTPARAM_ID) String id) {
- return entityService.delete(V(sourceName), entityService.find(V(sourceName), org.eclipse.mdm.api.dflt.model.Status.class, V(id)))
+ public Response delete(
+ @Parameter(description = "ID of the Status", required = true) @PathParam(REQUESTPARAM_ID) String id) {
+ return entityService
+ .delete(V(sourceName),
+ entityService.find(V(sourceName), org.eclipse.mdm.api.dflt.model.Status.class, V(id)))
.map(e -> ServiceUtils.buildEntityResponse(e, Status.OK)).recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER)
.getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
}
-
- /**
- * Returns the search attributes for the {@link org.eclipse.mdm.api.dflt.model.Status} type.
- *
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @return the {@link SearchAttribute}s as {@link Response}
- */
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/searchattributes")
- public Response getSearchAttributes(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName) {
- return ServiceUtils.buildSearchAttributesResponse(V(sourceName), org.eclipse.mdm.api.dflt.model.Status.class, entityService);
- }
-
- /**
- * Returns a map of localization for the entity type and the attributes.
- *
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @return the I18N as {@link Response}
- */
- @GET
- @Produces(MediaType.APPLICATION_JSON)
- @Path("/localizations")
- public Response localize(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName) {
- return ServiceUtils.buildLocalizationResponse(V(sourceName), org.eclipse.mdm.api.dflt.model.Status.class, entityService);
- }
}
\ No newline at end of file
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateComponentResource.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateComponentResource.java
index 746897a..5458b2f 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateComponentResource.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TemplateComponentResource.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestResource.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestResource.java
index f5069ad..358ee3b 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestResource.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestResource.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -21,6 +21,7 @@
import java.util.Map;
import java.util.NoSuchElementException;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
@@ -32,6 +33,8 @@
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
@@ -39,8 +42,8 @@
import org.eclipse.mdm.api.base.adapter.Attribute;
import org.eclipse.mdm.api.base.adapter.EntityType;
import org.eclipse.mdm.api.base.model.Environment;
-import org.eclipse.mdm.api.base.model.FileLink;
import org.eclipse.mdm.api.base.model.Test;
+import org.eclipse.mdm.api.base.model.TestStep;
import org.eclipse.mdm.api.dflt.model.Classification;
import org.eclipse.mdm.api.dflt.model.Domain;
import org.eclipse.mdm.api.dflt.model.Pool;
@@ -48,10 +51,11 @@
import org.eclipse.mdm.api.dflt.model.TemplateTest;
import org.eclipse.mdm.api.dflt.model.ValueList;
import org.eclipse.mdm.businessobjects.control.FileLinkActivity;
+import org.eclipse.mdm.businessobjects.entity.ContextResponse;
import org.eclipse.mdm.businessobjects.entity.I18NResponse;
import org.eclipse.mdm.businessobjects.entity.MDMEntityResponse;
import org.eclipse.mdm.businessobjects.entity.SearchAttributeResponse;
-import org.eclipse.mdm.businessobjects.service.EntityFileLink;
+import org.eclipse.mdm.businessobjects.service.ContextService;
import org.eclipse.mdm.businessobjects.service.EntityService;
import org.eclipse.mdm.businessobjects.utils.RequestBody;
import org.eclipse.mdm.businessobjects.utils.ServiceUtils;
@@ -91,8 +95,14 @@
private EntityService entityService;
@EJB
+ private ContextService contextService;
+
+ @EJB
private FileLinkActivity fileLinkActivity;
+ @Context
+ private ResourceContext resourceContext;
+
/**
* delegates the request to the {@link TestService}
*
@@ -261,6 +271,7 @@
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}")
+ @RolesAllowed({ "write-user" })
public Response update(
@Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@Parameter(description = "ID of the Test", required = true) @PathParam(REQUESTPARAM_ID) String id,
@@ -295,31 +306,54 @@
.getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
}
+ @Path("/{" + REQUESTPARAM_ID + "}/files/")
+ public FilesAttachableSubresource getFilesAttachableSubresource() {
+ FilesAttachableSubresource resource = resourceContext.getResource(FilesAttachableSubresource.class);
+ resource.setEntityClass(Test.class);
+ return resource;
+ }
+
/**
- * Stream the contents of a file link.
- *
+ * delegates the request to the {@link TestStepService}
+ *
* @param sourceName name of the source (MDM {@link Environment} name)
- * @param id The identifier of the {@link Test} which contains the
- * {@link FileLink}
- * @param remotePath The remote path of the {@link FileLink} to identify, which
- * {@link FileLink}'s content is requests.
- * @return The content of the file as {@link javax.ws.rs.core.StreamingOutput}.
- * The response also has the MimeType set according to
- * {@link FileLink#getMimeType()}.
+ * @param id id of the {@link TestStep}
+ * @return the result of the delegated request as {@link Response}
*/
@GET
- @Operation(summary = "Stream the contents of a file link", responses = {
- @ApiResponse(description = "The content of the file link as a stream. MimeType is set to that of the file link.", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
- @ApiResponse(responseCode = "400", description = "Invalid ID or remote path supplied") })
- @Path("/{" + REQUESTPARAM_ID + "}/files/{remotePath}")
- public Response streamFileLink(
- @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
- @Parameter(description = "ID of the Test containing the file link", required = true) @PathParam(REQUESTPARAM_ID) String id,
- @Parameter(description = "The remote path of the file link whose content is to be retrieved", required = true) @PathParam("remotePath") String remotePath) {
-
- return entityService.find(V(sourceName), Test.class, V(id)).map(fa -> new EntityFileLink(fa, remotePath))
- .map(efl -> Response.ok(efl.toStreamingOutput(fileLinkActivity, sourceName),
- efl.getFileLink().getMimeType().toString()).build())
+ @Operation(summary = "Get the test constant context data for a Test", description = "Returns the test constant context", responses = {
+ @ApiResponse(responseCode = "200", description = "The test constant context data", content = @Content(schema = @Schema(implementation = ContextResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("/{" + REQUESTPARAM_ID + "}/contexts")
+ public Response findContext(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @PathParam(REQUESTPARAM_ID) String id) {
+ return contextService.getTestContext(V(sourceName), V(id), false).map(ServiceUtils::contextMapToJava)
+ .map(ContextResponse::new).map(contextResponse -> ServiceUtils.toResponse(contextResponse, Status.OK))
.recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
}
+
+ /**
+ * Updates the context of {@link TestStep} with all parameters set in the given
+ * JSON body of the request.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param id the identifier of the {@link TestStep} to update.
+ * @param body the body of the request containing the attributes to update
+ * @return the context map of the updated {@link TestStep}
+ */
+ @PUT
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Path("/{" + REQUESTPARAM_ID + "}/contexts")
+ @RolesAllowed({ "write-user" })
+ public Response updateContext(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
+ @PathParam(REQUESTPARAM_ID) String id, String body) {
+
+ return entityService.find(V(sourceName), TestStep.class, V(id))
+ .map(testStep -> contextService.updateContext(body, testStep)).map(ContextResponse::new)
+ .map(contextResponse -> ServiceUtils.toResponse(contextResponse, Status.OK))
+ .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ }
+
}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepResource.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepResource.java
index 03c22f1..ded5f5f 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepResource.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/TestStepResource.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -14,10 +14,14 @@
package org.eclipse.mdm.businessobjects.boundary;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_ATTRIBUTENAME;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_CONTEXTCOMPONENTNAME;
+import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_CONTEXTTYPE;
import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_ID;
import static org.eclipse.mdm.businessobjects.boundary.ResourceConstants.REQUESTPARAM_SOURCENAME;
import static org.eclipse.mdm.businessobjects.service.EntityService.V;
+import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
@@ -28,13 +32,14 @@
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
+import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.eclipse.mdm.api.base.model.ContextType;
import org.eclipse.mdm.api.base.model.Environment;
-import org.eclipse.mdm.api.base.model.FileLink;
import org.eclipse.mdm.api.base.model.Test;
import org.eclipse.mdm.api.base.model.TestStep;
import org.eclipse.mdm.api.dflt.model.Classification;
@@ -47,7 +52,6 @@
import org.eclipse.mdm.businessobjects.entity.MDMEntityResponse;
import org.eclipse.mdm.businessobjects.entity.SearchAttributeResponse;
import org.eclipse.mdm.businessobjects.service.ContextService;
-import org.eclipse.mdm.businessobjects.service.EntityFileLink;
import org.eclipse.mdm.businessobjects.service.EntityService;
import org.eclipse.mdm.businessobjects.utils.RequestBody;
import org.eclipse.mdm.businessobjects.utils.ServiceUtils;
@@ -83,6 +87,9 @@
@EJB
private FileLinkActivity fileLinkActivity;
+ @Context
+ private ResourceContext resourceContext;
+
/**
* delegates the request to the {@link TestStepService}
*
@@ -154,6 +161,9 @@
* @return the result of the delegated request as {@link Response}
*/
@GET
+ @Operation(summary = "Get the complete context data for a TestStep", description = "Returns the complete context", responses = {
+ @ApiResponse(responseCode = "200", description = "The TestStep context data", content = @Content(schema = @Schema(implementation = ContextResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
@Produces(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts")
public Response findContext(
@@ -169,7 +179,7 @@
* JSON body of the request.
*
* @param sourceName name of the source (MDM {@link Environment} name)
- * @param id the identifier of the {@link TestStepValue} to update.
+ * @param id the identifier of the {@link TestStep} to update.
* @param body the body of the request containing the attributes to update
* @return the context map of the updated {@link TestStep}
*/
@@ -177,6 +187,7 @@
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts")
+// @RolesAllowed({ "write-user" })
public Response updateContext(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@PathParam(REQUESTPARAM_ID) String id, String body) {
@@ -194,6 +205,9 @@
* @return the result of the delegated request as {@link Response}
*/
@GET
+ @Operation(summary = "Get the UnitUnderTest context data for a TestStep", description = "Returns the complete context", responses = {
+ @ApiResponse(responseCode = "200", description = "The UnitUnderTest context data", content = @Content(schema = @Schema(implementation = ContextResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
@Produces(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts/unitundertest")
public Response findContextUUT(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@@ -210,7 +224,7 @@
* with all parameters set in the given JSON body of the request.
*
* @param sourceName name of the source (MDM {@link Environment} name)
- * @param id the identifier of the {@link TestStepValue} to update.
+ * @param id the identifier of the {@link TestStep} to update.
* @param body the body of the request containing the attributes to update
* @return the context map of {@link ContextType} UNITUNDERTEST of the updated
* {@link TestStep}
@@ -219,6 +233,7 @@
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts/unitundertest")
+ @RolesAllowed({ "write-user" })
public Response updateContextUUT(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@PathParam(REQUESTPARAM_ID) String id, String body) {
@@ -236,6 +251,9 @@
* @return the result of the delegated request as {@link Response}
*/
@GET
+ @Operation(summary = "Get the TestSequence context data for a TestStep", description = "Returns the TestSequence context data", responses = {
+ @ApiResponse(responseCode = "200", description = "The TestSequence context data", content = @Content(schema = @Schema(implementation = ContextResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
@Produces(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts/testsequence")
public Response findContextTSQ(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@@ -252,7 +270,7 @@
* with all parameters set in the given JSON body of the request.
*
* @param sourceName name of the source (MDM {@link Environment} name)
- * @param id the identifier of the {@link TestStepValue} to update.
+ * @param id the identifier of the {@link TestStep} to update.
* @param body the body of the request containing the attributes to update
* @return the context map of {@link ContextType} TESTSEQUENCE of the updated
* {@link TestStep}
@@ -261,6 +279,7 @@
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts/testsequence")
+ @RolesAllowed({ "write-user" })
public Response updateContextTSQ(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@PathParam(REQUESTPARAM_ID) String id, String body) {
@@ -278,6 +297,9 @@
* @return the result of the delegated request as {@link Response}
*/
@GET
+ @Operation(summary = "Get the TestEquipment context data for a TestStep", description = "Returns the TestEquipment context data", responses = {
+ @ApiResponse(responseCode = "200", description = "The TestEquipment context data", content = @Content(schema = @Schema(implementation = ContextResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
@Produces(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts/testequipment")
public Response findContextTEQ(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@@ -294,7 +316,7 @@
* with all parameters set in the given JSON body of the request.
*
* @param sourceName name of the source (MDM {@link Environment} name)
- * @param id the identifier of the {@link TestStepValue} to update.
+ * @param id the identifier of the {@link TestStep} to update.
* @param body the body of the request containing the attributes to update
* @return the context map of {@link ContextType} TESTEQUIPMENT of the updated
* {@link TestStep}
@@ -303,6 +325,7 @@
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts/testequipment")
+ @RolesAllowed({ "write-user" })
public Response updateContextTEQ(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@PathParam(REQUESTPARAM_ID) String id, String body) {
@@ -320,6 +343,9 @@
* @return the result of the delegated request as {@link Response}
*/
@GET
+ @Operation(summary = "Get the Sensor context data", description = "Returns the Sensor context data of TestEquipments", responses = {
+ @ApiResponse(responseCode = "200", description = "The Sensor context data", content = @Content(schema = @Schema(implementation = ContextResponse.class))),
+ @ApiResponse(responseCode = "500", description = "Error") })
@Produces(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}/contexts/testequipment/sensors")
public Response getContextTEQSensors(@PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@@ -382,7 +408,7 @@
* of the request.
*
* @param sourceName name of the source (MDM {@link Environment} name)
- * @param id the identifier of the {@link TestStepValue} to update.
+ * @param id the identifier of the {@link TestStep} to update.
* @param body the body of the request containing the attributes to update
* @return the updated {@link TestStep}
*/
@@ -393,6 +419,7 @@
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@Path("/{" + REQUESTPARAM_ID + "}")
+ @RolesAllowed({ "write-user" })
public Response update(
@Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
@Parameter(description = "ID of the TestStep", required = true) @PathParam(REQUESTPARAM_ID) String id,
@@ -427,31 +454,18 @@
.getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
}
- /**
- * Stream the contents of a file link.
- *
- * @param sourceName name of the source (MDM {@link Environment} name)
- * @param id The identifier of the {@link TestStep} which contains the
- * {@link FileLink}
- * @param remotePath The remote path of the {@link FileLink} to identify, which
- * {@link FileLink}'s content is requests.
- * @return The content of the file as {@link javax.ws.rs.core.StreamingOutput}.
- * The response also has the MimeType set according to
- * {@link FileLink#getMimeType()}.
- */
- @GET
- @Operation(summary = "Stream the contents of a file link", responses = {
- @ApiResponse(description = "The content of the file link as a stream. MimeType is set to that of the file link.", content = @Content(schema = @Schema(implementation = MDMEntityResponse.class))),
- @ApiResponse(responseCode = "400", description = "Invalid ID or remote path supplied") })
- @Path("/{" + REQUESTPARAM_ID + "}/files/{remotePath}")
- public Response streamFileLink(
- @Parameter(description = "Name of the MDM datasource", required = true) @PathParam(REQUESTPARAM_SOURCENAME) String sourceName,
- @Parameter(description = "ID of the TestStep containing the file link", required = true) @PathParam(REQUESTPARAM_ID) String id,
- @Parameter(description = "The remote path of the file link whose content is to be retrieved", required = true) @PathParam("remotePath") String remotePath) {
+ @Path("/{" + REQUESTPARAM_ID + "}/contexts/{" + REQUESTPARAM_CONTEXTTYPE + "}/{" + REQUESTPARAM_CONTEXTCOMPONENTNAME
+ + "}/{" + REQUESTPARAM_ATTRIBUTENAME + "}/files")
+ public ContextFilesSubresource getContextFilesSubresource() {
+ ContextFilesSubresource resource = resourceContext.getResource(ContextFilesSubresource.class);
+ resource.setEntityClass(TestStep.class);
+ return resource;
+ }
- return entityService.find(V(sourceName), TestStep.class, V(id)).map(fa -> new EntityFileLink(fa, remotePath))
- .map(efl -> Response.ok(efl.toStreamingOutput(fileLinkActivity, sourceName),
- efl.getFileLink().getMimeType().toString()).build())
- .recover(ServiceUtils.ERROR_RESPONSE_SUPPLIER).getOrElse(ServiceUtils.SERVER_ERROR_RESPONSE);
+ @Path("/{" + REQUESTPARAM_ID + "}/files")
+ public FilesAttachableSubresource getFilesAttachableSubresource() {
+ FilesAttachableSubresource resource = resourceContext.getResource(FilesAttachableSubresource.class);
+ resource.setEntityClass(TestStep.class);
+ return resource;
}
}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/UserResource.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/UserResource.java
new file mode 100644
index 0000000..c5d74d8
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/boundary/UserResource.java
@@ -0,0 +1,76 @@
+/********************************************************************************
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+package org.eclipse.mdm.businessobjects.boundary;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.security.PermitAll;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+
+import org.eclipse.mdm.businessobjects.entity.User;
+
+import com.google.common.base.Splitter;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+@Tag(name = "User")
+@Path("/user")
+@PermitAll
+public class UserResource {
+
+ @Context
+ public SecurityContext securityContext;
+
+ @GET
+ @Path("/current")
+ @Operation(summary = "Read authenticated user information", description = "Read the current user name and which of the given roles the user has.", responses = {
+ @ApiResponse(description = "The authenticated user.", content = @Content(schema = @Schema(implementation = User.class))),
+ @ApiResponse(responseCode = "400", description = "Error") })
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response currentUser(
+ @Parameter(description = "Comma separated list of roles. This method checks, if the user belongs to each role. If the user does not belong to a role or the role is not queried, it will not be returned.", required = true) @QueryParam("roles") String roles) {
+ /*
+ * There is no reliable way in getting the (possibly mapped) roles of a user.
+ * Thus the check if a user is in a role is only against the given list of
+ * roles.
+ */
+ List<String> roleList = new ArrayList<>();
+ if (roles != null) {
+ for (String role : Splitter.on(",").trimResults().split(roles)) {
+ if (securityContext.isUserInRole(role)) {
+ roleList.add(role);
+ }
+ }
+ }
+
+ User user = new User();
+ user.setUsername(securityContext.getUserPrincipal().getName());
+ user.setRoles(roleList);
+ return Response.ok(user).build();
+ }
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FileLinkActivity.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FileLinkActivity.java
index d2196c6..8faad3a 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FileLinkActivity.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/FileLinkActivity.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -17,40 +17,554 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.ejb.EJB;
import javax.ejb.Stateless;
import javax.inject.Inject;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.StreamingOutput;
+import org.eclipse.mdm.api.base.Transaction;
import org.eclipse.mdm.api.base.file.FileService;
+import org.eclipse.mdm.api.base.model.ContextComponent;
+import org.eclipse.mdm.api.base.model.ContextDescribable;
+import org.eclipse.mdm.api.base.model.ContextRoot;
+import org.eclipse.mdm.api.base.model.ContextType;
import org.eclipse.mdm.api.base.model.Entity;
+import org.eclipse.mdm.api.base.model.Environment;
import org.eclipse.mdm.api.base.model.FileLink;
-import org.eclipse.mdm.api.base.query.DataAccessException;
+import org.eclipse.mdm.api.base.model.FileLink.Format;
+import org.eclipse.mdm.api.base.model.FilesAttachable;
+import org.eclipse.mdm.api.base.model.Measurement;
+import org.eclipse.mdm.api.base.model.MimeType;
+import org.eclipse.mdm.api.base.model.TestStep;
+import org.eclipse.mdm.api.base.model.Value;
+import org.eclipse.mdm.api.base.model.ValueType;
import org.eclipse.mdm.api.dflt.ApplicationContext;
+import org.eclipse.mdm.api.dflt.EntityManager;
+import org.eclipse.mdm.businessobjects.entity.FileSize;
+import org.eclipse.mdm.businessobjects.service.ContextService;
+import org.eclipse.mdm.businessobjects.service.DescribableContexts;
import org.eclipse.mdm.connector.boundary.ConnectorService;
import com.google.common.io.ByteStreams;
+import io.vavr.Tuple;
+import io.vavr.Tuple2;
+
@Stateless
public class FileLinkActivity {
@Inject
private ConnectorService connectorService;
- public void streamFileLink(String sourceName, Entity entity, FileLink fileLink, OutputStream outputStream) {
+ @EJB
+ private ContextService contextService;
+
+ @EJB
+ private ContextActivity contextActivity;
+
+ /**
+ * Loads size of File with given remotePath.
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @param filesAttachable the {@link FilesAttachable} {@link Entity} the file is
+ * attached to
+ * @param remotePath the remotePath
+ * @return the {@link FileSize}
+ */
+ public FileSize loadFileSize(String sourceName, Entity entity, FileLink fileLink) {
+ FileService fileService = getFileService(sourceName);
+ return loadSize(entity, fileLink, fileService);
+ }
+
+ /**
+ * Loads sizes for all files attached to the given entity.
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @param filesAttachable the {@link FilesAttachable} {@link Entity} the files
+ * are attached to
+ * @return the {@link FileSize}s as {@link List}
+ */
+ public List<FileSize> loadFileSizes(String sourceName, FilesAttachable fileAttachable) {
+ FileService fileService = getFileService(sourceName);
+ return Arrays.asList(fileAttachable.getFileLinks()).stream()
+ .map(fileLink -> loadSize(fileAttachable, fileLink, fileService)).collect(Collectors.toList());
+ }
+
+ /**
+ * Helping function to trigger the actual file size loading process via given
+ * {@link FileService}
+ *
+ * @param filesAttachable the {@link FilesAttachable} {@link Entity} the file is
+ * attached to
+ * @param fileLink the {@link FileLink}
+ * @param fileService the {@link FileService}
+ * @return the {@link FileSize}
+ */
+ private FileSize loadSize(Entity entity, FileLink fileLink, FileService fileService) {
+ FileSize fileSize = new FileSize();
try {
- ApplicationContext context = this.connectorService.getContextByName(sourceName);
-
- FileService fileService = context.getFileService().orElseThrow(
- () -> new MDMEntityAccessException("FileService not present in '" + sourceName + "'."));
-
- try (InputStream in = fileService.openStream(entity, fileLink)) {
- ByteStreams.copy(in, outputStream);
- }
- } catch (DataAccessException e) {
- throw new MDMEntityAccessException(e.getMessage(), e);
+ fileService.loadSize(entity, fileLink);
+ fileSize.setRemotePath(fileLink.getRemotePath());
+ fileSize.setSize(fileLink.getSize(Format.BINARY));
} catch (IOException e) {
- throw new MDMEntityAccessException(e.getMessage(), e);
+ throw new MDMFileAccessException(e.getMessage(), e);
}
+ return fileSize;
+ }
+ /**
+ * Persists file at file server. Creates a new {@link FileLink} (pointing at the
+ * new file) and adds it to the {@link FilesAttachable}
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @param filesAttachable the {@link FilesAttachable} {@link Entity} the file is
+ * attached to
+ * @param fileName the name of the file
+ * @param fis the {@code InputStream} with the file data
+ * @param description the file description. Default value is the file name.
+ * @param mimeType the mimeType of the file.
+ * @return the {@link FileLink} to the created File
+ */
+ public FileLink createFile(String sourceName, FilesAttachable filesAttachable, String fileName, InputStream fis,
+ String description, MimeType mimeType) {
+
+ FileLink fileLink = null;
+ try {
+ // Create new local FileLink
+ fileLink = newLocalFileLink(fileName, fis, description, mimeType);
+
+ // Upload fileLink. Upload will create remote path.
+ uploadFile(sourceName, filesAttachable, fileLink);
+
+ // Add file link to fileAttachable
+ filesAttachable.addFileLink(fileLink);
+
+ // Persist changes
+ persistEntity(sourceName, filesAttachable);
+ } catch (IOException e) {
+ throw new MDMFileAccessException(
+ String.format("File (%s, %s, %s) could not be created.", fileName, description, mimeType), e);
+ }
+ return fileLink;
+ }
+
+ /**
+ * Persists file at file server. Creates a new {@link FileLink} (pointing at the
+ * new file) and adds it to the specified context attribute
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @param contextDescribable the {@link ContextDescribable}
+ * @param fileName the name of the file
+ * @param fis the {@code InputStream} with the file data
+ * @param description the file description. Default value is the file
+ * name.
+ * @param mimeType the mimeType of the file.
+ * @param contextType the {@link ContextType} holding the component
+ * @param contextComponentName the name of the component holding the file link
+ * attribute
+ * @param attributeName the name of the attribute holding the file link
+ * @return
+ */
+ public FileLink createFile(String sourceName, ContextDescribable contextDescribable, String fileName,
+ InputStream fis, String description, MimeType mimeType, ContextType contextType,
+ String contextComponentName, String attributeName) {
+
+ Map<ContextType, ContextRoot> contextMap = getContextMap(sourceName, contextDescribable, contextType);
+ Value value = findValueInContext(contextType, contextComponentName, contextMap, attributeName);
+
+ FileLink fileLink = null;
+ try {
+ // Create new local FileLink
+ fileLink = newLocalFileLink(fileName, fis, description, mimeType);
+ // Upload file to file server. Upload creates and sets remote path in fileLink.
+ uploadFile(sourceName, contextDescribable, fileLink);
+
+ // Since attributes of type FILE_LINK can hold a maximum of one file, the old
+ // file has to be deleted from fileServer
+ if (ValueType.FILE_LINK.equals(value.getValueType())) {
+ deleteFile(sourceName, contextDescribable, value.extract(ValueType.FILE_LINK));
+ }
+
+ // Adds file link to the context attribute
+ setOrAddFileLinkToValue(value, fileLink);
+
+ // Persist changes
+ DescribableContexts dc = createDescribableContext(contextDescribable, contextMap);
+ contextService.persist(dc);
+
+ } catch (IOException e) {
+ throw new MDMFileAccessException(
+ String.format("File (%s, %s, %s) could not be created.", fileName, description, mimeType), e);
+ }
+ return fileLink;
+ }
+
+ /**
+ * Deletes file from file server and removes the related {@link FileLink} from
+ * the {@link FilesAttachable}
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @param filesAttachable the {@link FilesAttachable} {@link Entity} the file is
+ * attached to
+ * @param remotePath the remotePath
+ * @return the {@link FileLink} to the deleted File
+ */
+ public FileLink deleteFileLink(String sourceName, FilesAttachable filesAttachable, String remotePath) {
+
+ // Find file link
+ FileLink fileLink = findFileLinkAtFileAttachable(remotePath, filesAttachable);
+
+ // Delete file from FileServer
+ deleteFile(sourceName, filesAttachable, fileLink);
+
+ // Remove FileLink from FileAttachable
+ filesAttachable.removeFileLink(fileLink);
+
+ // Persist changes
+ persistEntity(sourceName, filesAttachable);
+
+ return fileLink;
+ }
+
+ /**
+ * Deletes file from file server and removes the related {@link FileLink} from
+ * the specified context attribute.
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @param contextDescribable the context describable
+ * @param contextType the {@link ContextType} holding the component
+ * @param contextComponentName the name of the component holding the file link
+ * attribute
+ * @param attributeName the name of the attribute holding the file link
+ * @param remotePath the remotePath
+ * @return
+ */
+ public FileLink deleteFileLink(String sourceName, ContextDescribable contextDescribable, ContextType contextType,
+ String contextComponentName, String attributeName, String remotePath) {
+
+ // Find link attribute in context
+ Map<ContextType, ContextRoot> contextMap = getContextMap(sourceName, contextDescribable, contextType);
+ Value value = findValueInContext(contextType, contextComponentName, contextMap, attributeName);
+ FileLink fileLink = extractFileLink(remotePath, value);
+
+ // Delete the file from file Server
+ deleteFile(sourceName, contextDescribable, fileLink);
+
+ // Removes file link from the context attribute
+ removeFileLinkfromValue(value, fileLink);
+
+ // Persist changes
+ DescribableContexts dc = createDescribableContext(contextDescribable, contextMap);
+ contextService.persist(dc);
+ return fileLink;
+ }
+
+ /**
+ * Helping function to find the {@link FileLink} with the specified remotePath
+ * attached to the given entity.
+ *
+ * @param remotePath the remotePath
+ * @param filesAttachable the {@link ContextDescribable} the file is attached to
+ * @return the specified {@link FileLink}
+ */
+ public FileLink findFileLinkInContext(String remotePath, String sourceName, ContextDescribable contextDescribable,
+ ContextType contextType, String contextComponentName, String attributeName) {
+ Map<ContextType, ContextRoot> contextMap = getContextMap(sourceName, contextDescribable, contextType);
+ Value value = findValueInContext(contextType, contextComponentName, contextMap, attributeName);
+ return extractFileLink(remotePath, value);
+ }
+
+ /**
+ * Helping function to find the {@link FileLink} with the specified remotePath
+ * attached to the given entity.
+ *
+ * @param remotePath the remotePath
+ * @param filesAttachable the {@link FilesAttachable} the file is attached to
+ * @return the specified {@link FileLink}
+ */
+ public FileLink findFileLinkAtFileAttachable(String remotePath, FilesAttachable entity) {
+ for (FileLink l : ((FilesAttachable) entity).getFileLinks()) {
+ if (l.isRemote() && l.getRemotePath().equals(remotePath)) {
+ return l;
+ }
+ }
+ throw new MDMEntityAccessException("FileLink with remotePath " + remotePath + " not found!");
+ }
+
+ public StreamingOutput toStreamingOutput(String sourceName, Entity entity, FileLink fileLink) {
+ return new StreamingOutput() {
+ @Override
+ public void write(OutputStream output) throws IOException, WebApplicationException {
+ streamFileLink(sourceName, entity, fileLink, output);
+ }
+ };
+ }
+
+ /**
+ * Creates {@link StreamingOutput} for file. Guesses mime-type to ensure proper
+ * display/download functionality at client side.
+ *
+ * @TODO Mime-type guess works only for limited types, but CorbaFileServer does
+ * not offer methods to properly load mime-type. Find a solution!
+ *
+ * @param sourceName
+ * @param entity
+ * @param fileLink
+ * @return
+ */
+ public Tuple2<StreamingOutput, String> toStreamingOutputGuessMimeType(String sourceName, Entity entity,
+ FileLink fileLink) {
+ String m = null;
+ StreamingOutput o = null;
+ try {
+ InputStream in = getFileService(sourceName).openStream(entity, fileLink);
+ m = URLConnection.guessContentTypeFromStream(in);
+ o = new StreamingOutput() {
+ public void write(OutputStream output) throws IOException, WebApplicationException {
+ ByteStreams.copy(in, output);
+ }
+ };
+ } catch (IOException e) {
+ throw new MDMFileAccessException(e.getMessage(), e);
+ }
+ return Tuple.of(o, m);
+ }
+
+ /**
+ * Helping function to physically delete file from file server
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @param entity the {@link Entity} the file is attached to or holding the
+ * context with the file attribute
+ * @param fileLink the {@link FileLink} related to the file
+ */
+ private void deleteFile(String sourceName, Entity entity, FileLink fileLink) {
+ FileService fileService = getFileService(sourceName);
+ fileService.delete(entity, fileLink);
+ }
+
+ /**
+ * Helping function to physically upload file to file server
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @param entity the {@link Entity} the file is attached to or holding the
+ * context with the file attribute
+ * @param fileLink the {@link FileLink} related to the file
+ */
+ private void uploadFile(String sourceName, Entity entity, FileLink fileLink) throws IOException {
+ FileService fileService = getFileService(sourceName);
+ List<FileLink> fileLinks = new ArrayList<>();
+ fileLinks.add(fileLink);
+ fileService.uploadSequential(entity, fileLinks, null);
+ }
+
+ /**
+ * Helping function to persist an {@link Entity}
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @param entity the {@link Entity} the file is attached to or holding the
+ * context with the file attribute
+ */
+ private void persistEntity(String sourceName, Entity entity) {
+ List<Entity> enteties = new ArrayList<>();
+ enteties.add(entity);
+
+ EntityManager em = getEntityManager(sourceName);
+ Transaction t = em.startTransaction();
+ t.update(enteties);
+ t.commit();
+ }
+
+ /**
+ * Helping function to create new local {@FileLink}. Sets filename as default
+ * description, if no description is provided.
+ *
+ * @param fileName the file name
+ * @param fis the file {@link InputStream}
+ * @param description the file description
+ * @param mimeType the files {@link MimeType}
+ * @return the new {@FileLink}
+ * @throws IOException
+ */
+ private FileLink newLocalFileLink(String fileName, InputStream fis, String description, MimeType mimeType)
+ throws IOException {
+ String desc = (description == null || description.isEmpty()) ? fileName : description;
+ return FileLink.newLocal(fis, fileName, -1, mimeType, desc);
+ }
+
+ /**
+ * Helping function to load context for {@link ContextDescribable}s.
+ *
+ * Notice: For {@link TestStep}s only the ordered context is loaded. For
+ * {@link Measurement}s only the measured context is loaded.
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @param contextDescribable the {@link ContextDescribable}
+ * @param contextType the {@link ContextType} holding the component
+ * @return
+ */
+ private Map<ContextType, ContextRoot> getContextMap(String sourceName, ContextDescribable contextDescribable,
+ ContextType contextType) {
+ if (contextDescribable instanceof TestStep) {
+ return contextActivity.getTestStepContext(sourceName, contextDescribable.getID(), contextType)
+ .get(ContextActivity.CONTEXT_GROUP_ORDERED);
+ } else if (contextDescribable instanceof Measurement) {
+ return contextActivity.getMeasurementContext(sourceName, contextDescribable.getID(), contextType)
+ .get(ContextActivity.CONTEXT_GROUP_MEASURED);
+ }
+ throw new MDMEntityAccessException(
+ "No context of type " + contextType + " not found for " + contextDescribable.toString());
+ }
+
+ /**
+ * Helping function to add {@link FileLink} to a {@link Value}
+ *
+ * @param value the {@link Value}
+ * @param fileLink the {@link FileLink}
+ */
+ private void setOrAddFileLinkToValue(Value value, FileLink fileLink) {
+ if (ValueType.FILE_LINK.equals(value.getValueType())) {
+ value.set(fileLink);
+ } else if (ValueType.FILE_LINK_SEQUENCE.equals(value.getValueType())) {
+ // delete if exists or create if not exists.
+ FileLink[] old = value.extract(ValueType.FILE_LINK_SEQUENCE);
+ FileLink[] current = Arrays.copyOf(old, old.length + 1);
+ current[old.length] = fileLink;
+ value.set(current);
+ }
+ }
+
+ /**
+ * Helping function to remove {@link FileLink} from a {@link Value}
+ *
+ * @param value the {@link Value}
+ * @param fileLink the {@link FileLink}
+ */
+ private void removeFileLinkfromValue(Value value, FileLink fileLink) {
+ if (ValueType.FILE_LINK.equals(value.getValueType())) {
+ value.set(null);
+ } else if (ValueType.FILE_LINK_SEQUENCE.equals(value.getValueType())) {
+ FileLink[] links = Stream.of(value.extract(ValueType.FILE_LINK_SEQUENCE))
+ .filter(link -> !link.equals(fileLink)).toArray(FileLink[]::new);
+ value.set(links);
+ }
+ }
+
+ /**
+ * Helping function to create {@link DescribableContexts}
+ *
+ * @param contextDescribable the {@link ContextDescribable}
+ * @param contextMap the context
+ * @return
+ */
+ private DescribableContexts createDescribableContext(ContextDescribable contextDescribable,
+ Map<ContextType, ContextRoot> contextMap) {
+ DescribableContexts dc = new DescribableContexts();
+ dc.setTestStep(contextService.getTestStep(contextDescribable));
+ if (contextDescribable instanceof TestStep) {
+ dc.setOrdered(contextMap);
+ }
+ if (contextDescribable instanceof Measurement) {
+ List<Measurement> list = new ArrayList<>();
+ list.add((Measurement) contextDescribable);
+ dc.setMeasurements(list);
+ dc.setMeasured(contextMap);
+ }
+ return dc;
+ }
+
+ /**
+ *
+ * Helping function to extract {@link Value} from context
+ *
+ * @param contextType
+ * @param componentName
+ * @param typeRootMap
+ * @param attributeName
+ * @return
+ */
+ private Value findValueInContext(ContextType contextType, String componentName,
+ Map<ContextType, ContextRoot> typeRootMap, String attributeName) {
+
+ ContextRoot contextRoot = typeRootMap.get(contextType);
+ if (contextRoot != null) {
+ List<ContextComponent> components = contextRoot.getContextComponents().stream()
+ .filter(cc -> cc.getName().equals(componentName)).collect(Collectors.toList());
+ if (components != null && !components.isEmpty()) {
+ return components.get(0).getValue(attributeName);
+ }
+ }
+ throw new MDMEntityAccessException(
+ "ContextComponent with name " + componentName + " not found in context of type " + contextType);
+ }
+
+ /**
+ *
+ * @param remotePath
+ * @param value
+ * @return
+ */
+ private FileLink extractFileLink(String remotePath, Value value) {
+ FileLink fileLink = null;
+ if (ValueType.FILE_LINK.equals(value.getValueType())) {
+ fileLink = value.extract(ValueType.FILE_LINK);
+ } else if (ValueType.FILE_LINK_SEQUENCE.equals(value.getValueType())) {
+ List<FileLink> fileLinks = Stream.of(value.extract(ValueType.FILE_LINK_SEQUENCE))
+ .filter(link -> link.getRemotePath().equals(remotePath)).collect(Collectors.toList());
+ fileLink = fileLinks.get(0);
+ }
+ return fileLink;
+ }
+
+ /**
+ * Opens an {@code InputStream} for given {@link FileLink} and copies it to
+ * {@param outputStream}.
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @param filesAttachable the {@link FilesAttachable} {@link Entity} the file is
+ * attached to
+ * @param fileLink the {@link FileLink}
+ * @param outputStream the {link OutputStream}
+ * @throws IOException Thrown if unable to provide as stream
+ */
+ private void streamFileLink(String sourceName, Entity entity, FileLink fileLink, OutputStream outputStream)
+ throws IOException {
+
+ try (InputStream in = getFileService(sourceName).openStream(entity, fileLink)) {
+ ByteStreams.copy(in, outputStream);
+ }
+ }
+
+ /**
+ * Helping function to load an {@link FileService}
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @return the {@link FileService}
+ */
+ private FileService getFileService(String sourceName) {
+ ApplicationContext context = this.connectorService.getContextByName(sourceName);
+ return context.getFileService()
+ .orElseThrow(() -> new MDMFileAccessException("FileService not present in '" + sourceName + "'."));
+ }
+
+ /**
+ * Helping function to load an {@link EntityManager}
+ *
+ * @param sourceName name of the source (MDM {@link Environment})
+ * @return the {@link EntityManager}
+ */
+ private EntityManager getEntityManager(String sourceName) {
+ ApplicationContext context = this.connectorService.getContextByName(sourceName);
+ return context.getEntityManager()
+ .orElseThrow(() -> new MDMEntityAccessException("Entity manager not present in '" + sourceName + "'."));
}
}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/MDMFileAccessException.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/MDMFileAccessException.java
new file mode 100644
index 0000000..4c25cfa
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/control/MDMFileAccessException.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.mdm.businessobjects.control;
+
+public class MDMFileAccessException extends RuntimeException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2670077604805809256L;
+
+ public MDMFileAccessException(String message) {
+ super(message);
+ }
+
+ public MDMFileAccessException(String message, Throwable t) {
+ super(message, t);
+ }
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextCollection.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextCollection.java
index 7c771eb..c77c2f6 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextCollection.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextCollection.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -15,6 +15,8 @@
package org.eclipse.mdm.businessobjects.entity;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -32,16 +34,16 @@
public class ContextCollection {
// consistent naming to ContextActivity.CONTEXT_GROUP_MEASURED
- public Map<ContextType, List<MDMEntity>> measured = new HashMap<>();
+ public Map<ContextType, List<MDMContextEntity>> measured = new HashMap<>();
// consistent naming to ContextActivity.CONTEXT_GROUP_ORDERED
- public Map<ContextType, List<MDMEntity>> ordered = new HashMap<>();
+ public Map<ContextType, List<MDMContextEntity>> ordered = new HashMap<>();
/**
* set the measured context data map
*
* @param contextMap the measured context data map
*/
- public void setMeasuredContext(Map<ContextType, ContextRoot> contextMap) {
+ public void setMeasured(Map<ContextType, ContextRoot> contextMap) {
for (java.util.Map.Entry<ContextType, ContextRoot> setEntry : contextMap.entrySet()) {
@@ -51,9 +53,14 @@
this.measured.put(contextType, new ArrayList<>());
for (ContextComponent contextComponent : contextRoot.getContextComponents()) {
- MDMEntity entity = new MDMEntity(contextComponent);
+ MDMContextEntity entity = new MDMContextEntity(contextComponent);
this.measured.get(contextType).add(entity);
}
+
+ // sort by SortIndex
+ Collections.sort(this.measured.get(contextType), Comparator.comparing(MDMContextEntity::getSortIndex,
+ Comparator.nullsFirst(Comparator.naturalOrder())));
+
}
}
@@ -62,7 +69,7 @@
*
* @param contextMap the ordered context data map
*/
- public void setOrderedContext(Map<ContextType, ContextRoot> contextMap) {
+ public void setOrdered(Map<ContextType, ContextRoot> contextMap) {
for (java.util.Map.Entry<ContextType, ContextRoot> setEntry : contextMap.entrySet()) {
@@ -72,9 +79,13 @@
this.ordered.put(contextType, new ArrayList<>());
for (ContextComponent contextComponent : contextRoot.getContextComponents()) {
- MDMEntity entity = new MDMEntity(contextComponent);
+ MDMContextEntity entity = new MDMContextEntity(contextComponent);
this.ordered.get(contextType).add(entity);
}
+
+ // sort by SortIndex
+ Collections.sort(this.ordered.get(contextType), Comparator.comparing(MDMContextEntity::getSortIndex,
+ Comparator.nullsFirst(Comparator.naturalOrder())));
}
}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextResponse.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextResponse.java
index 846bd29..3c84f90 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextResponse.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/ContextResponse.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -43,8 +43,8 @@
public ContextResponse(Map<String, Map<ContextType, ContextRoot>> contextMap) {
this.data = new ArrayList<>();
ContextCollection contextData = new ContextCollection();
- contextData.setOrderedContext(contextMap.get(ContextActivity.CONTEXT_GROUP_ORDERED));
- contextData.setMeasuredContext(contextMap.get(ContextActivity.CONTEXT_GROUP_MEASURED));
+ contextData.setOrdered(contextMap.get(ContextActivity.CONTEXT_GROUP_ORDERED));
+ contextData.setMeasured(contextMap.get(ContextActivity.CONTEXT_GROUP_MEASURED));
this.data.add(contextData);
}
@@ -57,8 +57,8 @@
public ContextResponse(DescribableContexts context) {
this.data = new ArrayList<>();
ContextCollection contextData = new ContextCollection();
- contextData.setOrderedContext(context.getOrderedContext());
- contextData.setMeasuredContext(context.getMeasuredContext());
+ contextData.setOrdered(context.getOrderedContext());
+ contextData.setMeasured(context.getMeasuredContext());
this.data.add(contextData);
}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/FileSize.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/FileSize.java
new file mode 100644
index 0000000..b51e881
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/FileSize.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.mdm.businessobjects.entity;
+
+import java.io.Serializable;
+
+public class FileSize implements Serializable {
+
+ private static final long serialVersionUID = 1228535240780890498L;
+
+ private String remotePath;
+ private String size;
+
+ public FileSize() {
+ // intentially empty
+ }
+
+ /**
+ *
+ * @return
+ */
+ public String getRemotePath() {
+ return remotePath;
+ }
+
+ /**
+ *
+ * @param remotePath
+ */
+ public void setRemotePath(String remotePath) {
+ this.remotePath = remotePath;
+ }
+
+ /**
+ *
+ * @return
+ */
+ public String getSize() {
+ return size;
+ }
+
+ /**
+ *
+ * @param size
+ */
+ public void setSize(String size) {
+ this.size = size;
+ }
+
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMAttribute.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMAttribute.java
index 3f6fb9f..aa3bc98 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMAttribute.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMAttribute.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -49,6 +49,18 @@
this.dataType = dataType;
}
+ /**
+ * Copy constructor
+ *
+ * @param attribute attribute to copy
+ */
+ public MDMAttribute(MDMAttribute attribute) {
+ this.name = attribute.getName();
+ this.value = attribute.getValue();
+ this.unit = attribute.getUnit();
+ this.dataType = attribute.getDataType();
+ }
+
@Schema(description = "name of the attribute")
public String getName() {
return this.name;
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMContextAttribute.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMContextAttribute.java
new file mode 100644
index 0000000..932c358
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMContextAttribute.java
@@ -0,0 +1,78 @@
+/********************************************************************************
+ * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+package org.eclipse.mdm.businessobjects.entity;
+
+/**
+ * Attribute (Entity for attribute information)
+ *
+ * @author Juergen Kleck, Peak Solution GmbH
+ *
+ */
+public class MDMContextAttribute extends MDMAttribute {
+
+ /** The sort index of the template */
+ private final Integer sortIndex;
+ /** boolean flag if this attribute is readonly or writeable in edit mode */
+ private final Boolean readOnly;
+ /** boolean flag if this attribute is optional in edit mode */
+ private final Boolean optional;
+ /** description text of this attribute */
+ private final String description;
+
+ /**
+ * Constructor
+ *
+ * @param name name of the attribute value
+ * @param value value of the attribute value
+ * @param unit unit of the attribute value
+ * @param dataType data type of the attribute value
+ * @param sortIndex optional sort index of the attribute value
+ * @param readOnly optional flag if it is readonly in edit mode
+ * @param optional optional flag if it is optinal in edit mode
+ */
+ public MDMContextAttribute(String name, Object value, String unit, String dataType, Integer sortIndex,
+ Boolean readOnly, Boolean optional, String description) {
+ super(name, value, unit, dataType);
+ this.sortIndex = sortIndex;
+ this.readOnly = readOnly;
+ this.optional = optional;
+ this.description = description;
+ }
+
+ public MDMContextAttribute(MDMAttribute attribute, Integer sortIndex, Boolean readOnly, Boolean optinal,
+ String description) {
+ super(attribute);
+ this.sortIndex = sortIndex;
+ this.readOnly = readOnly;
+ this.optional = optinal;
+ this.description = description;
+ }
+
+ public Integer getSortIndex() {
+ return sortIndex;
+ }
+
+ public Boolean getReadOnly() {
+ return readOnly;
+ }
+
+ public Boolean isOptional() {
+ return optional;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMContextEntity.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMContextEntity.java
new file mode 100644
index 0000000..58a5184
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMContextEntity.java
@@ -0,0 +1,168 @@
+/********************************************************************************
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+package org.eclipse.mdm.businessobjects.entity;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.eclipse.mdm.api.base.model.BaseEntity;
+import org.eclipse.mdm.api.base.model.ContextComponent;
+import org.eclipse.mdm.api.base.model.Entity;
+import org.eclipse.mdm.api.base.model.Sortable;
+import org.eclipse.mdm.api.base.model.Value;
+import org.eclipse.mdm.api.dflt.model.TemplateAttribute;
+import org.eclipse.mdm.api.dflt.model.TemplateComponent;
+
+/**
+ * MDMEntity (Entity for a business object (contains a list of
+ * {@link MDMContextAttribute}s)
+ *
+ * @author Juergen Kleck, Peak Solution GmbH
+ */
+public class MDMContextEntity extends MDMEntity {
+
+ /**
+ * sort index of the MDM business object
+ */
+ private final Integer sortIndex;
+ /**
+ * list of attribute to transfer
+ */
+ private List<MDMContextAttribute> attributes;
+ /**
+ * list of relations to transfer
+ */
+ private List<MDMContextRelation> relations;
+
+ /**
+ * Constructor.
+ *
+ * @param entity the business object
+ */
+ public MDMContextEntity(Entity entity) {
+ super(entity);
+ // special handling for context component
+ if (entity instanceof ContextComponent) {
+ TemplateComponent tplCmp = TemplateComponent.of((ContextComponent) entity).get();
+ this.sortIndex = tplCmp.getSortIndex();
+ this.attributes = convertAttributeValues(entity.getValues(), tplCmp.getTemplateAttributes());
+ this.relations = convertRelations(entity, tplCmp);
+ } else {
+ this.sortIndex = 0;
+ this.attributes = convertAttributeValues(entity.getValues(), null);
+ this.relations = convertRelations(entity, null);
+ }
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param name Name of the Entity
+ * @param id ID of the Entity
+ * @param type Type of the Entity
+ * @param sourceType Source type of the Entity
+ * @param sourceName Source name of the Entity
+ * @param attributes Attributes of the Entity
+ */
+ public MDMContextEntity(String name, String id, String type, String sourceType, String sourceName,
+ List<MDMContextAttribute> attributes) {
+ super(name, id, type, sourceType, sourceName, Collections.emptyList());
+ this.sortIndex = 0;
+ if (attributes != null) {
+ this.attributes = new ArrayList<>(attributes);
+ } else {
+ this.attributes = new ArrayList<>();
+ }
+ this.relations = new ArrayList<>();
+ }
+
+ public Integer getSortIndex() {
+ return sortIndex;
+ }
+
+ public List<MDMContextAttribute> getAttributes() {
+ return Collections.unmodifiableList(this.attributes);
+ }
+
+ public List<MDMContextRelation> getRelations() {
+ return Collections.unmodifiableList(this.relations);
+ }
+
+ /**
+ * converts the MDM business object values to string values
+ *
+ * @param values values of a MDM business object
+ * @param tplAttributes optional list of template attributes
+ * @return list with converted attribute values
+ */
+ private List<MDMContextAttribute> convertAttributeValues(Map<String, Value> values,
+ List<TemplateAttribute> tplAttributes) {
+
+ List<MDMContextAttribute> listAttrs = new ArrayList<>();
+ for (MDMAttribute attr : super.convertAttributeValues(values)) {
+ TemplateAttribute tplAttr = null;
+
+ if (tplAttributes != null && !tplAttributes.isEmpty()) {
+ tplAttr = tplAttributes.stream().filter(tpl -> tpl.getName().equals(attr.getName())).findFirst()
+ .orElse(null);
+ }
+
+ listAttrs.add(toContextAttribute(attr, tplAttr));
+ }
+
+ // clear unneeded elements
+ listAttrs.removeIf(attr -> attr.getName().equals(BaseEntity.ATTR_NAME)
+ || attr.getName().equals(BaseEntity.ATTR_MIMETYPE) || attr.getName().equals(Sortable.ATTR_SORT_INDEX));
+
+ // pre-sort attributes by sort index
+ Collections.sort(listAttrs, Comparator.comparing(MDMContextAttribute::getSortIndex,
+ Comparator.nullsFirst(Comparator.naturalOrder())));
+
+ return listAttrs;
+ }
+
+ private MDMContextAttribute toContextAttribute(MDMAttribute attr, TemplateAttribute tplAttr) {
+ Integer sortIndex = null;
+ Boolean optional = null;
+ Boolean readOnly = null;
+ String description = null;
+ if (tplAttr != null) {
+ sortIndex = tplAttr.getCatalogAttribute().getSortIndex();
+ description = tplAttr.getCatalogAttribute().getDescription();
+ optional = (Boolean) tplAttr.isOptional();
+ readOnly = (Boolean) tplAttr.isValueReadOnly();
+ }
+ return new MDMContextAttribute(attr, sortIndex, readOnly, optional, description);
+ }
+
+ /**
+ * Converts all relations to MDMContextRelations. The potential ContextType of
+ * the children is assumed to be the parent's one.
+ *
+ * @param entity to get {@link MDMContextRelation}s for
+ * @return a list of {@link MDMContextRelation}s
+ */
+ private List<MDMContextRelation> convertRelations(Entity entity, TemplateComponent tplCmp) {
+
+ String parentId = tplCmp.getParentTemplateComponent().map(p -> p.getID()).orElse(null);
+
+ return convertRelations(entity).stream().map(m -> new MDMContextRelation(m, parentId))
+ .collect(Collectors.toList());
+ }
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMContextRelation.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMContextRelation.java
new file mode 100644
index 0000000..2d37981
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMContextRelation.java
@@ -0,0 +1,68 @@
+/********************************************************************************
+ * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+package org.eclipse.mdm.businessobjects.entity;
+
+import java.util.List;
+
+import org.eclipse.mdm.api.base.model.ContextType;
+
+/**
+ * Relation (Entity for relation information)
+ *
+ * @author Juergen Kleck, Peak Solution GmbH
+ *
+ */
+public class MDMContextRelation extends MDMRelation {
+
+ private String parentId;
+
+ /**
+ * Default constructor used for entity deserialization
+ */
+ public MDMContextRelation() {
+
+ }
+
+ /**
+ * Constructor
+ *
+ * @param name name of the relation
+ * @param type type of the relation
+ * @param entityType type of the related entity
+ * @param contextType ContextType of the entity if the entityType has one
+ * @param ids ids of the related entities
+ * @param parentId the parent template id
+ */
+ public MDMContextRelation(String name, RelationType type, String entityType, ContextType contextType,
+ List<String> ids, String parentId) {
+ super(name, type, entityType, contextType, ids);
+ this.parentId = parentId;
+ }
+
+ /**
+ * Constructor
+ *
+ * @param relation MDMRelation
+ * @param parentId parentId
+ */
+ public MDMContextRelation(MDMRelation relation, String parentId) {
+ super(relation);
+ this.parentId = parentId;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+}
\ No newline at end of file
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntity.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntity.java
index 43b972f..c7d959a 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntity.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMEntity.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -34,32 +34,45 @@
/**
* MDMEntity (Entity for a business object (contains a list of
* {@link MDMAttribute}s)
- *
- * @author Sebastian Dirsch, Gigatronik Ingolstadt GmbH
*
+ * @author Sebastian Dirsch, Gigatronik Ingolstadt GmbH
*/
@Schema(description = "Representation of a MDM entity")
public class MDMEntity {
- /** name of the MDM business object */
+ /**
+ * name of the MDM business object
+ */
private final String name;
- /** id of the MDM business object */
+ /**
+ * id of the MDM business object
+ */
private final String id;
- /** type as String of the MDM business object (e.g. TestStep) */
+ /**
+ * type as String of the MDM business object (e.g. TestStep)
+ */
private final String type;
- /** source type name of the business object at the data source */
+ /**
+ * source type name of the business object at the data source
+ */
private final String sourceType;
- /** source name (e.g. MDM Environment name) */
+ /**
+ * source name (e.g. MDM Environment name)
+ */
private final String sourceName;
- /** list of attribute to transfer */
+ /**
+ * list of attribute to transfer
+ */
private List<MDMAttribute> attributes;
- /** list of relations to transfer */
+ /**
+ * list of relations to transfer
+ */
private List<MDMRelation> relations;
/**
* Constructor.
- *
+ *
* @param entity the business object
*/
public MDMEntity(Entity entity) {
@@ -74,7 +87,7 @@
/**
* Constructor.
- *
+ *
* @param name Name of the Entity
* @param id ID of the Entity
* @param type Type of the Entity
@@ -84,18 +97,12 @@
*/
public MDMEntity(String name, String id, String type, String sourceType, String sourceName,
List<MDMAttribute> attributes) {
- this.name = name;
- this.id = id;
- this.type = type;
- this.sourceType = sourceType;
- this.sourceName = sourceName;
- this.attributes = new ArrayList<>(attributes);
- this.relations = new ArrayList<>();
+ this(name, id, type, sourceType, sourceName, attributes, Collections.emptyList());
}
/**
* Constructor.
- *
+ *
* @param name Name of the Entity
* @param id ID of the Entity
* @param type Type of the Entity
@@ -105,14 +112,22 @@
* @param relations Relations of the Entity
*/
public MDMEntity(String name, String id, String type, String sourceType, String sourceName,
- List<MDMAttribute> attributes, List<MDMRelation> relations) {
+ List<MDMAttribute> attributes, List<? extends MDMRelation> relations) {
this.name = name;
this.id = id;
this.type = type;
this.sourceType = sourceType;
this.sourceName = sourceName;
- this.attributes = new ArrayList<>(attributes);
- this.relations = new ArrayList<>(relations);
+ if (attributes != null) {
+ this.attributes = new ArrayList<>(attributes);
+ } else {
+ this.attributes = new ArrayList<>();
+ }
+ if (relations != null) {
+ this.relations = new ArrayList<>(relations);
+ } else {
+ this.relations = new ArrayList<>();
+ }
}
public String getName() {
@@ -135,21 +150,21 @@
return this.sourceName;
}
- public List<MDMAttribute> getAttributes() {
+ public List<? extends MDMAttribute> getAttributes() {
return Collections.unmodifiableList(this.attributes);
}
- public List<MDMRelation> getRelations() {
+ public List<? extends MDMRelation> getRelations() {
return Collections.unmodifiableList(this.relations);
}
/**
* converts the MDM business object values to string values
- *
+ *
* @param values values of a MDM business object
* @return list with converted attribute values
*/
- private List<MDMAttribute> convertAttributeValues(Map<String, Value> values) {
+ protected List<MDMAttribute> convertAttributeValues(Map<String, Value> values) {
List<MDMAttribute> listAttrs = new ArrayList<>();
Set<java.util.Map.Entry<String, Value>> set = values.entrySet();
@@ -177,12 +192,12 @@
/**
* converts a single type MDM business object value to a attribute
- *
+ *
* @param name name of the attribute value
* @param singleValue single MDM business object value
* @return the converted attribute value
*/
- private MDMAttribute singleType2Attribute(String name, Value singleValue) {
+ protected MDMAttribute singleType2Attribute(String name, Value singleValue) {
Object value = Serializer.serializeValue(singleValue);
String unit = singleValue.getUnit();
String dt = singleValue.getValueType().toString();
@@ -191,12 +206,12 @@
/**
* converts a sequence type MDM business object value to a attribute
- *
+ *
* @param name name of the attribute value
* @param sequenceValue sequence MDM business object value
* @return the converted attribute value
*/
- private MDMAttribute sequenceType2Attribute(String name, Value sequenceValue) {
+ protected MDMAttribute sequenceType2Attribute(String name, Value sequenceValue) {
if (sequenceValue.getValueType().isStringSequence()) {
return stringSeq2Attribute(name, sequenceValue);
@@ -214,12 +229,12 @@
/**
* converts a string sequence MDM business object value to a attribute The
* result is a separated string (separator: ';')
- *
+ *
* @param name name of the attribute value
* @param value string sequence MDM business object value
* @return the converted attribute value
*/
- private MDMAttribute stringSeq2Attribute(String name, Value value) {
+ protected MDMAttribute stringSeq2Attribute(String name, Value value) {
String[] stringSeq = value.extract();
StringBuffer sb = new StringBuffer();
@@ -236,18 +251,21 @@
/**
* Converts all relations to MDMRelations. The potential ContextType of the
* children is assumed to be the parent's one.
- *
+ *
* @param entity to get
* {@link org.eclipse.mdm.businessobjects.entity.MDMRelation}s for
* @return a list of {@link org.eclipse.mdm.businessobjects.entity.MDMRelation}s
*/
- private List<MDMRelation> convertRelations(Entity entity) {
+ protected List<MDMRelation> convertRelations(Entity entity) {
// write out children
Core core = ServiceUtils.getCore(entity);
// get children hash (type is key)
return HashMap.ofAll(core.getChildrenStore().getCurrent())
+ // if we don't check the size we crash, some elements may not have a relation
+ .filter(entry -> entry._2.size() > 0)
// create child relations (the ContextType is assumed to be same as the parent's
// one
+ .filterValues(l -> l.size() > 0)
.map(entry -> new MDMRelation(null, MDMRelation.RelationType.CHILDREN, entry._1.getSimpleName(),
ServiceUtils.getContextType(entry._2.get(0)),
// call get id on all related entities
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMFileLink.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMFileLink.java
new file mode 100644
index 0000000..97e57e8
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMFileLink.java
@@ -0,0 +1,70 @@
+/********************************************************************************
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+package org.eclipse.mdm.businessobjects.entity;
+
+import org.eclipse.mdm.api.base.model.FileLink;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * MDMFileLink (Entity for a {@link FileLink})
+ *
+ */
+@Schema(description = "Representation of a MDM FileLink")
+public class MDMFileLink {
+
+ private final String remotePath;
+
+ private final String mimeType;
+
+ private final String description;
+
+ /**
+ * Constructor.
+ *
+ * @param remotePath
+ * @param mimeType
+ * @param description
+ */
+ public MDMFileLink(String remotePath, String mimeType, String description) {
+ this.remotePath = remotePath;
+ this.mimeType = mimeType;
+ this.description = description;
+ }
+
+ /**
+ * @return the remotePath
+ */
+ @Schema(description = "The remote path of the FileLink")
+ public String getRemotePath() {
+ return remotePath;
+ }
+
+ /**
+ * @return the mimeType
+ */
+ @Schema(description = "The mimetype of the FileLink")
+ public String getMimeType() {
+ return mimeType;
+ }
+
+ /**
+ * @return the description
+ */
+ @Schema(description = "The description of the FileLink")
+ public String getDescription() {
+ return description;
+ }
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMRelation.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMRelation.java
index d4ca79e..9c93727 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMRelation.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/MDMRelation.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -65,6 +65,19 @@
this.ids = ids;
}
+ /**
+ * Copy constructor
+ *
+ * @param relation relation to copy
+ */
+ public MDMRelation(MDMRelation relation) {
+ this.name = relation.getName();
+ this.type = relation.getType();
+ this.entityType = relation.getEntityType();
+ this.contextType = relation.getContextType();
+ this.ids = relation.getIds();
+ }
+
public String getName() {
return this.name;
}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/User.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/User.java
new file mode 100644
index 0000000..7051983
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/entity/User.java
@@ -0,0 +1,35 @@
+/********************************************************************************
+ * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+package org.eclipse.mdm.businessobjects.entity;
+
+import java.util.List;
+
+public class User {
+ private String username;
+ private List<String> roles;
+
+ public String getUsername() {
+ return username;
+ }
+ public void setUsername(String username) {
+ this.username = username;
+ }
+ public List<String> getRoles() {
+ return roles;
+ }
+ public void setRoles(List<String> roles) {
+ this.roles = roles;
+ }
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/ContextService.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/ContextService.java
index 3a8b1af..3eaf779 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/ContextService.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/ContextService.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -17,6 +17,7 @@
import static org.eclipse.mdm.businessobjects.control.ContextActivity.CONTEXT_GROUP_MEASURED;
import static org.eclipse.mdm.businessobjects.control.ContextActivity.CONTEXT_GROUP_ORDERED;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.NoSuchElementException;
@@ -34,15 +35,17 @@
import org.eclipse.mdm.api.base.model.Entity;
import org.eclipse.mdm.api.base.model.Environment;
import org.eclipse.mdm.api.base.model.Measurement;
+import org.eclipse.mdm.api.base.model.Test;
import org.eclipse.mdm.api.base.model.TestStep;
import org.eclipse.mdm.api.dflt.EntityManager;
import org.eclipse.mdm.api.dflt.model.EntityFactory;
+import org.eclipse.mdm.api.dflt.model.TemplateComponent;
import org.eclipse.mdm.api.dflt.model.TemplateRoot;
import org.eclipse.mdm.api.dflt.model.TemplateTestStep;
import org.eclipse.mdm.businessobjects.control.ContextActivity;
import org.eclipse.mdm.businessobjects.control.MDMEntityAccessException;
-import org.eclipse.mdm.businessobjects.entity.MDMAttribute;
-import org.eclipse.mdm.businessobjects.entity.MDMEntity;
+import org.eclipse.mdm.businessobjects.entity.MDMContextAttribute;
+import org.eclipse.mdm.businessobjects.entity.MDMContextEntity;
import org.eclipse.mdm.businessobjects.utils.RequestBody;
import org.eclipse.mdm.businessobjects.utils.Serializer;
import org.eclipse.mdm.businessobjects.utils.ServiceUtils;
@@ -83,6 +86,31 @@
* Possible {@link ContextType}s are {@link ContextType}.UNITUNDERTEST,
* {@link ContextType}.TESTSEQUENCE and {@link ContextType}.TESTEQUIPMENT.
*
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param testId the id of {@link TestStep} context is looked up for
+ * @param includeVariable true then teststep variable data is included, false
+ * only test constant data is included
+ * @param contextTypes list of {@link ContextType}s
+ * @return the ordered and measured context data as context object for the
+ * identified {@link TestStep}
+ */
+ public Try<Map<String, Map<ContextType, ContextRoot>>> getTestContext(Value<String> sourceName,
+ Value<String> testId, boolean includeVariable, ContextType... contextTypes) {
+ Try<Test> test = entityService.find(sourceName, Test.class, testId);
+ return getTestContext(sourceName, test, includeVariable, contextTypes);
+ }
+
+ /**
+ * Vavr conform version of contextActivity getTestStepContext function.
+ *
+ * returns the ordered and measurement context for a {@link TestStep}. If no
+ * {@link ContextType}s are defined for this method call, the method returns all
+ * context informations of the available {@link ContextType}s. Otherwise you can
+ * specify a list of {@link ContextType}s.
+ *
+ * Possible {@link ContextType}s are {@link ContextType}.UNITUNDERTEST,
+ * {@link ContextType}.TESTSEQUENCE and {@link ContextType}.TESTEQUIPMENT.
+ *
* @param sourceName name of the source (MDM {@link Environment} name)
* @param testStepId the id of {@link TestStep} context is looked up for
* @param contextTypes list of {@link ContextType}s
@@ -130,6 +158,105 @@
}
/**
+ * Vavr conform version of contextActivity getTestContext function.
+ *
+ * returns the ordered and measurement context for a {@link Test}. If no
+ * {@link ContextType}s are defined for this method call, the method returns all
+ * context informations of the available {@link ContextType}s. Otherwise you can
+ * specify a list of {@link ContextType}s.
+ *
+ * Possible {@link ContextType}s are {@link ContextType}.UNITUNDERTEST,
+ * {@link ContextType}.TESTSEQUENCE and {@link ContextType}.TESTEQUIPMENT.
+ *
+ * @param sourceName name of the source (MDM {@link Environment} name)
+ * @param test {@link Try} of the {@link Test}
+ * @param includeVariable true then teststep variable data is included, false
+ * only test constant data is included
+ * @param contextTypes list of {@link ContextType}s
+ * @return the ordered and measured context data as context object for the
+ * identified {@link TestStep}
+ */
+ private Try<Map<String, Map<ContextType, ContextRoot>>> getTestContext(Value<String> sourceName, Try<Test> test,
+ boolean includeVariable, ContextType... contextTypes) {
+
+ // init an empty hashmap
+ HashMap<ContextType, ContextRoot> mapOrdered = HashMap.empty();
+ HashMap<ContextType, ContextRoot> mapMeasured = HashMap.empty();
+
+ if (test.isSuccess()) {
+
+ java.util.List<TestStep> list = getEntityManager(sourceName).get().loadChildren(test.get(), TestStep.class);
+
+ // merge all attributes from all test steps together
+ for (TestStep testStep : list) {
+ Try<Map<ContextType, ContextRoot>> contextOrdered = getEntityManager(sourceName)
+ .map(e -> HashMap.ofAll(e.loadContexts(testStep, contextTypes)));
+
+ if (contextOrdered.isSuccess()) {
+ mapOrdered = mapOrdered.merge(contextOrdered.get());
+ }
+
+ Try<Map<ContextType, ContextRoot>> contextMeasured = getEntityManager(sourceName).map(e -> HashMap
+ .ofAll(e.loadContexts(findMeasurements(sourceName, testStep).get().get(), contextTypes)));
+
+ if (contextMeasured.isSuccess()) {
+ mapMeasured = mapMeasured.merge(contextMeasured.get());
+ }
+ }
+
+ // filter data out to reduce traffic in the json rest service
+ if (!includeVariable) {
+ mapOrdered.values().forEach(ctxRoot -> {
+ java.util.List<ContextComponent> removals = new ArrayList<>();
+ ctxRoot.getContextComponents().forEach(ctxCmp -> {
+ if (TemplateComponent.of(ctxCmp).isPresent()) {
+ org.eclipse.mdm.api.base.model.Value attr = TemplateComponent.of(ctxCmp).get()
+ .getValue("TestStepSeriesVariable");
+ if (attr.isValid() && ((Boolean) attr.extract()).booleanValue()) {
+ removals.add(ctxCmp);
+ }
+ }
+ });
+ for (ContextComponent ctxCmp : removals) {
+ ctxRoot.removeContextComponent(ctxCmp.getName());
+ }
+ });
+ mapMeasured.values().forEach(ctxRoot -> {
+ java.util.List<ContextComponent> removals = new ArrayList<>();
+ ctxRoot.getContextComponents().forEach(ctxCmp -> {
+ if (TemplateComponent.of(ctxCmp).isPresent()) {
+ org.eclipse.mdm.api.base.model.Value attr = TemplateComponent.of(ctxCmp).get()
+ .getValue("TestStepSeriesVariable");
+ if (attr.isValid() && ((Boolean) attr.extract()).booleanValue()) {
+ removals.add(ctxCmp);
+ }
+ }
+ });
+ for (ContextComponent ctxCmp : removals) {
+ ctxRoot.removeContextComponent(ctxCmp.getName());
+ }
+ });
+ }
+ }
+
+ // set final for follow-up lambda
+ final HashMap<ContextType, ContextRoot> tmpMapOrdered = mapOrdered;
+ final HashMap<ContextType, ContextRoot> tmpMapMeasured = mapMeasured;
+
+ // convert to try class object
+ Try<Map<ContextType, ContextRoot>> contextOrdered = Try.of(() -> tmpMapOrdered);
+ Try<Map<ContextType, ContextRoot>> contextMeasured = Try.of(() -> tmpMapMeasured);
+
+ return Try
+ .of(() -> Lazy
+ .of(() -> HashMap.of(CONTEXT_GROUP_ORDERED,
+ contextOrdered.recover(NoSuchElementException.class, t -> HashMap.empty()).get(),
+ CONTEXT_GROUP_MEASURED,
+ contextMeasured.recover(NoSuchElementException.class, t -> HashMap.empty()).get()))
+ .get());
+ }
+
+ /**
* Vavr conform version of contextActivity getMeasurementContext function.
*
* returns the ordered and measurement context for a {@link Measurement}. If no
@@ -204,11 +331,22 @@
}
/**
- *
+ *
* @param sourceName
* @param testStep
* @return
*/
+ private Try<List<Measurement>> findMeasurements(Value<String> sourceName, TestStep testStep) {
+ return getEntityManager(sourceName)
+ .map(e -> Lazy.of(() -> List.ofAll(e.loadChildren(testStep, TestStep.CHILD_TYPE_MEASUREMENT))).get());
+ }
+
+ /**
+ *
+ * @param sourceName
+ * @param measurement
+ * @return
+ */
private Try<TestStep> findTestStep(Value<String> sourceName, Try<Measurement> measurement) {
return getEntityManager(sourceName)
.map(e -> Lazy.of(() -> e.loadParent(measurement.get(), Measurement.PARENT_TYPE_TESTSTEP).get()).get());
@@ -300,7 +438,8 @@
});
}
- private void updateContextComponent(ContextComponent contextComponent, java.util.List<MDMAttribute> nameValues) {
+ private void updateContextComponent(ContextComponent contextComponent,
+ java.util.List<MDMContextAttribute> nameValues) {
nameValues.forEach(attribute -> Serializer.applyValue(contextComponent.getValue(attribute.getName()),
attribute.getValue()));
}
@@ -321,7 +460,7 @@
"Cannot find TemplateRoot for ContextType " + contextType + " on Template TestStep " + tpl));
}
- private TestStep getTestStep(ContextDescribable contextDescribable) {
+ public TestStep getTestStep(ContextDescribable contextDescribable) {
if (contextDescribable instanceof TestStep) {
return (TestStep) contextDescribable;
} else {
@@ -352,7 +491,7 @@
}
}
- private void persist(DescribableContexts ec) {
+ public void persist(DescribableContexts ec) {
Transaction t = null;
try {
// start transaction to persist ValueList
@@ -396,7 +535,7 @@
* @return the {@link io.vavr.collection.List<Object>}
*/
@SuppressWarnings("unchecked")
- private List<Object> transformList(Object obj) {
+ public List<Object> transformList(Object obj) {
if (obj instanceof java.util.List) {
return List.ofAll(java.util.List.class.cast(obj));
} else {
@@ -405,8 +544,8 @@
}
}
- private MDMEntity transformToMDMEntity(Map<String, Object> component) {
- return new MDMEntity(
+ public MDMContextEntity transformToMDMEntity(Map<String, Object> component) {
+ return new MDMContextEntity(
component.get("name").map(Object::toString)
.getOrElseThrow(() -> new MDMEntityAccessException("Missing attribute 'name' in MDMEntity")),
component.get("id").map(Object::toString).getOrElse(""),
@@ -416,7 +555,7 @@
transformList(component.get("attributes").getOrElseThrow(
() -> new MDMEntityAccessException("Missing attribute 'attributes' in MDMEntity")))
.map(this::transformMap)
- .map(m -> new MDMAttribute(
+ .map(m -> new MDMContextAttribute(
m.get("name").map(Object::toString)
.getOrElseThrow(() -> new MDMEntityAccessException(
"Missing attribute 'name' in MDMAttribute")),
@@ -424,7 +563,7 @@
.getOrElseThrow(() -> new MDMEntityAccessException(
"Missing attribute 'value' in MDMAttribute")),
m.get("unit").map(Object::toString).getOrElse(""),
- m.get("datatype").map(Object::toString).getOrElse("")))
+ m.get("datatype").map(Object::toString).getOrElse(""), null, null, null, null))
.toJavaList());
}
}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityFileLink.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityFileLink.java
deleted file mode 100644
index f8dafcc..0000000
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/service/EntityFileLink.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- ********************************************************************************/
-
-package org.eclipse.mdm.businessobjects.service;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.StreamingOutput;
-
-import org.eclipse.mdm.api.base.model.FileLink;
-import org.eclipse.mdm.api.base.model.FilesAttachable;
-import org.eclipse.mdm.businessobjects.control.FileLinkActivity;
-import org.eclipse.mdm.businessobjects.control.MDMEntityAccessException;
-
-public class EntityFileLink {
- private FilesAttachable entity;
- private FileLink fileLink;
-
- public EntityFileLink(FilesAttachable entity, String remotePath) {
- this.entity = entity;
- this.fileLink = findFileLink(remotePath);
- }
-
- public FilesAttachable getEntity() {
- return entity;
- }
-
- public FileLink getFileLink() {
- return fileLink;
- }
-
- public StreamingOutput toStreamingOutput(FileLinkActivity fileLinkActivity, String sourceName) {
- return new StreamingOutput() {
- @Override
- public void write(OutputStream output) throws IOException, WebApplicationException {
- fileLinkActivity.streamFileLink(sourceName, entity, fileLink, output);
- }
- };
- }
-
- private FileLink findFileLink(String remotePath) {
- for (FileLink l : entity.getFileLinks()) {
- if (l.isRemote() && l.getRemotePath().equals(remotePath)) {
- return l;
- }
- }
- throw new MDMEntityAccessException("FileLink with remotePath " + remotePath + " not found!");
- }
-}
\ No newline at end of file
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/EntityTypeUtil.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/EntityTypeUtil.java
new file mode 100644
index 0000000..536eb77
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/EntityTypeUtil.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.mdm.businessobjects.utils;
+
+import org.eclipse.mdm.api.base.model.ContextDescribable;
+import org.eclipse.mdm.api.base.model.FilesAttachable;
+import org.eclipse.mdm.api.base.model.Measurement;
+import org.eclipse.mdm.api.base.model.Test;
+import org.eclipse.mdm.api.base.model.TestStep;
+import org.eclipse.mdm.businessobjects.control.MDMEntityAccessException;
+
+public class EntityTypeUtil {
+
+ private static final String ENTITYTYPE_TEST = "TEST";
+ private static final String ENTITYTYPE_TESTSTEP = "TESTSTEP";
+ private static final String ENTITYTYPE_MEASUREMENT = "MEASUREMENT";
+
+ public static Class<? extends FilesAttachable> getFilesAttachableClassByEntityType(String entityType) {
+ Class<? extends FilesAttachable> response;
+ switch (entityType.toUpperCase()) {
+ case ENTITYTYPE_TEST:
+ response = Test.class;
+ break;
+ case ENTITYTYPE_TESTSTEP:
+ response = TestStep.class;
+ break;
+ case ENTITYTYPE_MEASUREMENT:
+ response = Measurement.class;
+ break;
+ default:
+ throw new MDMEntityAccessException("Given entity type is unknown or not implementing FilesAttachable interface.");
+ }
+ return response;
+ }
+
+ public static Class<? extends ContextDescribable> getContextDescribableClassByEntityType(String entityType) {
+ Class<? extends ContextDescribable> response;
+ switch (entityType.toUpperCase()) {
+ case ENTITYTYPE_TESTSTEP:
+ response = TestStep.class;
+ break;
+ case ENTITYTYPE_MEASUREMENT:
+ response = Measurement.class;
+ break;
+ default:
+ throw new MDMEntityAccessException("Given entity type is unknown or not implementing ContextDescribable interface.");
+ }
+ return response;
+ }
+}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ISODateDeseralizer.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ISODateDeseralizer.java
index 0c2587a..e3882e2 100755
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ISODateDeseralizer.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ISODateDeseralizer.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -17,6 +17,7 @@
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.regex.Pattern;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonTokenId;
@@ -39,6 +40,9 @@
transient DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ // use pattern for the dateformat as we only compile this
+ private static final Pattern pattern = Pattern.compile("\\d{4}-\\d{2}-\\d{2}T\\d{2}\\:\\d{2}\\:\\d{2}Z");
+
/**
* Deserialize JSON and try to parse every String as an ISO8601 date
*/
@@ -47,8 +51,9 @@
// try to parse every string as a date
// TODO anehmer on 2018-04-30: this approach could lead to a performance leak as
// every incoming string is tried to be converted into a date though the
- // appraoch is very generic
- if (jp.getCurrentTokenId() == JsonTokenId.ID_STRING) {
+ // approach is very generic
+ // Optimized with pre-compiled pattern to avoid random exception throwing
+ if (jp.getCurrentTokenId() == JsonTokenId.ID_STRING && jp.getTextLength() > 0 && pattern.matcher(jp.getText()).matches()) {
try {
return LocalDateTime.parse(jp.getText(), dateFormatter);
} catch (Exception e) {
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/MDMExceptionMapper.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/MDMExceptionMapper.java
new file mode 100644
index 0000000..99fd5d5
--- /dev/null
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/MDMExceptionMapper.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.mdm.businessobjects.utils;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import com.google.common.base.Throwables;
+
+@Provider
+public class MDMExceptionMapper implements ExceptionMapper<Throwable> {
+ @Override
+ public Response toResponse(Throwable t) {
+ return Response.status(Status.INTERNAL_SERVER_ERROR).entity(Throwables.getStackTraceAsString(t)).build();
+ }
+}
\ No newline at end of file
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/RequestBody.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/RequestBody.java
index 7a4a779..61c4841 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/RequestBody.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/RequestBody.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -44,7 +44,8 @@
static {
mapper = new ObjectMapper();
SimpleModule simpleModule = new SimpleModule();
- simpleModule.addDeserializer(Object.class, new ISODateDeseralizer());
+ // disabled deserializer as ContextService.updateContextDescribableContext invokes a parsing of ISO date anyways
+ //simpleModule.addDeserializer(Object.class, new ISODateDeseralizer());
mapper.registerModule(simpleModule);
}
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/Serializer.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/Serializer.java
index 68be7da..998b0aa 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/Serializer.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/Serializer.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -28,9 +28,9 @@
import org.eclipse.mdm.api.base.model.Value;
import org.eclipse.mdm.api.base.model.ValueType;
import org.eclipse.mdm.businessobjects.control.MDMEntityAccessException;
+import org.eclipse.mdm.businessobjects.entity.MDMFileLink;
import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableMap;
/**
* Serializer for values.
@@ -55,9 +55,8 @@
}
}
- public static Map<String, String> serializeFileLink(FileLink fileLink) {
- return ImmutableMap.of("remotePath", fileLink.getRemotePath(), "mimeType", fileLink.getMimeType().toString(),
- "description", fileLink.getDescription());
+ public static MDMFileLink serializeFileLink(FileLink fileLink) {
+ return new MDMFileLink(fileLink.getRemotePath(), fileLink.getMimeType().toString(), fileLink.getDescription());
}
public static LocalDateTime parseDate(String value) {
@@ -131,12 +130,16 @@
} else if (type.isFileLinkSequence()) {
if (newValue instanceof FileLink[]) {
return newValue;
- } else if (newValue instanceof List && !((List<?>) newValue).isEmpty()) {
- List<FileLink> fileLinks = new ArrayList<>();
- for (Object o : (List<?>) newValue) {
- fileLinks.add(deserializeFileLink(o));
+ } else if (newValue instanceof List) {
+ if (((List<?>) newValue).isEmpty()) {
+ return new FileLink[0];
+ } else {
+ List<FileLink> fileLinks = new ArrayList<>();
+ for (Object o : (List<?>) newValue) {
+ fileLinks.add(deserializeFileLink(o));
+ }
+ return fileLinks.toArray(new FileLink[0]);
}
- return fileLinks.toArray(new FileLink[0]);
}
}
// TODO mkoller on 2018-12-06: Missing ValueTypes: ByteStream, Blob,
@@ -146,7 +149,10 @@
}
private static FileLink deserializeFileLink(Object newValue) {
- if (newValue instanceof Map<?, ?>) {
+
+ if (newValue == null || newValue instanceof String && ((String) newValue).trim().isEmpty()) {
+ return null;
+ } else if (newValue instanceof Map<?, ?>) {
Map<?, ?> map = (Map<?, ?>) newValue;
String remotePath = Objects.toString(map.get("remotePath"));
MimeType mimeType = new MimeType(Objects.toString(map.get("mimeType")));
diff --git a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ServiceUtils.java b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ServiceUtils.java
index 43443dc..d221850 100644
--- a/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ServiceUtils.java
+++ b/org.eclipse.mdm.businessobjects/src/main/java/org/eclipse/mdm/businessobjects/utils/ServiceUtils.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -40,12 +40,7 @@
import org.eclipse.mdm.api.base.query.FilterItem;
import org.eclipse.mdm.api.dflt.ApplicationContext;
import org.eclipse.mdm.api.dflt.EntityManager;
-import org.eclipse.mdm.api.dflt.model.CatalogAttribute;
-import org.eclipse.mdm.api.dflt.model.CatalogComponent;
-import org.eclipse.mdm.api.dflt.model.TemplateAttribute;
-import org.eclipse.mdm.api.dflt.model.TemplateComponent;
-import org.eclipse.mdm.api.dflt.model.TemplateRoot;
-import org.eclipse.mdm.api.dflt.model.ValueList;
+import org.eclipse.mdm.api.dflt.model.*;
import org.eclipse.mdm.businessobjects.control.FilterParser;
import org.eclipse.mdm.businessobjects.entity.I18NResponse;
import org.eclipse.mdm.businessobjects.entity.MDMEntityResponse;
@@ -346,4 +341,5 @@
return (Core) getMetod.invoke(e);
}).get();
}
+
}
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/FileLinkActivityTest.java b/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/FileLinkActivityTest.java
index 494a475..8f36ca0 100644
--- a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/FileLinkActivityTest.java
+++ b/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/boundary/FileLinkActivityTest.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -63,6 +63,7 @@
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
import org.junit.Before;
+import org.junit.Ignore;
import com.google.common.collect.ImmutableMap;
@@ -121,6 +122,7 @@
.thenReturn(new ByteArrayInputStream("xyz".getBytes()));
}
+ @Ignore
@org.junit.Test
public void testMDMLinksAttribute() {
// request test and check MDMLinks attribute
@@ -135,6 +137,7 @@
hasItems("text/plain", "application/octet-stream", "application/octet-stream"));
}
+ @Ignore
@org.junit.Test
public void testFileDownload() {
RestAssured.given().pathParam("SOURCENAME", ENV).pathParam("TESTID", "1")
@@ -143,6 +146,7 @@
.contentType("text/plain").body(equalTo("Some text"));
}
+ @Ignore
@org.junit.Test
public void testFileDownloadWithSpecialChars() {
RestAssured.given().pathParam("SOURCENAME", ENV).pathParam("TESTID", "1")
diff --git a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/SerializerTest.java b/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/SerializerTest.java
index b68b7ae..64516aa 100644
--- a/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/SerializerTest.java
+++ b/org.eclipse.mdm.businessobjects/src/test/java/org/eclipse/mdm/businessobjects/utils/SerializerTest.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -123,32 +123,4 @@
assertThat((FileLink[]) Serializer.deserializeValue(ValueType.FILE_LINK_SEQUENCE, Arrays.asList(map1, map2)))
.containsExactly(link1, link2);
}
-
- @Test
- public void testSerializeFileLink() throws Exception {
-
- FileLink link1 = FileLink.newRemote("root/fileLink.pdf", new MimeType("application/pdf"), "desc");
-
- Map<String, String> map = ImmutableMap.of("remotePath", "root/fileLink.pdf", "mimeType", "application/pdf",
- "description", "desc");
-
- assertThat(Serializer.serializeValue(ValueType.FILE_LINK.create("fileLink", link1))).isEqualTo(map);
- }
-
- @Test
- public void testSerializeFileLinkSequence() throws Exception {
-
- FileLink link1 = FileLink.newRemote("root/fileLink1.pdf", new MimeType("application/pdf"), "desc1");
- FileLink link2 = FileLink.newRemote("root/image.jpeg", new MimeType("application/jpeg"), "desc2");
-
- Map<String, String> map1 = ImmutableMap.of("remotePath", "root/fileLink1.pdf", "mimeType", "application/pdf",
- "description", "desc1");
-
- Map<String, String> map2 = ImmutableMap.of("remotePath", "root/image.jpeg", "mimeType", "application/jpeg",
- "description", "desc2");
-
- assertThat(Serializer
- .serializeValue(ValueType.FILE_LINK_SEQUENCE.create("fileLinks", new FileLink[] { link1, link2 })))
- .isEqualTo(Arrays.asList(map1, map2));
- }
}
diff --git a/org.eclipse.mdm.connector/src/main/configuration/service.xml b/org.eclipse.mdm.connector/src/main/configuration/service.xml
index 16a11f8..feeecfa 100644
--- a/org.eclipse.mdm.connector/src/main/configuration/service.xml
+++ b/org.eclipse.mdm.connector/src/main/configuration/service.xml
@@ -1,5 +1,5 @@
<!--
- * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java
index 0dfd399..01395ce 100644
--- a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java
@@ -1,5 +1,5 @@
/********************************************************************************
- * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
*
* See the NOTICE file(s) distributed with this work for additional
* information regarding copyright ownership.
@@ -28,6 +28,8 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.ejb.Schedule;
import javax.ejb.Singleton;
import javax.ejb.Startup;
import javax.ejb.TransactionAttribute;
@@ -48,6 +50,8 @@
import org.eclipse.mdm.api.dflt.ApplicationContext;
import org.eclipse.mdm.api.dflt.EntityManager;
import org.eclipse.mdm.connector.boundary.ConnectorService;
+import org.eclipse.mdm.freetextindexer.control.DatabaseLockHandler;
+import org.eclipse.mdm.freetextindexer.control.LockListener;
import org.eclipse.mdm.freetextindexer.control.UpdateIndex;
import org.eclipse.mdm.freetextindexer.entities.MDMEntityResponse;
import org.eclipse.mdm.property.GlobalProperty;
@@ -57,7 +61,7 @@
/**
* This boundary is a back-end Boundary to the openMDM Api. It uses the Seach
* Server to build up MDDocuments.
- *
+ *
* @author CWE
*
*/
@@ -126,34 +130,66 @@
private ScheduledFuture<?> scheduledFuture;
+ @EJB
+ DatabaseLockHandler databaseLockHandler;
+
@PostConstruct
public void initalize() {
- if (isActive()) {
- Principal principal = new Principal() {
+ if (!isActive()) {
+ return;
+ }
- @Override
- public String getName() {
- return null;
+ databaseLockHandler.init("free-text-indexer", new LockListener() {
+
+ @Override
+ public void onLockAcquired() {
+ LOGGER.info("Acquired database lock, starting fretextindexer.");
+
+ Principal principal = new Principal() {
+
+ @Override
+ public String getName() {
+ return null;
+ }
+ };
+
+ connectorService = new ConnectorService(principal, globalProperties);
+ connectorService.connect();
+ connectorService.getContexts().forEach(MdmApiBoundary.this::initializeContext);
+
+ long intervalSeconds = 60L;
+ try {
+ Long.parseLong(globalProperties.getOrDefault(FREETEXT_SESSION_CHECK_INTERVAL,
+ "60"));
+ } catch (NumberFormatException e) {
+ LOGGER.warn("Could not parse value for parameter '" +
+ FREETEXT_SESSION_CHECK_INTERVAL + "'. Using default value '60'.");
}
- };
- connectorService = new ConnectorService(principal, globalProperties);
- connectorService.connect();
- connectorService.getContexts().forEach(this::initializeContext);
+ scheduledFuture = MdmApiBoundary.this.scheduler.scheduleAtFixedRate(
+ MdmApiBoundary.this::sessionCheck, intervalSeconds, intervalSeconds,
+ TimeUnit.SECONDS);
- long intervalSeconds = 60L;
- try {
- Long.parseLong(globalProperties.getOrDefault(FREETEXT_SESSION_CHECK_INTERVAL, "60"));
- } catch (NumberFormatException e) {
- LOGGER.warn("Could not parse value for parameter '" + FREETEXT_SESSION_CHECK_INTERVAL
- + "'. Using default value '60'.");
+ LOGGER.info("Initialized session tick timer with interval {}s.",
+ intervalSeconds);
}
- scheduledFuture = this.scheduler.scheduleAtFixedRate(this::sessionCheck, intervalSeconds, intervalSeconds,
- TimeUnit.SECONDS);
+ @Override
+ public void onLockLost() {
+ deregister();
+ }
+ });
+ databaseLockHandler.requestLock();
+ }
- LOGGER.info("Initialized session tick timer with interval {}s.", intervalSeconds);
- }
+ /**
+ * Tries in intervals of one minute to acquire the database lock. If the lock
+ * could be acquired, the onLockAcquired method on the registered listener is
+ * invoked.
+ */
+ @Schedule(hour = "*", minute = "*/1", persistent = false)
+ public void checkLock() {
+ databaseLockHandler.requestLock();
}
private void initializeContext(ApplicationContext context) {
@@ -183,6 +219,7 @@
public void sessionCheck() {
LOGGER.debug("Session check on {} context(s).", connectorService.getContexts().size());
+
for (ApplicationContext context : connectorService.getContexts()) {
try {
Optional<EntityManager> em = context.getEntityManager();
@@ -222,6 +259,9 @@
connectorService.disconnect();
}
+ if (databaseLockHandler.hasDatabaseLock()) {
+ databaseLockHandler.releaseDatabaseLock();
+ }
}
public void doForAllEntities(Class<? extends Entity> entityClass, ApplicationContext context,
@@ -286,4 +326,5 @@
return entityType.getName();
}
}
+
}
\ No newline at end of file
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/DatabaseLockHandler.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/DatabaseLockHandler.java
new file mode 100644
index 0000000..82413bd
--- /dev/null
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/DatabaseLockHandler.java
@@ -0,0 +1,291 @@
+/********************************************************************************
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+package org.eclipse.mdm.freetextindexer.control;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.List;
+import java.util.UUID;
+
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+
+import org.eclipse.mdm.freetextindexer.entities.SystemProcess;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * <p>
+ * Connection handler class which manages a connection from the JDBC pool of the
+ * application server. Additional it locks a database table entry on the
+ * 'system_process' table.
+ * </p>
+ * <p>
+ * If the database table 'system_process' does not exist it will automatically
+ * create it.
+ * </p>
+ * <p>
+ * If the locking entry does not exist within the table it will automatically
+ * create it.
+ * </p>
+ *
+ * @author Juergen Kleck, Peak Solution GmbH
+ */
+@Stateful
+public class DatabaseLockHandler {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseLockHandler.class);
+
+ // Health check timeout of 3 minutes after which the process can takeover
+ private static final int HEALTH_CHECK_TIMEOUT = 180000;
+
+ private boolean lockAcquired = false;
+ private boolean initialized = false;
+ private String lockingEntry;
+ private String processId;
+ private LockListener listener;
+
+ @PersistenceContext(unitName = "openMDM")
+ private EntityManager em;
+
+ /**
+ * Define the locking entry and the process id
+ *
+ * @param lockingEntry The key of the system_process table which should be
+ * locked
+ */
+ public void init(String lockingEntry, LockListener listener) {
+ try {
+ this.processId = InetAddress.getLocalHost().getHostName() + "_" + UUID.randomUUID().toString();
+ } catch (UnknownHostException e) {
+ this.processId = UUID.randomUUID().toString();
+ }
+
+ this.lockingEntry = lockingEntry;
+ this.listener = listener;
+ this.initialized = false;
+ }
+
+ public void requestLock() {
+ // check if we have the lock, otherwise try to get it
+ if (!hasDatabaseLock()) {
+ acquireDatabaseLock();
+ }
+ if (hasDatabaseLock() && doHealthCheck()) {
+ } else {
+ LOGGER.debug("No database lock could be acquired for this process.");
+ }
+ }
+
+ /**
+ * Instantiate the database setup
+ */
+ public void setupDB() {
+ if (!this.initialized) {
+ boolean success = true;
+
+ // check if the process key exists or create it
+ String query = "SELECT sp FROM SystemProcess sp WHERE sp.processKey = '" + lockingEntry + "'";
+ List<SystemProcess> processes = em.createQuery(query, SystemProcess.class).getResultList();
+ if (processes.isEmpty()) {
+ success = insertTableRow();
+ }
+ this.initialized = success;
+ if (success) {
+ LOGGER.debug("Started database lock handler with process id '{}'", processId);
+ }
+ }
+ }
+
+ /**
+ * This method updates the last connection time of the system process as
+ * database locks are only active for the transaction lifecycle which end when
+ * leaving the method
+ *
+ * @return true if the database lock is still active
+ */
+ public boolean doHealthCheck() {
+ try {
+ LOGGER.debug("Health check for lock handler with process id {}", processId);
+ SystemProcess entity = em
+ .createQuery("SELECT sp FROM SystemProcess sp WHERE sp.processKey = '" + lockingEntry + "'",
+ SystemProcess.class)
+ .getSingleResult();
+ em.refresh(entity);
+
+ if (this.processId.equals(entity.getProcessId())) {
+ if (!em.isJoinedToTransaction()) {
+ em.joinTransaction();
+ }
+ entity.setTime(System.currentTimeMillis());
+ em.merge(entity);
+ em.flush();
+ LOGGER.trace("Renewed lock for process id {}", processId);
+ } else if (hasDatabaseLock()) {
+ // process id in database has changed, but we still think we have the lock ->
+ // release lock
+ LOGGER.trace("Another process id '{}' has acquired the lock. Health check failed for process id '{}'",
+ entity.getProcessId(), processId);
+ setLockAcquired(false);
+ }
+ } catch (Exception ignored) {
+ LOGGER.error("Exception occurred: {}", ignored);
+ }
+ return hasDatabaseLock();
+ }
+
+ /**
+ * This method will try get a logical lock on the database table system_process.
+ * It will check by the process id and the last locked time. The lock will
+ * remain until the application disconnects from the database. In case of a
+ * ungraceful disconnect the locking timeout will apply.
+ *
+ * @return true if the lock has been acquired
+ */
+ public boolean acquireDatabaseLock() {
+ setupDB();
+ try {
+ LOGGER.trace(
+ "Trying to acquire the lock for '{}' for process id '{}'.", lockingEntry, processId);
+
+ SystemProcess entity = em
+ .createQuery("SELECT sp FROM SystemProcess sp WHERE sp.processKey = '" + lockingEntry + "'",
+ SystemProcess.class)
+ .getSingleResult();
+ em.refresh(entity);
+
+ // check if we can acquire this entity by:
+ // - different process id
+ // - last health check time is older than defined
+ if (!this.processId.equals(entity.getProcessId()) && System
+ .currentTimeMillis() - HEALTH_CHECK_TIMEOUT > entity.getTime()) {
+ LOGGER.trace(
+ "Another process id '{}' not renewed the lock for {} seconds. Replacing lock with own process id '{}'",
+ entity.getProcessId(), HEALTH_CHECK_TIMEOUT / 1000, processId);
+ if (!em.isJoinedToTransaction()) {
+ em.joinTransaction();
+ }
+ entity.setProcessId(this.processId);
+ em.merge(entity);
+ em.flush();
+
+ em.refresh(entity);
+ entity = em.find(SystemProcess.class, entity.getId());
+ if (this.processId.equals(entity.getProcessId())) {
+ setLockAcquired(true);
+ }
+ }
+ } catch (Exception e) {
+ LOGGER.error("Exception occurred: ", e);
+ }
+ LOGGER.trace(
+ "Acquired the lock for '{}' for process id '{}': ", lockingEntry, processId, hasDatabaseLock());
+ return hasDatabaseLock();
+ }
+
+ private void setLockAcquired(boolean acquired) {
+ if (acquired) {
+ LOGGER.debug(
+ "Successfully acquired the database lock for this process on the table 'system_process' for the process_key '{}'.",
+ lockingEntry);
+ lockAcquired = true;
+ listener.onLockAcquired();
+ } else {
+ LOGGER.debug("This process is no longer responsible for the database updates. Deactivating...");
+ lockAcquired = false;
+ listener.onLockLost();
+ }
+ }
+
+ /**
+ * This method will release the database lock on the system_process table for
+ * this locking entry
+ */
+ public void releaseDatabaseLock() {
+ try {
+ SystemProcess entity = em
+ .createQuery("SELECT sp FROM SystemProcess sp WHERE sp.processKey = '" + lockingEntry + "'",
+ SystemProcess.class)
+ .getSingleResult();
+ em.refresh(entity);
+
+ // we can only release ourselves
+ if (this.processId.equals(entity.getProcessId())) {
+ if (!em.isJoinedToTransaction()) {
+ em.joinTransaction();
+ }
+ entity.setProcessId("-released-");
+ entity.setTime(0L);
+ em.merge(entity);
+ em.flush();
+ LOGGER.debug(
+ "Successfully released the database lock for this process on the table 'system_process' for the process_key '{}'.",
+ lockingEntry);
+ }
+ lockAcquired = false;
+ } catch (Exception ignored) {
+ LOGGER.error("Exception occurred: ", ignored);
+ }
+ }
+
+ /**
+ * Check if the database lock has been applied
+ *
+ * @return true if the lock is applied
+ */
+ public boolean hasDatabaseLock() {
+ return lockAcquired;
+ }
+
+ /**
+ * Insert the value into the table if it does not exist yet.
+ *
+ * @return true if the initial table entry has been committed
+ */
+ private boolean insertTableRow() {
+ try {
+ SystemProcess entity = new SystemProcess();
+ entity.setId(getHighestId() + 1L);
+ entity.setProcessKey(lockingEntry);
+ entity.setProcessId("-initialized-");
+ entity.setTime(0L);
+ em.persist(entity);
+ em.flush();
+ em.refresh(entity);
+ return true;
+ } catch (Throwable e) {
+ LOGGER.error("Failed to insert the data entry.", e);
+ }
+ return false;
+ }
+
+ /**
+ * Get the highest id of the system process table
+ *
+ * @return the highest id or 0
+ */
+ private long getHighestId() {
+ long id = 0L;
+ Query query = em.createQuery("SELECT sp FROM SystemProcess sp ORDER BY sp.id DESC", SystemProcess.class);
+ List<SystemProcess> result = query.getResultList();
+ if (!result.isEmpty()) {
+ id = result.get(0).getId();
+ }
+ return id;
+ }
+
+}
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/LockListener.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/LockListener.java
new file mode 100644
index 0000000..a4a5875
--- /dev/null
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/LockListener.java
@@ -0,0 +1,33 @@
+/********************************************************************************
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+package org.eclipse.mdm.freetextindexer.control;
+
+/**
+ * Listener interface for receiving events on the locking state of
+ * {@link DatabaseLockHandler}.
+ *
+ */
+public interface LockListener {
+
+ /**
+ * Invoked when a lock could be obtained.
+ */
+ void onLockAcquired();
+
+ /**
+ * Invoked when a lock was lost.
+ */
+ void onLockLost();
+}
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/SystemProcess.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/SystemProcess.java
new file mode 100644
index 0000000..aa3f5da
--- /dev/null
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/SystemProcess.java
@@ -0,0 +1,72 @@
+/********************************************************************************
+ * Copyright (c) 2015-2020 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
+
+package org.eclipse.mdm.freetextindexer.entities;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "system_process")
+public class SystemProcess {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ private Long id;
+
+ @Column(name = "process_key")
+ private String processKey;
+
+ @Column(name = "process_id")
+ private String processId;
+
+ @Column(name = "last_locked")
+ private Long time;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getProcessKey() {
+ return processKey;
+ }
+
+ public void setProcessKey(String processKey) {
+ this.processKey = processKey;
+ }
+
+ public String getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(String processId) {
+ this.processId = processId;
+ }
+
+ public Long getTime() {
+ return time;
+ }
+
+ public void setTime(Long time) {
+ this.time = time;
+ }
+}
diff --git a/org.eclipse.mdm.preferences/build.gradle b/org.eclipse.mdm.preferences/build.gradle
index 7d6124b..a78f130 100644
--- a/org.eclipse.mdm.preferences/build.gradle
+++ b/org.eclipse.mdm.preferences/build.gradle
@@ -35,6 +35,7 @@
compile 'com.google.guava:guava:25.0-jre'
compileOnly 'javax:javaee-api:7.0'
+ compile project(':org.eclipse.mdm.freetextindexer')
compile project(':org.eclipse.mdm.property')
testCompile 'org.eclipse.persistence:eclipselink:2.6.4'
@@ -46,7 +47,7 @@
generateSchema {
vendor = "eclipselink"
packageToScan = [
- "org.eclipse.mdm.preferences"
+ "org.eclipse.mdm"
]
scriptAction = "drop-and-create"
targets {
diff --git a/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/controller/PreferenceException.java b/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/controller/PreferenceException.java
new file mode 100644
index 0000000..a587387
--- /dev/null
+++ b/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/controller/PreferenceException.java
@@ -0,0 +1,14 @@
+package org.eclipse.mdm.preferences.controller;
+
+public class PreferenceException extends RuntimeException {
+
+ private static final long serialVersionUID = -4350425959578840884L;
+
+ public PreferenceException(String message) {
+ super(message);
+ }
+
+ public PreferenceException(String message, Throwable t) {
+ super(message, t);
+ }
+}
diff --git a/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/controller/PreferenceService.java b/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/controller/PreferenceService.java
index cd0ea71..59f5b6e 100644
--- a/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/controller/PreferenceService.java
+++ b/org.eclipse.mdm.preferences/src/main/java/org/eclipse/mdm/preferences/controller/PreferenceService.java
@@ -44,6 +44,8 @@
public class PreferenceService {
private static final Logger LOG = LoggerFactory.getLogger(PreferenceService.class);
+ private static final String ADMIN_ROLE = "Admin";
+
@PersistenceContext(unitName = "openMDM")
private EntityManager em;
@@ -117,16 +119,35 @@
pe = existingPrefs.get(0);
pe.setValue(preference.getValue());
}
- em.persist(pe);
- em.flush();
- return convert(pe);
+ if (isAllowed(pe)) {
+ em.persist(pe);
+ em.flush();
+ return convert(pe);
+ } else {
+ throw new PreferenceException(
+ "Only users with role " + ADMIN_ROLE
+ + " are allowed to save Preferences outside of the USER scope!");
+ }
+
}
public PreferenceMessage deletePreference(Long id) {
+
Preference preference = em.find(Preference.class, id);
- em.remove(preference);
- em.flush();
- return convert(preference);
+
+ if (isAllowed(preference)) {
+ em.remove(preference);
+ em.flush();
+ return convert(preference);
+ } else {
+ throw new PreferenceException("Only users with role " + ADMIN_ROLE + " are allowed to delete Preference!");
+ }
+ }
+
+ private boolean isAllowed(Preference preference) {
+ return sessionContext.isCallerInRole(ADMIN_ROLE)
+ || (preference.getUser() != null
+ && preference.getUser().equalsIgnoreCase(sessionContext.getCallerPrincipal().getName()));
}
private PreferenceMessage convert(Preference pe) {
diff --git a/org.eclipse.mdm.preferences/src/main/resources/META-INF/persistence.xml b/org.eclipse.mdm.preferences/src/main/resources/META-INF/persistence.xml
index 7b328c1..3f709eb 100644
--- a/org.eclipse.mdm.preferences/src/main/resources/META-INF/persistence.xml
+++ b/org.eclipse.mdm.preferences/src/main/resources/META-INF/persistence.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
-/********************************************************************************
- * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- ********************************************************************************/
+/********************************************************************************
+ * Copyright (c) 2015-2019 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ ********************************************************************************/
-->
<persistence xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,6 +21,7 @@
<persistence-unit name="openMDM" transaction-type="JTA">
<jta-data-source>jdbc/openMDM</jta-data-source>
<class>org.eclipse.mdm.preferences.entity.Preference</class>
+ <class>org.eclipse.mdm.freetextindexer.entities.SystemProcess</class>
<properties>
<property name="eclipselink.logging.logger" value="ServerLogger" />
<property name="eclipselink.logging.level" value="INFO" />
diff --git a/org.eclipse.mdm.preferences/src/main/sql/derby/5.1.0M1_update.sql b/org.eclipse.mdm.preferences/src/main/sql/derby/5.1.0M1_update.sql
new file mode 100644
index 0000000..2af00f9
--- /dev/null
+++ b/org.eclipse.mdm.preferences/src/main/sql/derby/5.1.0M1_update.sql
@@ -0,0 +1 @@
+CREATE TABLE system_process (ID BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL, process_id VARCHAR(255), process_key VARCHAR(255), last_locked BIGINT, PRIMARY KEY (ID));
diff --git a/org.eclipse.mdm.preferences/src/main/sql/postgres/5.1.0M1_update.sql b/org.eclipse.mdm.preferences/src/main/sql/postgres/5.1.0M1_update.sql
new file mode 100644
index 0000000..5b71051
--- /dev/null
+++ b/org.eclipse.mdm.preferences/src/main/sql/postgres/5.1.0M1_update.sql
@@ -0,0 +1 @@
+CREATE TABLE system_process (ID SERIAL NOT NULL, process_id VARCHAR(255), process_key VARCHAR(255), last_locked BIGINT, PRIMARY KEY (ID));
diff --git a/org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/controller/PreferenceServiceTest.java b/org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/controller/PreferenceServiceTest.java
index a6e980a..3575f12 100644
--- a/org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/controller/PreferenceServiceTest.java
+++ b/org.eclipse.mdm.preferences/src/test/java/org/eclipse/mdm/preferences/controller/PreferenceServiceTest.java
@@ -15,6 +15,7 @@
package org.eclipse.mdm.preferences.controller;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -34,6 +35,7 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Mockito;
import com.google.common.collect.ImmutableMap;
@@ -53,7 +55,7 @@
Principal principal = mock(Principal.class);
when(principal.getName()).thenReturn("testUser");
when(sessionContext.getCallerPrincipal()).thenReturn(principal);
-
+ when(sessionContext.isCallerInRole(Mockito.anyString())).thenReturn(true);
service = new PreferenceService(em, sessionContext);
}
@@ -144,19 +146,73 @@
}
@Test
- public void testDeletePreference() {
- initData(new Preference(null, null, "testDeletePreference", "myValue"));
+ public void testAdminCanDeletePreferenceInScopeSystem() {
+ String prefName = "testAdminCanDeletePreference";
+ initData(new Preference(null, null, prefName, "myValue"));
+ when(sessionContext.isCallerInRole(Mockito.eq("Admin"))).thenReturn(true);
- List<PreferenceMessage> listBeforeDelete = service.getPreferences("system", "testDeletePreference");
-
+ List<PreferenceMessage> listBeforeDelete = service.getPreferences("system", prefName);
assertThat(listBeforeDelete).hasSize(1);
em.getTransaction().begin();
service.deletePreference(listBeforeDelete.get(0).getId());
em.getTransaction().commit();
- List<PreferenceMessage> listAfterDelete = service.getPreferences("system", "testDeletePreference");
- assertThat(listAfterDelete).hasSize(0);
+ assertThat(service.getPreferences("system", prefName)).hasSize(0);
+ }
+
+ @Test
+ public void testOtherRolesCanNotDeletePreferenceInScopeSystem() {
+ String prefName = "testOtherUsersCanNotDeletePreferenceInScopeSystem";
+ initData(new Preference(null, null, prefName, "myValue"));
+ when(sessionContext.isCallerInRole(Mockito.eq("Admin"))).thenReturn(false);
+
+ List<PreferenceMessage> listBeforeDelete = service.getPreferences("system",
+ prefName);
+ assertThat(listBeforeDelete).hasSize(1);
+
+ try {
+ em.getTransaction().begin();
+ assertThatThrownBy(() -> service.deletePreference(listBeforeDelete.get(0).getId()))
+ .hasMessage("Only users with role Admin are allowed to delete Preference!");
+ } finally {
+ em.getTransaction().rollback();
+ }
+ }
+
+ @Test
+ public void testNonAdminCanDeleteOwnPreferenceInUserScope() {
+ String prefName = "testUserCanDeleteOwnPreferenceInUserScope";
+ initData(new Preference(null, "testUser", prefName, "myValue"));
+ when(sessionContext.isCallerInRole(Mockito.eq("Admin"))).thenReturn(false);
+
+ List<PreferenceMessage> listBeforeDelete = service.getPreferences("user", prefName);
+ assertThat(listBeforeDelete).hasSize(1);
+
+ em.getTransaction().begin();
+ service.deletePreference(listBeforeDelete.get(0).getId());
+ em.getTransaction().commit();
+
+ assertThat(service.getPreferences("user", prefName)).hasSize(0);
+ }
+
+ @Test
+ public void testNonAdminCanNotDeleteOtherPreferenceInUserScope() {
+ String prefName = "testNonAdminCanNotDeleteOtherPreferenceInUserScope";
+ initData(new Preference(null, "otherUser", prefName, "myValue"));
+ when(sessionContext.isCallerInRole(Mockito.eq("Admin"))).thenReturn(true);
+
+ List<PreferenceMessage> listBeforeDelete = service.getPreferences("user", prefName);
+ assertThat(listBeforeDelete).hasSize(1);
+ when(sessionContext.isCallerInRole(Mockito.eq("Admin"))).thenReturn(false);
+
+ try {
+ em.getTransaction().begin();
+ assertThatThrownBy(() -> service.deletePreference(listBeforeDelete.get(0).getId()))
+ .hasMessage("Only users with role Admin are allowed to delete Preference!");
+ } finally {
+ em.getTransaction().rollback();
+ }
}
@Test
@@ -177,6 +233,25 @@
}
@Test
+ public void testNonAdminCannotSaveSystemScope() {
+ when(sessionContext.isCallerInRole(Mockito.eq("Admin"))).thenReturn(false);
+
+ PreferenceMessage pref = new PreferenceMessage();
+ pref.setScope(Scope.SYSTEM);
+ pref.setKey("testNonAdminCannotSaveSystemScope");
+ pref.setValue("myValue");
+
+ try {
+ em.getTransaction().begin();
+ assertThatThrownBy(() -> service.save(pref))
+ .hasMessage(
+ "Only users with role Admin are allowed to save Preferences outside of the USER scope!");
+ } finally {
+ em.getTransaction().rollback();
+ }
+ }
+
+ @Test
public void testSaveSourceScope() {
PreferenceMessage pref = new PreferenceMessage();
pref.setScope(Scope.SOURCE);
@@ -195,6 +270,26 @@
}
@Test
+ public void testNonAdminCannotSaveSourceScope() {
+ when(sessionContext.isCallerInRole(Mockito.eq("Admin"))).thenReturn(false);
+
+ PreferenceMessage pref = new PreferenceMessage();
+ pref.setScope(Scope.SOURCE);
+ pref.setSource("MDMTEST");
+ pref.setKey("testNonAdminCannotSaveSystemScope");
+ pref.setValue("myValue");
+
+ try {
+ em.getTransaction().begin();
+ assertThatThrownBy(() -> service.save(pref))
+ .hasMessage(
+ "Only users with role Admin are allowed to save Preferences outside of the USER scope!");
+ } finally {
+ em.getTransaction().rollback();
+ }
+ }
+
+ @Test
public void testSaveUserScope() {
PreferenceMessage pref = new PreferenceMessage();
pref.setScope(Scope.USER);
diff --git a/release_notes.md b/release_notes.md
index abec736..f130a45 100644
--- a/release_notes.md
+++ b/release_notes.md
@@ -4,6 +4,67 @@
* [mdmbl Eclipse Git Repositories](http://git.eclipse.org/c/?q=mdmbl)
* [mdmbl nightly builds - last stable version](http://download.eclipse.org/mdmbl/nightly_master/?d)
+## Version 5.2.0M1
+
+New Features:
+* Upload/download file attachments to FileAttachables and context attributes
+* Show/edit context data based on MDM templates
+* ATFxAdapter supports model mapping via ExtSystem
+* XY-Chartviewer to view measurement data
+* Introduce user roles on the webclient
+
+### Breaking changes ###
+
+#### Changes to MDMRealm ####
+Up to version 5.1.0 all Users had to be assigned the group `MDM` to use openMDM.
+Since 5.2.0M1 users need one of the following groups: `Admin`, `DescriptiveDataAuthor`, `Guest`.
+See `org.eclipse.mdm.nuclues/readme.md#Configure LoginModule` for more information.
+
+#### Database schema changes ####
+In this release openMDM 5 database schema was extended.
+If you have an existing installation make sure to apply the provided update script to your database.
+The script can be found in `schema/update/{DATABASE}/5.2.0M1_update.sql`.
+
+
+### API changes ###
+REST-API:
+* Tests, teststeps and measurements have new subresource files to upload, download, and delete files.
+* Teststep and measurement contexts have new subresource to upload, download, and delete files at component attributes.
+* New user resource to get information about the currently logged in user and its roles.
+
+org.eclipse.mdm.api.base:
+* New method: o.e.m.a.b.f.FileService#uploadSequential(Entity, Collection<FileLink>, ProgressListener)
+* New method: o.e.m.a.b.f.FileService#uploadParallel(Entity, Collection<FileLink>, ProgressListener)
+* New method: o.e.m.a.b.f.FileService#delete(Entity, Collection<FileLink>)
+* New method: o.e.m.a.b.f.FileService#delete(Entity, FileLink)
+* New method: o.e.m.a.b.f.FileLink#newLocal(InputStream, String, long, MimeType, String)
+* New method: o.e.m.a.b.m.FileLink#getLocalStream()
+* New method: o.e.m.a.b.m.FileLink#setLocalStream(InputStream)
+* Removed method: o.e.m.a.b.m.FileLink#getLocalPath()
+* Removed method: o.e.m.a.b.m.FileLink#setLocalPath(Path)
+
+org.eclipse.mdm.api.default
+* New method: o.e.m.a.d.m.EntityFactory#createExtSystem(String)
+* New method: o.e.m.a.d.m.EntityFactory#createExtSystemAttribute(String, ExtSystem)
+* New method: o.e.m.a.d.m.EntityFactory#createMDMAttribute(String, ExtSystemAttribute)
+* New method: o.e.m.a.d.m.createTestStepWithOutContextRoots(Test, TemplateTestStep, Classification)
+* New method: o.e.m.a.d.m.createTestStepWithOutContextRoots(Test, TemplateTestStep)
+* New method: o.e.m.a.d.m.createTestStepWithOutContextRoots(Test, Status, TemplateTestStep)
+* New entity: o.e.m.a.d.m.ExtSystem
+* New entity: o.e.m.a.d.m.ExtSystemAttribute
+* New entity: o.e.m.a.d.m.MDMAttribute
+* New entity: o.e.m.a.d.m.SystemParameter
+* New entity: o.e.m.a.d.m.UserParameter
+
+### Changes ###
+
+* [552399](https://bugs.eclipse.org/bugs/show_bug.cgi?id=552399) - Upload/download file attachments in webclient
+* [552400](https://bugs.eclipse.org/bugs/show_bug.cgi?id=552400) - Show/edit context data based on MDM templates
+* [552401](https://bugs.eclipse.org/bugs/show_bug.cgi?id=552401) - Model mapping in atfxadapter with ExtSystem
+* [552402](https://bugs.eclipse.org/bugs/show_bug.cgi?id=552402) - Simple XY-Chartviewer
+* [552403](https://bugs.eclipse.org/bugs/show_bug.cgi?id=552403) - Introduce user roles on the webclient
+* [562384](https://bugs.eclipse.org/bugs/show_bug.cgi?id=562384) - Freetextindexer should only index once in clustered deployments
+
## Version 5.1.0 ##
### Bugzilla Bugs fixed ###
