fixed issue #19

FINTLabs · Sep 27, 2018 · bc7bf21 · bc7bf21
1 parent cf97933
commit bc7bf21
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 43 deletions.
diff --git a/client/src/common/input-validation/UsernameValidationInput.js b/client/src/common/input-validation/UsernameValidationInput.js
@@ -1,10 +1,25 @@
 import React from "react";
 import {FormControl, FormHelperText, Input, InputLabel, withStyles} from "@material-ui/core";
 import PropTypes from "prop-types";
+import Grid from "@material-ui/core/Grid/Grid";
+import Typography from "@material-ui/core/Typography/Typography";
 
 
-const styles = () => {
-};
+const styles = (theme) => ({
+  realm: {
+    width: '50%',
+    display: 'box',
+    boxAlign: 'center',
+    fontSize: '1rem',
+  },
+  label: {
+    width: '50%',
+    position: 'inherit'
+  },
+  input: {
+    width: '50%',
+  },
+});
 
 class UsernameValidationInput extends React.Component {
 
@@ -31,26 +46,35 @@ class UsernameValidationInput extends React.Component {
   }
 
   render() {
-    const {name, title} = this.props;
+    const {name, title, realm, classes} = this.props;
     return (
       <FormControl fullWidth error={!this.state.usernameValid} required>
-        <InputLabel htmlFor={name}>{title}</InputLabel>
-        <Input
-          autoFocus
-          fullWidth
-          name={name}
-          onChange={this.onChangeUsername}
-        />
+        <InputLabel className={classes.label} htmlFor={name}>{title}</InputLabel>
+        <Grid container>
+          <Input
+            autoFocus
+            name={name}
+            onChange={this.onChangeUsername}
+            className={classes.input}
+          />
+          <Typography variant="caption" className={classes.realm}>{realm}</Typography>
+        </Grid>
+
         <FormHelperText>{this.state.usernameValid ? '' : 'Brukernavnet kan bare inneholde a-z, A-Z, 0-9, - og _. Det kan fra 3-128 tegn langt.'}</FormHelperText>
       </FormControl>
     );
   }
 }
 
+UsernameValidationInput.defaultProps = {
+  realm: "@dummy.no"
+};
 UsernameValidationInput.propTypes = {
   name: PropTypes.string.isRequired,
-  title: PropTypes.string.isRequired,
   onChange: PropTypes.func.isRequired,
-  usernameIsValid: PropTypes.func.isRequired,
+  realm: PropTypes.string.isRequired,
+  title: PropTypes.string.isRequired,
+  usernameIsValid: PropTypes.func.isRequired
 };
 export default withStyles(styles)(UsernameValidationInput);
+
diff --git a/client/src/data/api/AssetApi.js b/client/src/data/api/AssetApi.js
@@ -10,6 +10,14 @@ class AssetApi {
 
   }
 
+  static getPrimaryAsset(organisation) {
+    return fetch(`/api/assets/${organisation}/primary`, {
+      method: 'GET',
+      credentials: 'same-origin'
+    })
+      .then(response => Promise.all([response, response.json()]));
+  }
+
   static createAsset(asset, organisation) {
 
     const request = new Request(`/api/assets/${organisation}/`, {

diff --git a/client/src/features/adapter/add/AdapterAdd.js b/client/src/features/adapter/add/AdapterAdd.js
@@ -5,6 +5,7 @@ import TextField from "@material-ui/core/TextField";
 import {Add} from "@material-ui/icons";
 import UsernameValidationInput from "../../../common/input-validation/UsernameValidationInput";
 import AdapterApi from "../../../data/api/AdapterApi";
+import AssetApi from "../../../data/api/AssetApi";
 
 const styles = () => ({
   addButton: {
@@ -56,21 +57,25 @@ class AdapterAdd extends React.Component {
   };
 
   openAddDialog = () => {
-    this.setState({showAdapterAdd: true, notify: false});
+    AssetApi.getPrimaryAsset(this.props.organisation.name)
+      .then(([response, json]) => {
+        if (response.status === 200) {
+          this.setState({
+            showAdapterAdd: true,
+            notify: false,
+            realm: `@adapter.${json.assetId}`
+          });
+        }
+        else {
+          this.props.notify("Det oppstod problemer med å hente primær ressurs id.");
+        }
+      });
   };
 
   handleCancel = () => {
     this.setState({showAdapterAdd: false, notify: false});
   };
 
-  /*
-  onCloseNotification = () => {
-    this.setState({
-      notify: false,
-    });
-  };
-  */
-
   getEmptyAdapter = () => {
     return {
       name: '',
@@ -114,6 +119,7 @@ class AdapterAdd extends React.Component {
                 name="name"
                 onChange={this.updateAdapterState}
                 usernameIsValid={this.usernameIsValid}
+                realm={this.state.realm}
               />
               <TextField
                 name="shortDescription"

diff --git a/client/src/features/clients/add/ClientAdd.js b/client/src/features/clients/add/ClientAdd.js
@@ -5,6 +5,7 @@ import TextField from "@material-ui/core/TextField";
 import {Add} from "@material-ui/icons";
 import UsernameValidationInput from "../../../common/input-validation/UsernameValidationInput";
 import ClientApi from "../../../data/api/ClientApi";
+import AssetApi from "../../../data/api/AssetApi";
 
 const styles = () => ({
   addButton: {
@@ -14,8 +15,7 @@ const styles = () => ({
     bottom: 'auto',
     right: 50,
     position: 'fixed',
-  }
-
+  },
 });
 
 class ClientAdd extends React.Component {
@@ -51,39 +51,32 @@ class ClientAdd extends React.Component {
         this.props.notify("Oisann, dette gikk ikke helt etter planen! Prøv igjen ;)");
       });
 
-    /*
-    this.props.createClient(this.state.client, this.props.organisation).then(() => {
-      this.setState({
-        showClientAdd: false,
-        notify: true,
-        clientAddedName: this.state.client.name,
-        client: this.getEmptyClient(),
-      });
-    });
-    */
-
   };
 
   usernameIsValid = (valid) => {
     this.setState({usernameIsValid: valid});
   };
 
   openAddDialog = () => {
-    this.setState({showClientAdd: true, notify: false});
+    AssetApi.getPrimaryAsset(this.props.organisation.name)
+      .then(([response, json]) => {
+        if (response.status === 200) {
+          this.setState({
+            showClientAdd: true,
+            notify: false,
+            realm: `@client.${json.assetId}`
+          });
+        }
+        else {
+          this.props.notify("Det oppstod problemer med å hente primær ressurs id.");
+        }
+      });
   };
 
   handleCancel = () => {
     this.setState({showClientAdd: false, notify: false});
   };
 
-  /*
-  onCloseNotification = () => {
-    this.setState({
-      notify: false,
-    });
-  };
-  */
-
   getEmptyClient = () => {
     return {
       name: '',
@@ -127,6 +120,8 @@ class ClientAdd extends React.Component {
                 name="name"
                 onChange={this.updateClientState}
                 usernameIsValid={this.usernameIsValid}
+                className={classes.username}
+                realm={this.state.realm}
               />
               <TextField
                 name="shortDescription"

diff --git a/src/main/java/no/fint/portal/customer/controller/AssetController.java b/src/main/java/no/fint/portal/customer/controller/AssetController.java
@@ -39,6 +39,16 @@ public ResponseEntity getAssets(@PathVariable("orgName") String orgName) {
     return ResponseEntity.ok(assets);
   }
 
+  @ApiOperation("Get Primary Asset ID")
+  @GetMapping("/primary")
+  public ResponseEntity<Asset> getPrimaryAsset(@PathVariable("orgName") String orgName) {
+    Organisation organisation = portalApiService.getOrganisation(orgName);
+    Asset primaryAsset = assetService.getPrimaryAsset(organisation);
+
+    return ResponseEntity.ok(primaryAsset);
+
+  }
+
   @ApiOperation("Create Asset")
   @PostMapping("/")
   public ResponseEntity addAsset(@PathVariable String orgName,