added changes

appsmithorg · Jan 22, 2025 · 00232d7 · 00232d7
1 parent b14669e
commit 00232d7
Show file tree

Hide file tree

Showing 15 changed files with 389 additions and 288 deletions.
diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/files/FileUtilsCEImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/files/FileUtilsCEImpl.java
diff --git a/.../appsmith-git/src/main/java/com/appsmith/git/files/operations/FileOperationsCEv2Impl.java b/.../appsmith-git/src/main/java/com/appsmith/git/files/operations/FileOperationsCEv2Impl.java
@@ -167,9 +167,9 @@ public Integer getFileFormatVersion(Object metadata) {
         if (metadata == null) {
             return 1;
         }
+
         JsonNode json = objectMapper.valueToTree(metadata);
-        int fileFormatVersion = json.get(CommonConstants.FILE_FORMAT_VERSION).asInt();
-        return fileFormatVersion;
+        return json.get(CommonConstants.FILE_FORMAT_VERSION).asInt();
     }
 
     @Override

diff --git a/app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java b/app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java
@@ -436,12 +436,13 @@ public Mono<Boolean> checkoutToBranch(Path repoSuffix, String branchName) {
         return Mono.using(
                         () -> Git.open(createRepoPath(repoSuffix).toFile()),
                         git -> Mono.fromCallable(() -> {
-                                    log.debug(Thread.currentThread().getName() + ": Switching to the branch "
-                                            + branchName);
+                                    log.info(
+                                            "{}: Switching to the branch {}",
+                                            Thread.currentThread().getName(),
+                                            branchName);
+
                                     // We can safely assume that repo has been already initialised either in commit or
-                                    // clone flow and
-                                    // can directly
-                                    // open the repo
+                                    // clone flow and can directly open the repo
                                     if (StringUtils.equalsIgnoreCase(
                                             branchName, git.getRepository().getBranch())) {
                                         return TRUE;
@@ -611,8 +612,12 @@ public Mono<GitStatusDTO> getStatus(Path repoPath, String branchName) {
         return Mono.using(
                         () -> Git.open(repoPath.toFile()),
                         git -> Mono.fromCallable(() -> {
-                                    log.debug(Thread.currentThread().getName() + ": Get status for repo  " + repoPath
-                                            + ", branch " + branchName);
+                                    log.info(
+                                            "{}: Get status for repo {}, {}",
+                                            Thread.currentThread().getName(),
+                                            repoPath,
+                                            branchName);
+
                                     Status status = git.status().call();
                                     GitStatusDTO response = new GitStatusDTO();
 

diff --git a/...smith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitConstantsCE.java b/...smith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitConstantsCE.java
@@ -9,6 +9,8 @@ public class GitConstantsCE {
     public static final String ACTION_LIST = "actionList";
     public static final String ACTION_COLLECTION_LIST = "actionCollectionList";
 
+    public static final String README_FILE_NAME = "README.md";
+
     public static final String DEFAULT_COMMIT_MESSAGE = "System generated commit, ";
     public static final String EMPTY_COMMIT_ERROR_MESSAGE = "On current branch nothing to commit, working tree clean";
     public static final String MERGE_CONFLICT_BRANCH_NAME = "_mergeConflict";

diff --git a/...ver/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java b/...ver/src/main/java/com/appsmith/server/applications/git/ApplicationGitFileUtilsCEImpl.java
@@ -70,6 +70,8 @@
 import static com.appsmith.git.constants.CommonConstants.JSON_EXTENSION;
 import static com.appsmith.git.constants.CommonConstants.MAIN_CONTAINER;
 import static com.appsmith.git.constants.CommonConstants.WIDGETS;
+import static com.appsmith.git.constants.ce.CommonConstantsCE.FILE_FORMAT_VERSION;
+import static com.appsmith.git.constants.ce.CommonConstantsCE.fileFormatVersion;
 import static com.appsmith.git.constants.ce.GitDirectoriesCE.PAGE_DIRECTORY;
 import static com.appsmith.server.constants.FieldName.ACTION_COLLECTION_LIST;
 import static com.appsmith.server.constants.FieldName.ACTION_LIST;
@@ -189,6 +191,10 @@ public void setArtifactDependentResources(
         copyProperties(applicationJson, applicationMetadata, keys);
         final String metadataFilePath = CommonConstants.METADATA + JSON_EXTENSION;
         ObjectNode metadata = objectMapper.valueToTree(applicationMetadata);
+
+        // put file format version;
+        metadata.put(FILE_FORMAT_VERSION, fileFormatVersion);
+
         GitResourceIdentity metadataIdentity =
                 new GitResourceIdentity(GitResourceType.ROOT_CONFIG, metadataFilePath, metadataFilePath);
         resourceMap.put(metadataIdentity, metadata);
@@ -717,7 +723,6 @@ public void setArtifactDependentPropertiesInJson(
         artifactExchangeJson.setContextList(pageList);
 
         // widgets
-
         pageList.parallelStream().forEach(newPage -> {
             Map<String, org.json.JSONObject> widgetsData = resourceMap.entrySet().stream()
                     .filter(entry -> {
@@ -730,13 +735,23 @@ public void setArtifactDependentPropertiesInJson(
                                     .getFilePath()
                                     .replaceFirst(
                                             PAGE_DIRECTORY
+                                                    + DELIMITER_PATH
                                                     + newPage.getUnpublishedPage()
                                                             .getName()
                                                     + DELIMITER_PATH
                                                     + WIDGETS
                                                     + DELIMITER_PATH,
                                             MAIN_CONTAINER + DELIMITER_PATH),
-                            entry -> (org.json.JSONObject) entry.getValue()));
+                            entry -> {
+                                try {
+                                    return new org.json.JSONObject(objectMapper.writeValueAsString(entry.getValue()));
+                                } catch (JsonProcessingException jsonProcessingException) {
+                                    log.error(
+                                            "Error while deserializing widget with file path {}",
+                                            entry.getKey().getFilePath());
+                                    throw new RuntimeException(jsonProcessingException);
+                                }
+                            }));
 
             Layout layout = newPage.getUnpublishedPage().getLayouts().get(0);
             org.json.JSONObject mainContainer;

diff --git a/...rc/main/java/com/appsmith/server/applications/imports/ApplicationImportServiceCEImpl.java b/...rc/main/java/com/appsmith/server/applications/imports/ApplicationImportServiceCEImpl.java
@@ -53,6 +53,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static com.appsmith.server.constants.FieldName.PUBLISHED;
+import static com.appsmith.server.constants.FieldName.UNPUBLISHED;
 import static com.appsmith.server.helpers.ImportExportUtils.setPropertiesToExistingApplication;
 import static com.appsmith.server.helpers.ImportExportUtils.setPublishedApplicationProperties;
 import static org.springframework.util.StringUtils.hasText;
@@ -361,11 +363,18 @@ public Mono<Application> updateAndSaveArtifactInContext(
                     application.setWorkspaceId(importingMetaDTO.getWorkspaceId());
                     application.setIsPublic(null);
                     application.setPolicies(null);
-                    Map<String, List<ApplicationPage>> mapOfApplicationPageList = Map.of(
-                            FieldName.PUBLISHED,
-                            application.getPublishedPages(),
-                            FieldName.UNPUBLISHED,
-                            application.getPages());
+
+                    List<ApplicationPage> unPublishedPages = CollectionUtils.isEmpty(application.getPages())
+                            ? new ArrayList<>()
+                            : application.getPages();
+
+                    List<ApplicationPage> publishedPages = CollectionUtils.isEmpty(application.getPublishedPages())
+                            ? new ArrayList<>()
+                            : application.getPublishedPages();
+
+                    Map<String, List<ApplicationPage>> mapOfApplicationPageList =
+                            Map.of(PUBLISHED, publishedPages, UNPUBLISHED, unPublishedPages);
+
                     mappedImportableResourcesDTO
                             .getResourceStoreFromArtifactExchangeJson()
                             .putAll(mapOfApplicationPageList);