Merge pull request #40571 from appsmithorg/release

05/05 Daily Promotion

Author: btsgh

app/client/src/ce/constants/messages.ts

@@ -1627,6 +1627,8 @@ export const PROPERTY_PANE_EMPTY_SEARCH_RESULT_MESSAGE =
   "No properties found based on your search";
 export const PROPERTY_SEARCH_INPUT_PLACEHOLDER =
   "Search for controls, labels etc";
+export const PROPERTY_PANE_TITLE_RENAME_DISABLED = () =>
+  "This widget cannot be renamed";
 export const EXPLORER_BETA_ENTITY = () => "BETA";
 export const BINDING_WIDGET_WALKTHROUGH_TITLE = () => "Widget properties";
 export const BINDING_WIDGET_WALKTHROUGH_DESC = () =>

app/client/src/pages/Editor/PropertyPane/PropertyPaneTitle.tsx

@@ -23,6 +23,10 @@ import {
   getIsCurrentWidgetRecentlyAdded,
   getPropertyPaneWidth,
 } from "selectors/propertyPaneSelectors";
+import {
+  createMessage,
+  PROPERTY_PANE_TITLE_RENAME_DISABLED,
+} from "ee/constants/messages";
 
 interface PropertyPaneTitleProps {
   title: string;
@@ -31,6 +35,7 @@ interface PropertyPaneTitleProps {
   updatePropertyTitle?: (title: string) => void;
   onBackClick?: () => void;
   isPanelTitle?: boolean;
+  isRenameDisabled?: boolean;
   actions: Array<{
     tooltipContent: string;
     icon: ReactElement;
@@ -186,22 +191,36 @@ const PropertyPaneTitle = memo(function PropertyPaneTitle(
         className="flex-grow"
         onKeyDown={handleTabKeyDown}
       >
-        <EditableText
-          className="flex-grow text-lg font-semibold t--property-pane-title"
-          defaultValue={name}
-          editInteractionKind={EditInteractionKind.SINGLE}
-          fill
-          hideEditIcon
-          isEditingDefault={isEditingDefault}
-          onBlur={!props.isPanelTitle ? updateTitle : undefined}
-          onBlurEverytime={handleOnBlurEverytime}
-          onTextChanged={!props.isPanelTitle ? undefined : updateNewTitle}
-          placeholder={props.title}
-          savingState={updating ? SavingState.STARTED : SavingState.NOT_STARTED}
-          underline
-          valueTransform={!props.isPanelTitle ? removeSpecialChars : undefined}
-          wrapperRef={containerRef}
-        />
+        {props.isRenameDisabled ? (
+          <div className="flex-grow text-lg font-semibold t--property-pane-title">
+            <Tooltip
+              content={createMessage(PROPERTY_PANE_TITLE_RENAME_DISABLED)}
+            >
+              <div>{name}</div>
+            </Tooltip>
+          </div>
+        ) : (
+          <EditableText
+            className="flex-grow text-lg font-semibold t--property-pane-title"
+            defaultValue={name}
+            editInteractionKind={EditInteractionKind.SINGLE}
+            fill
+            hideEditIcon
+            isEditingDefault={isEditingDefault}
+            onBlur={!props.isPanelTitle ? updateTitle : undefined}
+            onBlurEverytime={handleOnBlurEverytime}
+            onTextChanged={!props.isPanelTitle ? undefined : updateNewTitle}
+            placeholder={props.title}
+            savingState={
+              updating ? SavingState.STARTED : SavingState.NOT_STARTED
+            }
+            underline
+            valueTransform={
+              !props.isPanelTitle ? removeSpecialChars : undefined
+            }
+            wrapperRef={containerRef}
+          />
+        )}
       </StyledEditableContainer>
 
       {/* ACTIONS */}

app/client/src/pages/Editor/PropertyPane/PropertyPaneView.tsx

@@ -287,6 +287,7 @@ function PropertyPaneView(
     >
       <PropertyPaneTitle
         actions={actions}
+        isRenameDisabled={widgetProperties?.isRenameDisabled}
         key={widgetProperties.widgetId}
         title={widgetProperties.widgetName}
         widgetId={widgetProperties.widgetId}

app/client/src/selectors/editorSelectors.tsx

@@ -335,6 +335,10 @@ export const getCurrentPageName = createSelector(
       ?.pageName,
 );
 
+const isModuleWidget = (
+  config: ReturnType<typeof WidgetFactory.getConfigs>[string],
+) => config.type.startsWith("MODULE_WIDGET_");
+
 export const getWidgetCards = createSelector(
   getIsAutoLayout,
   getIsAnvilLayout,
@@ -357,7 +361,7 @@ export const getWidgetCards = createSelector(
         return config.widgetName !== "Map" && !config.hideCard;
       }
 
-      return !config.hideCard;
+      return !config.hideCard && !isModuleWidget(config);
     });
 
     const _cards: WidgetCardProps[] = cards.map((config) => {

app/server/appsmith-git/src/main/java/com/appsmith/git/files/FileUtilsCEImpl.java

@@ -1268,15 +1268,25 @@ public Mono<Object> reconstructMetadataFromGitRepository(Path repoSuffix) {
 
     @Override
     public Mono<Object> reconstructPageFromGitRepo(
-            String pageName, String branchName, Path baseRepoSuffixPath, Boolean resetToLastCommitRequired) {
+            String pageName,
+            String branchName,
+            Path baseRepoSuffixPath,
+            Boolean resetToLastCommitRequired,
+            Boolean useFSGitHandler,
+            Boolean keepWorkingDirChanges) {
         Mono<Object> pageObjectMono;
         try {
             Mono<Boolean> resetToLastCommit = Mono.just(Boolean.TRUE);
 
             if (Boolean.TRUE.equals(resetToLastCommitRequired)) {
                 // instead of checking out to last branch we are first cleaning the git repo,
                 // then checking out to the desired branch
-                resetToLastCommit = gitExecutor.resetToLastCommit(baseRepoSuffixPath, branchName, false);
+                if (Boolean.TRUE.equals(useFSGitHandler)) {
+                    resetToLastCommit =
+                            fsGitHandler.resetToLastCommit(baseRepoSuffixPath, branchName, keepWorkingDirChanges);
+                } else {
+                    resetToLastCommit = gitExecutor.resetToLastCommit(baseRepoSuffixPath, branchName, true);
+                }
             }
 
             pageObjectMono = resetToLastCommit.map(isSwitched -> {

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/enums/FeatureFlagEnum.java

@@ -24,6 +24,7 @@ public enum FeatureFlagEnum {
      * Feature flag to detect if the RTS git reset is enabled
      */
     ab_rts_git_reset_enabled,
+    release_git_api_contracts_enabled,
 
     // Deprecated CE flags over here
     release_git_autocommit_feature_enabled,

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/FileInterface.java

@@ -80,7 +80,12 @@ Mono<Object> reconstructMetadataFromGitRepo(
     Mono<Object> reconstructPackageJsonFromGitRepository(Path repoSuffix);
 
     Mono<Object> reconstructPageFromGitRepo(
-            String pageName, String branchName, Path repoSuffixPath, Boolean checkoutRequired);
+            String pageName,
+            String branchName,
+            Path repoSuffixPath,
+            Boolean checkoutRequired,
+            Boolean useFSGitHandler,
+            Boolean keepWorkingDirChanges);
 
     /**
      * Once the user connects the existing application to a remote repo, we will initialize the repo with Readme.md -

app/server/appsmith-plugins/snowflakePlugin/pom.xml

@@ -18,7 +18,7 @@
         <dependency>
             <groupId>net.snowflake</groupId>
             <artifactId>snowflake-jdbc</artifactId>
-            <version>3.22.0</version>
+            <version>3.23.1</version>
         </dependency>
 
         <dependency>

app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java

@@ -933,6 +933,9 @@ public Mono<JSONObject> getPageDslVersionNumber(
         String defaultArtifactId = gitArtifactMetadata.getDefaultArtifactId();
         String refName = gitArtifactMetadata.getRefName();
         String repoName = gitArtifactMetadata.getRepoName();
+        Mono<Boolean> useFSGitHandlerMono = featureFlagService.check(FeatureFlagEnum.release_git_api_contracts_enabled);
+        Mono<Boolean> keepWorkingDirChangesMono =
+                featureFlagService.check(FeatureFlagEnum.release_git_reset_optimization_enabled);
 
         if (!hasText(workspaceId)) {
             return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID));
@@ -957,8 +960,14 @@ public Mono<JSONObject> getPageDslVersionNumber(
         ArtifactGitFileUtils<?> artifactGitFileUtils = getArtifactBasedFileHelper(artifactType);
         Path baseRepoSuffix = artifactGitFileUtils.getRepoSuffixPath(workspaceId, defaultArtifactId, repoName);
 
-        Mono<JSONObject> jsonObjectMono = fileUtils
-                .reconstructPageFromGitRepo(pageDTO.getName(), refName, baseRepoSuffix, isResetToLastCommitRequired)
+        Mono<JSONObject> jsonObjectMono = Mono.zip(useFSGitHandlerMono, keepWorkingDirChangesMono)
+                .flatMap(tuple -> fileUtils.reconstructPageFromGitRepo(
+                        pageDTO.getName(),
+                        refName,
+                        baseRepoSuffix,
+                        isResetToLastCommitRequired,
+                        tuple.getT1(),
+                        tuple.getT2()))
                 .onErrorResume(error -> Mono.error(
                         new AppsmithException(AppsmithError.GIT_ACTION_FAILED, RECONSTRUCT_PAGE, error.getMessage())))
                 .map(pageJson -> {