* updated import application modal design as v2 * updated import flow * added title, description, uploadIcon on filepicker ads component for custom file picker * adding modal of add credential for git import * added "Git Import" modal * added generating ssh key for importing flow * fixed issue of merging * chore: fix import * chore: show old import modal based on feature flag * seperated import api from connect * added datasource list on reconnect credential modal * chore: minor changes * chore: move ssh keys to git sync reducer from applications reducer * chore: minor fixes * chore: fetch datasource config for import * for pulling * for review of displaying of datasource * added reconnect datasources after git import * fix: initialize datasource with default values * fix: initialise redux for after updating datasource with default values * fixed issue of git connection init when importing * if there is a datasource config missing in import, reconnect modal should be opened * updated logic for unconfigured datasources * commented unnecessary code * fixed issue of successful import * updated import app error logic * Add un-configured datasources to Import via file response * Add test * fix * chore: refactors * change per review * fix: reset ssh keys / url * Fix issue with newly created datasources not sent * fix * chore: minor updates * chore: minor fix * WIP * added saas and rest api datasource form * feat: fixes and updates for file import flow * chore: close on upload * Refactor logic ofr finding unconfigured datasources * fix: minor fixes * Fix issue with IsPartialImport * fix * Add PartialImport flag for ImportExport service * refactoring of datasource editor form for both of importing app and editing app * fixed collapse config * Fix tests * Handle redirection back to the /applications for oAuth type * Show reconnect button on the datasources pages if the datasource configuration is skipped * added analytic events for reconnecting datasource modal * Fix the repo limit check for git import * updated test of importing app from json as new work flow * updated exported app json while testing automatically * Add isImport flag for handling OAuth redirection in import flow * WIP * updated card UI for import from git title and message in import app modal * chore: cleanup * chore: lint * fix: add is import query param to get token for oauth * fix * When the user imports the application there should not be any uncommitted changes displayed on the commit icon * Add flag to identify OAuth redirection for git import * Update the variable name * refactoring reconnect datasource modal * close git import modal when repo limit error responded * fixed issue of restoring draft data of datasource form without save on reconnect datasource modal * chore: update query * updated query name of oauth redirection url * Fix duplicate name issue in git import * fixed rest api reconnect issue on reconnect modal * init datasources and plugins after imported app, updated reconnect modal as new design * added unconfigured datasource list logic when importing and updated rest api form delete button visible * removed put default config of datasource and fixed issue on it * Add logic to check isCOnfugred in datasource API * Expose API to get un configured datasources for git import * added fetch unconfigured datasource list api when redirecting form OAuth * Remove sensitive fields from application json during export * update put call response to check for datasourceConfig * chore: use @appsmith for constants/messages * chore: use download icon and Import for Importing application label * chore: move import application text up a bit * Fix bad merge * chore: update skip to application tooltip text * fixed tooltip content of skip to application CTA * init values of datasource when importing * updated ui of git import modal as figma design * fixing padding issue of reconnect datasource modal * fixed cursor issue on import app modal * Fix issue with datasource config * chore: make code compile * chore: sort lines * fixed save button issue of dbform on reconnecting modal * fixed style of import application modal * Fix iisue with wrong value updated to flag * reverted from reconnection form style * fix: update design as per slack discussions on 2022.02.23 * fix: move modal close button to the left * Remove check for the flag and use the one from db * Set siCOnfigured as true for mockdata sets * updated creating datasource with isConfigured as false * Fix NPE while importing * fixed scrollbar issue and text alignment on reconnect datasource modal * fixed style of form container in reconnect datasource and redirecting to app if all are configured * remove unwanted fields from application json * FIx NPE for file import * fix: move close button up in import modal * remove delete button on reconnect datasource modal * Add isConfigured false while creating datasources * fix: add a gap and update color gap between git import dialog title and subtitle update color of subtext to GREY_800 * fix: use git import feature flag * fix: do not use older modal * updated selecting logic of unconfigured datasource in reconnect modal * cleanup: auto format * cleanup: refactor react component * cleanup: refactor some more * cleanup: autoformat * Fix reconnect flag for mockdatasource * During git import set the isConfigured to false for datasources * Remove decrypted field from the applicationJson file * Remove decrypted field from the applicationJson file * Add app slug to remote repo * fixed cypress test related with git * updated json while testing * Changes per review * Update the method name * fixed cypress test related with git * fixed migration cypress test * set is configured field as true on tour app * Fix issue with datasource creation for welcome tour * fixed issue of replay_editor cypress test Co-authored-by: Rishabh Saxena <rishabh@appsmith.com> Co-authored-by: Anagh Hegde <anagh@appsmith.com> Co-authored-by: Anubhav <anubhav@appsmith.com> Co-authored-by: f0c1s <iamanubhavsaini+git@gmail.com>
173 lines
5.8 KiB
TypeScript
173 lines
5.8 KiB
TypeScript
import { AppState } from "reducers";
|
|
import { createSelector } from "reselect";
|
|
import { GitSyncReducerState } from "reducers/uiReducers/gitSyncReducer";
|
|
import {
|
|
getCurrentAppGitMetaData,
|
|
getCurrentApplication,
|
|
} from "./applicationSelectors";
|
|
import { Branch } from "entities/GitSync";
|
|
|
|
export const getGitSyncState = (state: AppState): GitSyncReducerState =>
|
|
state.ui.gitSync;
|
|
|
|
export const getIsGitSyncModalOpen = (state: AppState) =>
|
|
state.ui.gitSync.isGitSyncModalOpen;
|
|
|
|
export const getIsDisconnectGitModalOpen = (state: AppState) =>
|
|
state.ui.gitSync.isDisconnectGitModalOpen;
|
|
|
|
export const getIsGitRepoSetup = (state: AppState) => {
|
|
const gitMetadata = getCurrentAppGitMetaData(state);
|
|
return gitMetadata?.remoteUrl;
|
|
};
|
|
|
|
export const getIsCommittingInProgress = (state: AppState) =>
|
|
state.ui.gitSync.isCommitting;
|
|
|
|
export const getIsCommitSuccessful = (state: AppState) =>
|
|
state.ui.gitSync.isCommitSuccessful;
|
|
|
|
export const getActiveGitSyncModalTab = (state: AppState) =>
|
|
state.ui.gitSync.activeGitSyncModalTab;
|
|
|
|
export const getIsGitErrorPopupVisible = (state: AppState) =>
|
|
state.ui.gitSync.isErrorPopupVisible;
|
|
|
|
export const getGlobalGitConfig = (state: AppState) =>
|
|
state.ui.gitSync.globalGitConfig;
|
|
|
|
export const getLocalGitConfig = (state: AppState) =>
|
|
state.ui.gitSync.localGitConfig;
|
|
|
|
export const getIsLocalConfigDefined = createSelector(
|
|
getLocalGitConfig,
|
|
(localGitConfig) =>
|
|
!!(localGitConfig.authorEmail || localGitConfig.authorName),
|
|
);
|
|
|
|
export const getIsGlobalConfigDefined = createSelector(
|
|
getGlobalGitConfig,
|
|
(globalGitConfig) =>
|
|
!!(globalGitConfig.authorEmail || globalGitConfig.authorName),
|
|
);
|
|
|
|
export const getIsFetchingGlobalGitConfig = (state: AppState) =>
|
|
state.ui.gitSync.isFetchingGitConfig;
|
|
|
|
export const getIsFetchingLocalGitConfig = (state: AppState) =>
|
|
state.ui.gitSync.isFetchingLocalGitConfig;
|
|
|
|
export const getGitStatus = (state: AppState) => state.ui.gitSync.gitStatus;
|
|
|
|
export const getGitConnectError = (state: AppState) =>
|
|
state.ui.gitSync.connectError?.error;
|
|
|
|
export const getGitPullError = (state: AppState) =>
|
|
state.ui.gitSync.pullError?.error;
|
|
|
|
export const getGitMergeError = (state: AppState) =>
|
|
state.ui.gitSync.mergeError?.error;
|
|
|
|
export const getGitCommitAndPushError = (state: AppState) =>
|
|
state.ui.gitSync.commitAndPushError?.error;
|
|
|
|
export const getIsFetchingGitStatus = (state: AppState) =>
|
|
state.ui.gitSync.isFetchingGitStatus;
|
|
|
|
export const getIsPullingProgress = (state: AppState) =>
|
|
state.ui.gitSync.pullInProgress;
|
|
|
|
export const getIsFetchingMergeStatus = (state: AppState) =>
|
|
state.ui.gitSync.isFetchingMergeStatus;
|
|
|
|
export const getMergeStatus = (state: AppState) => state.ui.gitSync.mergeStatus;
|
|
|
|
export const getIsGitConnected = createSelector(
|
|
getCurrentAppGitMetaData,
|
|
(gitMetaData) => !!(gitMetaData && gitMetaData.remoteUrl),
|
|
);
|
|
export const getGitBranches = (state: AppState) => state.ui.gitSync.branches;
|
|
|
|
export const getGitBranchNames = createSelector(getGitBranches, (branches) =>
|
|
branches.map((branchObj) => branchObj.branchName),
|
|
);
|
|
|
|
export const getDefaultGitBranchName = createSelector(
|
|
getGitBranches,
|
|
(branches: Array<Branch>) =>
|
|
branches.find((branchObj) => branchObj.default)?.branchName,
|
|
);
|
|
|
|
export const getFetchingBranches = (state: AppState) =>
|
|
state.ui.gitSync.fetchingBranches;
|
|
|
|
export const getCurrentGitBranch = (state: AppState) => {
|
|
const { gitApplicationMetadata } = getCurrentApplication(state) || {};
|
|
return gitApplicationMetadata?.branchName;
|
|
};
|
|
|
|
export const getPullFailed = (state: AppState) => state.ui.gitSync.pullFailed;
|
|
|
|
export const getPullInProgress = (state: AppState) =>
|
|
state.ui.gitSync.pullInProgress;
|
|
|
|
export const getIsMergeInProgress = (state: AppState) =>
|
|
state.ui.gitSync.isMerging;
|
|
export const getTempRemoteUrl = (state: AppState) =>
|
|
state.ui.gitSync.tempRemoteUrl;
|
|
|
|
export const getMergeError = (state: AppState) => state.ui.gitSync.mergeError;
|
|
|
|
export const getCountOfChangesToCommit = (state: AppState) => {
|
|
const gitStatus = getGitStatus(state);
|
|
const { modifiedPages = 0, modifiedQueries = 0 } = gitStatus || {};
|
|
return modifiedPages + modifiedQueries;
|
|
};
|
|
|
|
export const getShowRepoLimitErrorModal = (state: AppState) =>
|
|
state.ui.gitSync.showRepoLimitErrorModal;
|
|
|
|
export const getDisconnectingGitApplication = (state: AppState) =>
|
|
state.ui.gitSync.disconnectingGitApp;
|
|
|
|
export const getUseGlobalProfile = (state: AppState) =>
|
|
state.ui.gitSync.useGlobalProfile;
|
|
|
|
const FALLBACK_GIT_SYNC_DOCS_URL =
|
|
"https://docs.appsmith.com/core-concepts/git-sync";
|
|
|
|
// git connect ssh key deploy url
|
|
export const getSSHKeyDeployDocUrl = (state: AppState) =>
|
|
state.ui.gitSync.deployKeyDocUrl || FALLBACK_GIT_SYNC_DOCS_URL;
|
|
|
|
// git connect remote url
|
|
export const getRemoteUrlDocUrl = (state: AppState) =>
|
|
state.ui.gitSync.deployKeyDocUrl || FALLBACK_GIT_SYNC_DOCS_URL;
|
|
|
|
// git deploy conflict doc url
|
|
export const getConflictFoundDocUrlDeploy = (state: AppState) =>
|
|
state.ui.gitSync.pullError?.error?.referenceDoc || FALLBACK_GIT_SYNC_DOCS_URL;
|
|
|
|
// git deploy conflict doc url
|
|
export const getConflictFoundDocUrlMerge = (state: AppState) =>
|
|
state.ui.gitSync.mergeStatus?.referenceDoc ||
|
|
state.ui.gitSync.mergeError?.error?.referenceDoc ||
|
|
FALLBACK_GIT_SYNC_DOCS_URL;
|
|
|
|
// git disconnect learn more doc url
|
|
export const getDisconnectDocUrl = () =>
|
|
"https://docs.appsmith.com/core-concepts/git-sync#disconnecting-the-git-repository";
|
|
|
|
export const getConnectingErrorDocUrl = (state: AppState) =>
|
|
state.ui.gitSync.connectError?.error.referenceDoc ||
|
|
FALLBACK_GIT_SYNC_DOCS_URL;
|
|
|
|
export const getUpstreamErrorDocUrl = (state: AppState) =>
|
|
state.ui.gitSync.commitAndPushError?.error?.referenceDoc ||
|
|
FALLBACK_GIT_SYNC_DOCS_URL;
|
|
|
|
export const getSshKeyPair = (state: AppState) => state.ui.gitSync.SSHKeyPair;
|
|
|
|
export const getIsImportingApplicationViaGit = (state: AppState) =>
|
|
state.ui.gitSync.isImportingApplicationViaGit;
|