Skip to content

chore: Allow context to determine path in file dir #38498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nidhi-nair merged 1 commit into from
Jan 6, 2025
Merged

chore: Allow context to determine path in file dir #38498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...er/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.appsmith.external.models.ActionDTO;
import com.appsmith.external.models.ArtifactGitReference;
import com.appsmith.external.models.BaseDomain;
import com.appsmith.external.models.CreatorContextType;
import com.appsmith.external.models.DatasourceStorage;
import com.appsmith.external.models.PluginType;
import com.appsmith.git.constants.CommonConstants;
Expand Down Expand Up @@ -310,6 +311,10 @@ protected void setArtifactIndependentResources(
setActionCollectionsInResourceMap(artifactExchangeJson, resourceMap);
}

protected String getContextDirectoryByType(CreatorContextType contextType) {
return PAGE_DIRECTORY;
}

protected void setNewActionsInResourceMap(
ArtifactExchangeJson artifactExchangeJson, Map<GitResourceIdentity, Object> resourceMap) {
if (artifactExchangeJson.getActionList() == null) {
Expand All @@ -325,7 +330,7 @@ protected void setNewActionsInResourceMap(
removeUnwantedFieldFromAction(newAction);
ActionDTO action = newAction.getUnpublishedAction();
final String actionFileName = action.getValidName().replace(".", "-");
final String filePathPrefix = PAGE_DIRECTORY
final String filePathPrefix = getContextDirectoryByType(action.getContextType())
+ DELIMITER_PATH
+ action.calculateContextId()
+ DELIMITER_PATH
Expand Down Expand Up @@ -383,7 +388,7 @@ protected void setActionCollectionsInResourceMap(
.forEach(actionCollection -> {
removeUnwantedFieldFromActionCollection(actionCollection);
ActionCollectionDTO collection = actionCollection.getUnpublishedCollection();
final String filePathPrefix = PAGE_DIRECTORY
final String filePathPrefix = getContextDirectoryByType(collection.getContextType())
+ DELIMITER_PATH
+ collection.calculateContextId()
+ DELIMITER_PATH
Expand Down