From 9628c56530b85b3f9be55ba1881bc64ca2839ac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Busso?=
 <90727999+agustinbusso@users.noreply.github.com>
Date: Tue, 27 Jun 2023 13:02:21 -0300
Subject: [PATCH] Fix process translations redirects to translations tab

---
 resources/views/processes/edit.blade.php           | 14 ++++++++++++--
 .../views/processes/translations/export.blade.php  |  4 ++--
 .../views/processes/translations/import.blade.php  |  8 ++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/resources/views/processes/edit.blade.php b/resources/views/processes/edit.blade.php
index 9e67471808..ffe90457f7 100644
--- a/resources/views/processes/edit.blade.php
+++ b/resources/views/processes/edit.blade.php
@@ -47,7 +47,7 @@
                     <div class="tab-content" id="nav-tabContent">
 
                         {{-- Configuration --}}
-                        <div class="tab-pane fade show active" id="nav-config" role="tabpanel"
+                        <div class="tab-pane fade show" :class="{'active': activeTab === ''}" id="nav-config" role="tabpanel"
                              aria-labelledby="nav-config-tab">
                             <required></required>
                             <div class="form-group">
@@ -172,7 +172,7 @@
 
                         {{-- Translations --}}
                         @can('view-process-translations')
-                            <div class="tab-pane fade show" id="nav-translations" role="tabpanel"
+                            <div class="tab-pane fade show" :class="{'active': activeTab === 'nav-translations'}" id="nav-translations" ref="nav-translations" role="tabpanel"
                                 aria-labelledby="nav-translations-tab">
                                 
                                 <div class="page-content mb-0" id="processTranslationIndex">
@@ -402,12 +402,22 @@ class="custom-control-input">
             manager: @json($process->manager),
             translatedLanguages: [],
             editTranslation: null,
+            activeTab: "",
           }
         },
         mounted() {
+            this.activeTab = "";
             if (_.get(this.formData, 'properties.manager_can_cancel_request')) {
                 this.canCancel.push(this.processManagerOption());
             }
+            
+            let path = new URL(location.href).href;
+            let target = path.split('#');
+
+            if (target[1] !== undefined) {
+                this.activeTab = target[1];
+            }
+            
         },
         computed: {
             activeUsersAndGroupsWithManager() {
diff --git a/resources/views/processes/translations/export.blade.php b/resources/views/processes/translations/export.blade.php
index 9100d5d979..eebce7fbc3 100644
--- a/resources/views/processes/translations/export.blade.php
+++ b/resources/views/processes/translations/export.blade.php
@@ -12,7 +12,7 @@
     @include('shared.breadcrumbs', ['routes' => [
         __('Designer') => route('processes.index'),
         __('Processes') => route('processes.index'),
-        __('Translations') => route('processes.edit', ['process' => $process->id]),
+        __('Translations') => '/processes/'.$process->id.'/edit#nav-translations',
         __('Export' . ' ' . $process->name . ' - ' . $language['humanLanguage']) => null,
     ]])
 @endsection
@@ -55,7 +55,7 @@
         },
         methods: {
           onCancel() {
-            window.location = `/processes/${this.processId}/edit`;
+            window.location = `/processes/${this.processId}/edit/#nav-translations`;
           },
           onExport() {
             ProcessMaker.apiClient({
diff --git a/resources/views/processes/translations/import.blade.php b/resources/views/processes/translations/import.blade.php
index 7be8614614..73e979b4f5 100644
--- a/resources/views/processes/translations/import.blade.php
+++ b/resources/views/processes/translations/import.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.layout')
 
 @section('title')
-    {{__('Import Screen')}}
+    {{__('Import Translation')}}
 @endsection
 
 @section('sidebar')
@@ -12,7 +12,7 @@
     @include('shared.breadcrumbs', ['routes' => [
       __('Designer') => route('processes.index'),
       __('Processes') => route('processes.index'),
-      __('Translations') => route('processes.edit', ['process' => $process->id]),
+      __('Translations') => '/processes/'.$process->id.'/edit#nav-translations',
       __('Import') => null,
     ]])
 @endsection
@@ -125,7 +125,7 @@ class="p-0"
 
           },
           onCancel() {
-            window.location = `/processes/${$processId}/edit`;
+            window.location = `/processes/${this.process.id}/edit#nav-translations`;
           },
           onImport() {
             let formData = new FormData();
@@ -147,7 +147,7 @@ class="p-0"
               let message = this.$t('The process translation was imported correctly.');
               let variant = 'success';
               ProcessMaker.alert(message, variant);
-              window.location.href = `/processes/${this.process.id}/edit`;
+              window.location.href = `/processes/${this.process.id}/edit#nav-translations`;
             })
             .catch((error) => {
               this.submitted = false;