Skip to content

Commit

Permalink
Merge pull request #1381 from ashitsalesforce/master
Browse files Browse the repository at this point in the history 
fix bug in UI labels and use legacy Auth endpoint to prepopulate rele…
  • Loading branch information
@ashitsalesforce
ashitsalesforce authored Nov 18, 2024
2 parents 40fe765 + 53b0324 commit 1724fb9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 8 deletions.
16 changes: 14 additions & 2 deletions src/main/java/com/salesforce/dataloader/ui/AdvancedSettingsDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,12 @@ public void verifyText(VerifyEvent event) {
data.widthHint = 30 * textSize.x;
textProdEndpoint.setLayoutData(data);
String endpoint = appConfig.getString(AppConfig.PROP_AUTH_ENDPOINT_PROD);
// try with legacy endpoint property
if (endpoint == null
|| endpoint.isBlank()
|| endpoint.startsWith(AppConfig.DEFAULT_ENDPOINT_URL_PROD)) {
endpoint = appConfig.getString(AppConfig.PROP_AUTH_ENDPOINT_LEGACY);
}
if ("".equals(endpoint)) { //$NON-NLS-1$
endpoint = AppConfig.DEFAULT_ENDPOINT_URL_PROD;
}
Expand All @@ -633,6 +639,12 @@ public void verifyText(VerifyEvent event) {
data.widthHint = 30 * textSize.x;
textSBEndpoint.setLayoutData(data);
endpoint = appConfig.getString(AppConfig.PROP_AUTH_ENDPOINT_SANDBOX);
// try with legacy endpoint property
if (endpoint == null
|| endpoint.isBlank()
|| endpoint.startsWith(AppConfig.DEFAULT_ENDPOINT_URL_SANDBOX)) {
endpoint = appConfig.getString(AppConfig.PROP_AUTH_ENDPOINT_LEGACY);
}
if ("".equals(endpoint)) { //$NON-NLS-1$
endpoint = AppConfig.DEFAULT_ENDPOINT_URL_SANDBOX;
}
Expand Down Expand Up @@ -1176,8 +1188,8 @@ private Text createTimezoneTextInput(Composite parent, String configKey, String
t.setText(String.valueOf(val));

buttonLocalSystemTimezone = new Button(timezoneComp, SWT.PUSH | SWT.FLAT);
buttonLocalSystemTimezone.setText(Labels.getString("AdvancedSettingsDialog.setClientSystemTimezone")); //$NON-NLS-1$
buttonLocalSystemTimezone.setToolTipText(Labels.getString("AdvancedSettingsDialog.TooltipSetClientSystemTimezone"));
buttonLocalSystemTimezone.setText(Labels.getString("AdvancedSettingsDialog.uiLabel.setClientSystemTimezone")); //$NON-NLS-1$
buttonLocalSystemTimezone.setToolTipText(Labels.getString("AdvancedSettingsDialog.uiTooltip.TooltipSetClientSystemTimezone"));
buttonLocalSystemTimezone.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
t.setText(TimeZone.getDefault().getID());
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/labels.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ AdvancedSettingsDialog.uiTooltip.sfdc.insertNulls=interpret blank values in mapp
AdvancedSettingsDialog.uiLabel.sfdc.assignmentRule=<a href="https://help.salesforce.com/s/articleView?id=000381858&type=1">Assignment rule id for Cases/Leads import</a>:
AdvancedSettingsDialog.uiLabel.externalIdField=External ID field:
AdvancedSettingsDialog.uiLabel.process.useEuropeanDates=Use European date format:\n(dd/mm/yyyy)
AdvancedSettingsDialog.uiLabel.sfdc.endpoint.production=<a href="https://help.salesforce.com/s/articleView?id=sf.remoteaccess_oauth_endpoints.htm&type=5">Authentication host domain URL</a> for Production:\n(aka Server host URL. Clear for default)
AdvancedSettingsDialog.uiLabel.sfdc.endpoint.sandbox=<a href="https://help.salesforce.com/s/articleView?id=sf.remoteaccess_oauth_endpoints.htm&type=5">Authentication host domain URL</a> for Sandbox:\n(aka Server host URL. Clear for default)
AdvancedSettingsDialog.uiLabel.sfdc.endpoint.Production=<a href="https://help.salesforce.com/s/articleView?id=sf.remoteaccess_oauth_endpoints.htm&type=5">Authentication host domain URL</a> for Production:\n(aka Server host URL. Clear for default)
AdvancedSettingsDialog.uiLabel.sfdc.endpoint.Sandbox=<a href="https://help.salesforce.com/s/articleView?id=sf.remoteaccess_oauth_endpoints.htm&type=5">Authentication host domain URL</a> for Sandbox:\n(aka Server host URL. Clear for default)
AdvancedSettingsDialog.uiLabel.serverURLInfo=Enter an authentication host domain URL that uses HTTPS protocol.\nFor example, "https://login.salesforce.com" is valid.\n\"{0}\" is invalid.
AdvancedSettingsDialog.uiLabel.sessionTimeout=Session Timeout:\n(in seconds)
AdvancedSettingsDialog.uiLabel.sfdc.noCompression=Disable data compression during upload to the server:
Expand Down Expand Up @@ -429,7 +429,7 @@ AppConfig.property.description.loader.ui.showUpgrade=Show upgrade dialog if a ne
AppConfig.property.description.sfdc.extractionSOQL=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/loader_params.htm
AppConfig.property.description.loader.csvOther=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm
AppConfig.property.description.sfdc.ui.wizard.closeOnFinish=If set to true, it closes UI Wizard dialog when the operation is completed. Set it to false if you want to perform the same operation multiple times.
AppConfig.property.description.sfdc.endpoint.sandbox=See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm
AppConfig.property.description.sfdc.endpoint.Sandbox=See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm
AppConfig.property.description.sfdc.proxyPort=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm
AppConfig.property.description.sfdc.useBulkApi=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm
AppConfig.property.description.process.mappingFile=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/loader_params.htm
Expand Down Expand Up @@ -462,9 +462,9 @@ AppConfig.property.description.process.enableExtractStatusOutput=Details documen
AppConfig.property.description.salesforce.saveAllSettings=Save all Settings, including default ones, in config.properties file, if set to true. Save only the settings that have values different from their defaults if set to false.
AppConfig.property.description.loader.query.limitOutputToQueryFields=
AppConfig.property.description.sfdc.system.proxyHost=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm
AppConfig.property.description.sfdc.endpoint.production=See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm
AppConfig.property.description.sfdc.endpoint=Legacy property, superseded environment-specific properties sfdc.endpoint.production and \
and sfdc.endpoint.sandbox. See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm
AppConfig.property.description.sfdc.endpoint.Production=See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm
AppConfig.property.description.sfdc.endpoint=Legacy property, superseded environment-specific properties sfdc.endpoint.Production and \
and sfdc.endpoint.Sandbox. See the description of Setting "Server host" at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm
AppConfig.property.description.sfdc.oauth.loginfrombrowser=
AppConfig.property.description.sfdc.connectionTimeoutSecs=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/loader_params.htm
AppConfig.property.description.sfdc.insertNulls=Details documented at https://developer.salesforce.com/docs/atlas.en-us.dataLoader.meta/dataLoader/configuring_the_data_loader.htm
Expand Down

0 comments on commit 1724fb9

Please sign in to comment.