Merge branch 'maintenance/8.0' of https://github.com/Talend/tcommon-studio-se into tuj/SPL33

Fix TUP-36723 can not list project when use old way to fetch from token
https://jira.talendforge.org/browse/TUP-36723

main/plugins/org.talend.core.repository/src/main/java/org/talend/core/repository/ui/actions/DuplicateAction.java

@@ -225,7 +225,7 @@ public class DuplicateAction extends AContextualAction {
         // update the property of the node repository object
         // sourceNode.getObject().setProperty(updatedProperty);
 
-        String initNameValue = "Copy_of_" + item.getProperty().getDisplayName(); //$NON-NLS-1$
+        String initNameValue = "SPL33x_" + item.getProperty().getDisplayName(); //$NON-NLS-1$
 
         CopyObjectAction copyObjectAction = CopyObjectAction.getInstance();
 

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/context/ContextUtils.java

@@ -222,6 +222,32 @@ public class ContextUtils {
         }
         return parameterType;
     }
+    
+    // TUP-36519:For possible duplicate internalid scenario(TUP-36667) after several times' renaming in joblet. Loop all and find the nearest
+    // one.
+    public static ContextParameterType getContextParameterTypeById(ContextType contextType, final String uuId,
+            boolean isFromContextItem, String paraName) {
+        if (contextType == null || uuId == null) {
+            return null;
+        }
+
+        ContextParameterType parameterType = null;
+        for (ContextParameterType param : (List<ContextParameterType>) contextType.getContextParameter()) {
+            String paramId = null;
+            if (isFromContextItem) {
+                paramId = ResourceHelper.getUUID(param);
+            } else {
+                paramId = param.getInternalId();
+            }
+            if (uuId.equals(paramId)) {
+                parameterType = param;
+                if (paraName != null && StringUtils.equals(paraName, param.getName())) {
+                    break;
+                }
+            }
+        }
+        return parameterType;
+    }
 
     public static ContextParameterType getContextParameterTypeById(ContextType contextType, final String uuId,
             boolean isFromContextItem) {
@@ -846,7 +872,7 @@ public class ContextUtils {
                         if (item != null) {
                             final ContextType repoContextType = ContextUtils.getContextTypeByName(item, contextType.getName());
                             ContextParameterType repoContextParam = ContextUtils.getContextParameterTypeById(repoContextType,
-                                    paramLink.getId(), item instanceof ContextItem);
+                                    paramLink.getId(), item instanceof ContextItem, contextParameterType.getName());
                             if (repoContextParam != null
                                     && !StringUtils.equals(repoContextParam.getName(), contextParameterType.getName())) {
                                 renamedMap.put(repoContextParam.getName(), contextParameterType.getName());
@@ -915,7 +941,7 @@ public class ContextUtils {
                                 if (item != null) {
                                     ContextType contextType = ContextUtils.getContextTypeByName(item, context.getName());
                                     ContextParameterType repoParameterType = ContextUtils.getContextParameterTypeById(contextType,
-                                            parameterLink.getId(), item instanceof ContextItem);
+                                            parameterLink.getId(), item instanceof ContextItem, parameterType.getName());
                                     if (repoParameterType != null
                                             && !StringUtils.equals(repoParameterType.getName(), parameterType.getName())) {
                                         renamedMap.put(repoParameterType.getName(), parameterType.getName());
@@ -975,7 +1001,7 @@ public class ContextUtils {
         ContextParameterType contextParameterType = null;
         if (paramLink != null && paramLink.getId() != null && contextType != null) {
             contextParameterType = getContextParameterTypeById(contextType, paramLink.getId(),
-                    contextItem instanceof ContextItem);
+                    contextItem instanceof ContextItem, paramName);
         }
         if (contextParameterType != null) {// Compare use UUID
             if (!StringUtils.equals(contextParameterType.getName(), paramName)) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/SparkBatchMetadataTalendTypeFilter.java

@@ -16,10 +16,7 @@ public class SparkBatchMetadataTalendTypeFilter extends SparkMetadataTalendTypeF
             "tFileInputParquet",
             "tFileOutputParquet",
             "tJDBCInput",
-            "tJDBCOutput",
-            "tLogRow",
-            "tSqlRow",
-            "tFileInputDelimited"
+            "tJDBCOutput", "tLogRow", "tSqlRow"
             );
 
     public SparkBatchMetadataTalendTypeFilter(INode node) {

main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/update/RepositoryUpdateManager.java

@@ -359,7 +359,9 @@ public abstract class RepositoryUpdateManager {
             List<UpdateResult> checkedResults = null;
 
             if (parameter == null) { // update all job
-                checkedResults = filterSpecialCheckedResult(results);
+                // TUP-36519: comment out the filter for only opening job
+                // checkedResults = filterSpecialCheckedResult(results);
+                checkedResults = results;
             } else { // filter
                 checkedResults = filterCheckedResult(results);
             }

main/plugins/org.talend.repository.metadata/src/main/java/org/talend/repository/metadata/i18n/messages_fr.properties

@@ -983,6 +983,7 @@ DatabaseForm.helpInfo.installDriverLink.label=Installer un pilote
 DatabaseForm.redshift.driverVersion=Version du pilote
 DatabaseForm.redshift.driverVersion.tip=S\u00E9lectionnez un pilote Redshift
 DatabaseForm.redshift.useStringAdditionParam=Utiliser un param\u00E8tre de cha\u00EEne de caract\u00E8res
+DatabaseForm.supportnls=Support de NLS
 DatabaseTableFilterForm.allSynonyms=Tous les synonymes
 DatabaseTableFilterForm.edit=Modifier...
 DatabaseTableFilterForm.editFilterName=Modifier le nom du filtre

main/plugins/org.talend.signon.util/src/main/java/org/talend/signon/util/SSOClientUtil.java

@@ -145,16 +145,16 @@ public class SSOClientUtil {
         String dataCenter = TMCRepositoryUtil.getDefaultDataCenter();
         StringBuffer urlSB = new StringBuffer();
         urlSB.append(TMCRepositoryUtil.getBaseLoginURL(dataCenter)).append("?");
-        urlSB.append("client_id=").append(URLEncoder.encode(clientID, StandardCharsets.UTF_8.name())).append("&");
+        urlSB.append("client_id=").append(clientID).append("&");
         urlSB.append("redirect_uri=")
                 .append(URLEncoder.encode(TMCRepositoryUtil.getRedirectURL(dataCenter), StandardCharsets.UTF_8.name()))
                 .append("&");
-        urlSB.append("scope=").append(URLEncoder.encode("openid refreshToken", StandardCharsets.UTF_8.name())).append("&");
-        urlSB.append("response_type=").append(URLEncoder.encode("code", StandardCharsets.UTF_8.name())).append("&");
-        urlSB.append("code_challenge_method=").append(URLEncoder.encode("S256", StandardCharsets.UTF_8.name())).append("&");
-        urlSB.append("code_challenge=").append(URLEncoder.encode(codeChallenge, StandardCharsets.UTF_8.name())).append("&");        
-        String state = String.valueOf(callbackPort) + SSOUtil.STATE_PARAM_SEPARATOR + TMCRepositoryUtil.getDefaultDataCenter();
-        urlSB.append("state=").append(URLEncoder.encode(state, StandardCharsets.UTF_8.name()));        
+        urlSB.append("scope=openid refreshToken&");
+        urlSB.append("response_type=code&");
+        urlSB.append("code_challenge_method=S256&");
+        urlSB.append("code_challenge=").append(codeChallenge).append("&");
+        urlSB.append("state=").append(callbackPort).append(SSOUtil.STATE_PARAM_SEPARATOR)
+                .append(TMCRepositoryUtil.getDefaultDataCenter());
         return urlSB.toString();
     }
 

main/plugins/org.talend.signon.util/src/main/java/org/talend/signon/util/TMCRepositoryUtil.java

@@ -12,16 +12,8 @@
 // ============================================================================
 package org.talend.signon.util;
 
-
-import org.apache.log4j.Logger;
-import org.eclipse.core.runtime.preferences.ConfigurationScope;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-
 public class TMCRepositoryUtil {
-    private static Logger LOGGER = Logger.getLogger(TMCRepositoryUtil.class);
-    
+
     public static final String REPOSITORY_CLOUD_US_ID = "cloud_us"; //$NON-NLS-1$
 
     public static final String REPOSITORY_CLOUD_EU_ID = "cloud_eu"; //$NON-NLS-1$
@@ -53,10 +45,6 @@ public class TMCRepositoryUtil {
     public static final String SUCCESS_REDIRECT_URL = "https://iam.%s.cloud.talend.com/idp/login-sso-success"; //$NON-NLS-1$
     
     public static final String ONLINE_HELP_URL = "https://document-link.us.cloud.talend.com/ts_ug_launch-studio?version=%s&lang=%s&env=prd";
-    
-    public static final String ORG_TALEND_WORKSPACE_PREF_NODE = "org.eclipse.ui.ide"; //$NON-NLS-1$
-    
-    public static final String ORG_TALEND_RECENT_DATA_CENTERR = "org.talend.recent.datacenter";
 
     public static String getBaseLoginURL(String dataCenter) {
         if (dataCenter == null) {
@@ -67,29 +55,11 @@ public class TMCRepositoryUtil {
 
     public static String getDefaultDataCenter() {
         String defaultDataCenter = "us";
-        if (getRecentDataCenter() != null) {
-            defaultDataCenter = getRecentDataCenter();
-        }
         if (System.getProperty(SSOClientUtil.DATA_CENTER_KEY) != null) {
             defaultDataCenter = System.getProperty(SSOClientUtil.DATA_CENTER_KEY);
         }
         return defaultDataCenter;
     }
-    
-    public static void saveRecentDataCenter(String dataCenter) {
-        Preferences node = new ConfigurationScope().getNode(ORG_TALEND_WORKSPACE_PREF_NODE);
-        node.put(ORG_TALEND_RECENT_DATA_CENTERR, dataCenter);
-        try {
-            node.flush();
-        } catch (BackingStoreException e) {
-            LOGGER.error("failed to store workspace location in preferences :", e); //$NON-NLS-1$
-        }
-    }
-
-    public static String getRecentDataCenter() {
-        Preferences node = new ConfigurationScope().getNode(ORG_TALEND_WORKSPACE_PREF_NODE);
-        return node.get(ORG_TALEND_RECENT_DATA_CENTERR, null);
-    }
 
     public static String getCloudAdminURL(String dataCenter) {
         return String.format(ADMIN_URL, dataCenter);