Merge branch 'tf_nira_dev' of https://github.com/tf-nira/registration…

…-client into tf_nira_dev
tf-nira · Sep 30, 2024 · 74284b4 · 74284b4
2 parents 7d595ee + 1cc3540
commit 74284b4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml
@@ -133,7 +133,7 @@ jobs:
       OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
       GPG_SECRET: ${{ secrets.GPG_SECRET }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-  
+
 
   build-regclient-keystore-docker:
     strategy:

diff --git a/...registration-client/src/main/java/io/mosip/registration/controller/GenericController.java b/...registration-client/src/main/java/io/mosip/registration/controller/GenericController.java
@@ -81,6 +81,7 @@
 import javafx.scene.web.WebView;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import lombok.SneakyThrows;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
@@ -691,11 +692,12 @@ public void changed(ObservableValue<? extends Number> observable, Number oldValu
 						confirmationDialog.setHeaderText(null);
 						confirmationDialog.setContentText("Please review your details before proceeding to the next section.");
 
-						// Set the dialog to non-blocking modality
-						confirmationDialog.initModality(Modality.NONE);
+	                    Stage dialogStage = (Stage) confirmationDialog.getDialogPane().getScene().getWindow();
+	                    dialogStage.initModality(Modality.APPLICATION_MODAL);
+	                    dialogStage.initStyle(StageStyle.UTILITY);
 
 						DialogPane dialogPane = confirmationDialog.getDialogPane();
-					
+
 						// Centering the text
 						Node contentLabel = dialogPane.lookup(".content.label");
 						if (contentLabel != null) {

diff --git a/...ces/src/main/java/io/mosip/registration/service/packet/impl/PacketHandlerServiceImpl.java b/...ces/src/main/java/io/mosip/registration/service/packet/impl/PacketHandlerServiceImpl.java
@@ -193,6 +193,9 @@ public ResponseDTO handle(RegistrationDTO registrationDTO) {
 		}
 
 		registrationDTO.setRegistrationId(registrationDTO.getAppId());
+		if(registrationDTO.getFlowType().equals(FlowType.NEW)) {
+			registrationDTO.addDemographicField("part", "1");
+		}
 
 		Map<String, String> metaInfoMap = new LinkedHashMap<>();
 		try {

diff --git a/...egistration/util/common/NinValidator.java → ...egistration/util/common/NinValidator.java b/...egistration/util/common/NinValidator.java → ...egistration/util/common/NinValidator.java
@@ -1,5 +1,6 @@
 package io.mosip.registration.util.common;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import io.mosip.kernel.core.idvalidator.exception.InvalidIDException;
@@ -12,8 +13,9 @@
  */
 @Component
 public class NinValidator {
+	@Value("${mosip.registration.util.common.nin.regex:^[a-zA-Z0-9]{14,14}}")
+	private String regexPattern;
 	public boolean validate(String input) {
-        String regexPattern = "^[a-zA-Z0-9]{14,14}$";
         Pattern pattern = Pattern.compile(regexPattern);
         Matcher matcher = pattern.matcher(input);
         if(matcher.matches()) {