Fixed DeleteAccount.js page.

active-allocator/ClientApp/src/components/NavMenu.js

@@ -33,12 +33,13 @@ export class NavMenu extends Component {
               <NavItem>
                 <NavLink tag={Link} className="text-dark" to="/">Home</NavLink>
               </NavItem>
+              {/*
               <NavItem>
                 <NavLink tag={Link} className="text-dark" to={Routes.COUNTER}>Counter</NavLink>
               </NavItem>
               <NavItem>
                 <NavLink tag={Link} className="text-dark" to={Routes.FETCH_DATA}>Fetch data</NavLink>
-              </NavItem>
+              </NavItem>*/}
               {sessionStorage.getItem('userName') == null &&
                 <NavItem>
                   <NavLink tag={Link} className="text-dark" to={Routes.LOGIN}>Login</NavLink>

active-allocator/ClientApp/src/components/accounts/DeleteAccount.js

@@ -1,5 +1,5 @@
 import { useNavigate } from "react-router-dom";
-import { deleteData, getData } from "../services/AccessAPI";
+import { EndPoints, deleteData, getData } from "../services/AccessAPI";
 import { useEffect } from "react";
 import { useState } from 'react';
 import { useLocation } from 'react-router-dom';
@@ -10,19 +10,17 @@ export default function DeleteAccount() {
     const id = new URLSearchParams(search).get('id')
 
     useEffect(() => {
-        //const { id } = this.props.match.params;
+        getData(EndPoints.ACCOUNTS + "/" + id).then(
-
-        getData('Accounts/' + id).then(
             (result) => {
-                console.log("Role for edit: ");
-                console.log(result);
                 if (result) {
                     setState({
-                        firstName: result.firstName,
+                        name: result.name,
-                        lastName: result.lastName,
+                        lastActivity: result.lastActivity,
-                        accountname: result.accountname,
+                        createdOn: result.createdOn,
-                        email: result.email,
+                        balance: result.balance,
-                        roles: result.roles,
+                        initialBalance: result.initialBalance,
+                        currencyId: result.currencyId,
+                        externalAccountNumber: result.externalAccountNumber,
                         loading: false
                     });
                 }
@@ -33,11 +31,13 @@ export default function DeleteAccount() {
     let navigate = useNavigate();
 
     const [state, setState] = useState({
-        firstName: '',
+        name: '',
-        lastName: '',
+        lastActivity: null,
-        accountname: '',
+        createdOn: null,
-        email: '',
+        balance: 0,
-        roles: [],
+        initialBalance: 0,
+        currencyId: 0,
+        externalAccountNumber: '',
         loading: true
     });
 
@@ -48,7 +48,7 @@ export default function DeleteAccount() {
     function onConfirmation(e) {
         e.preventDefault();
 
-        deleteData('Accounts/' + id).then((result) => {
+        deleteData(EndPoints.ACCOUNTS + "/" + id).then((result) => {
             let responseJson = result;
             if (responseJson) {
                 navigate(Routes.ACCOUNTS);
@@ -57,46 +57,73 @@ export default function DeleteAccount() {
         );
 
     }
-
+    
     return (
         <div>
             <h2>::Delete account::</h2>
             <h3>Are you sure you want to delete this?</h3>
             <div>
                 <h4>Account Information</h4>
-                <dl className="row">
-                    <dt className="col-sm-2">
-                        First Name:
-                    </dt>
-                    <dd className="col-sm-10">
-                        {state.firstName}
-                    </dd>
-                </dl>
-
-                <dl className="row">
-                    <dt className="col-sm-2">
-                        Last Name:
-                    </dt>
-                    <dd className="col-sm-10">
-                        {state.lastName}
-                    </dd>
-                </dl>
-
                 <dl className="row">
                     <dt className="col-sm-2">
                         Account Name:
                     </dt>
                     <dd className="col-sm-10">
-                        {state.accountname}
+                        {state.name}
                     </dd>
                 </dl>
 
                 <dl className="row">
                     <dt className="col-sm-2">
-                        Email:
+                        Last Activity:
                     </dt>
                     <dd className="col-sm-10">
-                        {state.email}
+                        {state.lastActivity}
+                    </dd>
+                </dl>
+
+                <dl className="row">
+                    <dt className="col-sm-2">
+                        Created On:
+                    </dt>
+                    <dd className="col-sm-10">
+                        {state.createdOn}
+                    </dd>
+                </dl>
+
+                <dl className="row">
+                    <dt className="col-sm-2">
+                        Balance:
+                    </dt>
+                    <dd className="col-sm-10">
+                        {state.balance}
+                    </dd>
+                </dl>
+
+                <dl className="row">
+                    <dt className="col-sm-2">
+                        Initial Balance:
+                    </dt>
+                    <dd className="col-sm-10">
+                        {state.initialBalance}
+                    </dd>
+                </dl>
+
+                <dl className="row">
+                    <dt className="col-sm-2">
+                        Currency ID:
+                    </dt>
+                    <dd className="col-sm-10">
+                        {state.currencyId}
+                    </dd>
+                </dl>
+
+                <dl className="row">
+                    <dt className="col-sm-2">
+                        External Account Number:
+                    </dt>
+                    <dd className="col-sm-10">
+                        {state.externalAccountNumber}
                     </dd>
                 </dl>