From 4cb7473b85aa98b8362acf6dbb055e5179e54d97 Mon Sep 17 00:00:00 2001
From: "Aditya @ArchLinux" <132184385+adityadeshlahre@users.noreply.github.com>
Date: Fri, 3 May 2024 02:30:54 +0530
Subject: [PATCH] notificationsAdded + final commit 00

---
 frontend/src/components/admin/Admin.js            |  8 ++++++++
 .../barcodeConfiguration/BarcodeConfiguration.js  | 15 ++++++++++++++-
 frontend/src/languages/en.json                    |  1 +
 frontend/src/languages/fr.json                    |  1 +
 .../rest/BarcodeConfigurationRestController.java  |  3 ++-
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/admin/Admin.js b/frontend/src/components/admin/Admin.js
index 28fdd80f2f..fd02213a5c 100644
--- a/frontend/src/components/admin/Admin.js
+++ b/frontend/src/components/admin/Admin.js
@@ -22,6 +22,7 @@ import {
   Settings,
   ListDropdown,
   CicsSystemGroup,
+  QrCode,
 } from "@carbon/icons-react";
 import PathRoute from "../utils/PathRoute";
 import CalculatedValue from "./calculatedValue/CalculatedValueForm";
@@ -36,6 +37,7 @@ import { CommonProperties } from "./menu/CommonProperties";
 import ConfigMenuDisplay from "./formEntry/common/ConfigMenuDisplay";
 
 import ProviderMenu from "./ProviderMenu/ProviderMenu";
+import BarcodeConfiguration from "./barcodeConfiguration/BarcodeConfiguration";
 
 function Admin() {
   const intl = useIntl();
@@ -63,6 +65,9 @@ function Admin() {
           <SideNavLink renderIcon={CicsSystemGroup} href="#providerMenu">
             <FormattedMessage id="provider.browse.title" />
           </SideNavLink>
+          <SideNavLink renderIcon={QrCode} href="#barcodeConfiguration">
+            <FormattedMessage id="sidenav.label.admin.barcodeconfiguration" />
+          </SideNavLink>
           <SideNavMenu
             title={intl.formatMessage({ id: "sidenav.label.admin.menu" })}
             renderIcon={TableOfContents}
@@ -145,6 +150,9 @@ function Admin() {
       <PathRoute path="#providerMenu">
         <ProviderMenu />
       </PathRoute>
+      <PathRoute path="#barcodeConfiguration">
+        <BarcodeConfiguration />
+      </PathRoute>
       <PathRoute path="#globalMenuManagement">
         <GlobalMenuManagement />
       </PathRoute>
diff --git a/frontend/src/components/admin/barcodeConfiguration/BarcodeConfiguration.js b/frontend/src/components/admin/barcodeConfiguration/BarcodeConfiguration.js
index bbc53a3be1..897e38c598 100644
--- a/frontend/src/components/admin/barcodeConfiguration/BarcodeConfiguration.js
+++ b/frontend/src/components/admin/barcodeConfiguration/BarcodeConfiguration.js
@@ -732,7 +732,20 @@ function BarcodeConfiguration() {
         <Section>
           <Form onSubmit={handleModify}>
             <Column lg={16} md={8} sm={4}>
-              <Button disabled={saveButton} type="submit">
+              <Button
+                disabled={saveButton}
+                onClick={() => {
+                  setNotificationVisible(true);
+                  addNotification({
+                    kind: NotificationKinds.success,
+                    title: intl.formatMessage({
+                      id: "notification.title",
+                    }),
+                    message: "BarCode Configurations has been saved.",
+                  });
+                }}
+                type="submit"
+              >
                 <FormattedMessage id="label.button.save" />
               </Button>{" "}
               <Button
diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
index 959f47c212..36598f7074 100644
--- a/frontend/src/languages/en.json
+++ b/frontend/src/languages/en.json
@@ -988,6 +988,7 @@
   "provider.telephone": "Telephone",
   "provider.fax": "Fax",
   "barcodeconfiguration.browse.title": "Barcode Configuration",
+  "sidenav.label.admin.barcodeconfiguration": "Barcode Configuration",
   "siteInfo.section.number": "Number Bar Code Label",
   "siteInfo.title.default.barcode": "Default Bar Code Labels",
   "siteInfo.title.max.barcode": "Maximum Bar Code Labels",
diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
index 530b513361..c7d2640166 100644
--- a/frontend/src/languages/fr.json
+++ b/frontend/src/languages/fr.json
@@ -901,6 +901,7 @@
   "provider.telephone": "Téléphone",
   "provider.fax": "Fax",
   "breadcrums.admin.managment": "Gestion d'administration",
+  "sidenav.label.admin.barcodeconfiguration": "Gestion d'administration",
   "siteInfo.title.default.barcode.specimen": "Échantillon",
   "siteInfo.title.default.barcode.order": "Commande",
   "siteInfo.title.default.barcode.block": "Bloc",
diff --git a/src/main/java/org/openelisglobal/barcode/controller/rest/BarcodeConfigurationRestController.java b/src/main/java/org/openelisglobal/barcode/controller/rest/BarcodeConfigurationRestController.java
index 517c19c079..2762a15f29 100644
--- a/src/main/java/org/openelisglobal/barcode/controller/rest/BarcodeConfigurationRestController.java
+++ b/src/main/java/org/openelisglobal/barcode/controller/rest/BarcodeConfigurationRestController.java
@@ -20,6 +20,7 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -153,7 +154,7 @@ private void setFields(BarcodeConfigurationForm form) {
 
     @PostMapping(value = "/BarcodeConfiguration")
     public Object barcodeConfigurationSave(HttpServletRequest request,
-            @ModelAttribute("form") @Valid BarcodeConfigurationForm form, BindingResult result,
+            @RequestBody @Valid BarcodeConfigurationForm form, BindingResult result,
             RedirectAttributes redirectAttributes) {
         if (!form.getPrePrintDontUseAltAccession()
                 && GenericValidator.isBlankOrNull(form.getPrePrintAltAccessionPrefix())) {