Merge branch 'main' into feat/escalation_matrix

frappe · Jun 20, 2023 · f5313aa · f5313aa
2 parents d869ca0 + 6efb49b
commit f5313aa
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 37 deletions.
diff --git a/desk/src/components/desk/kb/ArticleDetails.vue b/desk/src/components/desk/kb/ArticleDetails.vue
@@ -2,7 +2,7 @@
 	<div class="flex flex-col rounded shadow p-5 text-base space-y-[12px]">
 		<div class="font-semibold">Details</div>
 		<div class="border-b w-full"></div>
-		<router-link
+		<RouterLink
 			:to="`/knowledge-base/articles/${article.name}`"
 			target="_blank"
 			v-if="article.published_on"
@@ -18,7 +18,7 @@
 				}}
 			</div>
 			<FeatherIcon name="external-link" class="w-4" />
-		</router-link>
+		</RouterLink>
 		<div v-if="$resources.users.data" class="flex flex-col">
 			<span class="block mb-2 text-sm leading-4 text-gray-700">
 				Author

diff --git a/desk/src/components/desk/settings/SettingsSideBarMenu.vue b/desk/src/components/desk/settings/SettingsSideBarMenu.vue
@@ -5,11 +5,11 @@
 				class="cursor-pointer px-3 hover:bg-gray-50 rounded-md mx-2 mb-1"
 				:class="selectedSetting === setting.label ? 'bg-gray-50' : ''"
 			>
-				<router-link :to="{ name: setting.pageName }">
+				<RouterLink :to="{ name: setting.pageName }">
 					<div class="p-2 text-base">
 						{{ setting.label }}
 					</div>
-				</router-link>
+				</RouterLink>
 			</div>
 		</div>
 	</div>

diff --git a/desk/src/components/desk/settings/canned_responses/CannedResponseInfo.vue b/desk/src/components/desk/settings/canned_responses/CannedResponseInfo.vue
@@ -2,14 +2,14 @@
   <div class="min-w-[490px] px-[24px] py-[10px]">
     <div class="flow-root h-[72px] shrink-0 py-[22px] px-[16px]">
       <div class="float-left">
-        <router-link
+        <RouterLink
           to="/canned-responses"
           class="my-1 flex select-none flex-row items-center space-x-1 stroke-gray-600 text-sm text-gray-600 hover:stroke-gray-700 hover:text-gray-700"
           role="button"
         >
           <FeatherIcon name="arrow-left" class="h-[13px] w-[13px]" />
           <div>Back to response list</div>
-        </router-link>
+        </RouterLink>
       </div>
       <div class="float-right">
         <div v-if="!editMode" class="flex flex-row space-x-2">

diff --git a/desk/src/components/desk/settings/canned_responses/CannedResponseListItem.vue b/desk/src/components/desk/settings/canned_responses/CannedResponseListItem.vue
@@ -16,7 +16,7 @@
 					role="button"
 				/>
 			</div>
-			<router-link
+			<RouterLink
 				:to="`/settings/canned_responses/${canned_response.name}`"
 				class="w-full group flex items-center"
 			>
@@ -27,7 +27,7 @@
 					{{ canned_response.owner }}
 				</div>
 				<div class="sm:w-2/12 truncate"></div>
-			</router-link>
+			</RouterLink>
 		</div>
 	</div>
 </template>

diff --git a/desk/src/components/desk/settings/emails/EmailListItem.vue b/desk/src/components/desk/settings/emails/EmailListItem.vue
@@ -13,12 +13,12 @@
 				/>
 			</div>
 			<div class="w-full group flex items-center">
-				<router-link
+				<RouterLink
 					:to="`/settings/emails/${emailAccount.name}`"
 					class="sm:w-4/12"
 				>
 					{{ emailAccount.name }}
-				</router-link>
+				</RouterLink>
 				<div class="sm:w-5/12">
 					{{ emailAccount.email_id }}
 				</div>

diff --git a/desk/src/components/desk/settings/policies/SlaPolicyListItem.vue b/desk/src/components/desk/settings/policies/SlaPolicyListItem.vue
@@ -13,7 +13,7 @@
 				/>
 			</div>
 			<div class="w-full group flex items-center">
-				<router-link
+				<RouterLink
 					:to="`/settings/sla/${policy.name}`"
 					class="sm:w-10/12 truncate pr-10 flex flex-row items-center space-x-2"
 				>
@@ -27,7 +27,7 @@
 							class="w-[16px] h-[16px] fill-blue-500"
 						/>
 					</a>
-				</router-link>
+				</RouterLink>
 				<div class="sm:w-2/12">
 					<div class="flex flex-row-reverse">
 						<CustomSwitch

diff --git a/desk/src/components/desk/settings/teams/TeamInfo.vue b/desk/src/components/desk/settings/teams/TeamInfo.vue
@@ -2,14 +2,14 @@
 	<div class="min-w-[490px] px-[24px] py-[10px]">
 		<div class="flow-root h-[72px] shrink-0 py-[22px] px-[16px]">
 			<div class="float-left">
-				<router-link
+				<RouterLink
 					:to="`/teams`"
 					class="my-1 flex select-none flex-row items-center space-x-1 stroke-gray-600 text-sm text-gray-600 hover:stroke-gray-700 hover:text-gray-700"
 					role="button"
 				>
 					<FeatherIcon name="arrow-left" class="h-[13px] w-[13px]" />
 					<div>Back to team list</div>
-				</router-link>
+				</RouterLink>
 			</div>
 			<div class="float-right">
 				<div class="flex flex-row space-x-2">

diff --git a/desk/src/components/desk/settings/ticket_types/TicketTypeInfo.vue b/desk/src/components/desk/settings/ticket_types/TicketTypeInfo.vue
@@ -2,14 +2,14 @@
   <div class="min-w-[490px] px-[24px] py-[10px]">
     <div class="flow-root h-[72px] shrink-0 py-[22px] px-[16px]">
       <div class="float-left">
-        <router-link
+        <RouterLink
           :to="`/ticket-types`"
           class="my-1 flex select-none flex-row items-center space-x-1 stroke-gray-600 text-sm text-gray-600 hover:stroke-gray-700 hover:text-gray-700"
           role="button"
         >
           <FeatherIcon name="arrow-left" class="h-[13px] w-[13px]" />
           <div>Back to ticket type list</div>
-        </router-link>
+        </RouterLink>
       </div>
       <div class="float-right">
         <div class="flex flex-row space-x-2">

diff --git a/desk/src/components/desk/sidebar/SidebarLink.vue b/desk/src/components/desk/sidebar/SidebarLink.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex h-7 cursor-pointer items-center rounded-lg px-1.5 text-gray-700 transition-all duration-300 ease-in-out"
+    class="flex h-7 cursor-pointer items-center rounded-lg pl-1.5 pr-1 text-gray-700 transition-all duration-300 ease-in-out"
     :class="{
       'w-full': sidebarStore.isExpanded,
       'w-7': !sidebarStore.isExpanded,

diff --git a/desk/src/components/global/kb/ArticleCard.vue b/desk/src/components/global/kb/ArticleCard.vue
@@ -1,5 +1,5 @@
 <template>
-	<router-link :to="`/knowledge-base/articles/${article.name}`">
+	<RouterLink :to="`/knowledge-base/articles/${article.name}`">
 		<div
 			class="group rounded-[6px] shadow-md bg-white p-5 w-full flex flex-row justify-between items-center hover:bg-gray-50"
 		>
@@ -11,7 +11,7 @@
 				class="h-4 w-4 group-hover:visible invisible"
 			/>
 		</div>
-	</router-link>
+	</RouterLink>
 </template>
 
 <script>

diff --git a/desk/src/components/global/kb/ArticleMiniList.vue b/desk/src/components/global/kb/ArticleMiniList.vue
@@ -9,8 +9,8 @@
 			<!-- TODO: <FeatherIcon v-if="editMode" name="plus" class="w-4 cursor-pointer my-auto bg-gray-50 hover:bg-gray-100 rounded" /> -->
 			<p v-if="editMode" class="text-base text-gray-500">
 				( add articles from
-				<router-link class="underline" :to="{ path: '/kb/articles' }"
-					>here</router-link
+				<RouterLink class="underline" :to="{ path: '/kb/articles' }"
+					>here</RouterLink
 				>
 				)
 			</p>

diff --git a/desk/src/components/global/kb/LayoutSwitcher.vue b/desk/src/components/global/kb/LayoutSwitcher.vue
@@ -4,7 +4,7 @@
 			v-if="viewMode === 'Web'"
 			class="flex flex-row items-center space-x-2"
 		>
-			<router-link
+			<RouterLink
 				:title="'Articles'"
 				:to="{
 					path: '/kb/articles',
@@ -15,7 +15,7 @@
 					name="list"
 					class="h-5 w-5 ml-2 stroke-gray-500 hover:stroke-gray-900"
 				/>
-			</router-link>
+			</RouterLink>
 			<div
 				class="bg-white rounded-md shadow px-2 py-0.5 w-[82px] h-[24px]"
 			>
@@ -28,7 +28,7 @@
 			>
 				<div>Articles</div>
 			</div>
-			<router-link
+			<RouterLink
 				:title="'Toggle Web view'"
 				:to="{ path: '/kb' }"
 			>
@@ -37,7 +37,7 @@
 					name="layout"
 					class="h-5 w-5 mr-2 stroke-gray-500 hover:stroke-gray-900"
 				/>
-			</router-link>
+			</RouterLink>
 		</div>
 	</div>
 </template>

diff --git a/desk/src/components/global/kb/SearchSection.vue b/desk/src/components/global/kb/SearchSection.vue
@@ -49,7 +49,7 @@
 									v-for="(result, index) in searchResults"
 									:key="result.name"
 								>
-									<router-link
+									<RouterLink
 										:to="{
 											path: `/knowledge-base/${
 												result.doctype === 'Article'
@@ -82,7 +82,7 @@
 												<div>{{ result.title }}</div>
 											</div>
 										</div>
-									</router-link>
+									</RouterLink>
 								</div>
 							</div>
 							<div v-else class="p-2 text-gray-500">

diff --git a/desk/src/components/global/ticket_list_item/Subject.vue b/desk/src/components/global/ticket_list_item/Subject.vue
@@ -1,5 +1,5 @@
 <template>
-	<router-link
+	<RouterLink
 		:to="{
 			path: `/tickets/${ticket.name}`,
 		}"
@@ -12,7 +12,7 @@
 		}"
 	>
 		{{ ticket.subject }}
-	</router-link>
+	</RouterLink>
 </template>
 
 <script setup lang="ts">

diff --git a/desk/src/pages/desk/kb/Articles.vue b/desk/src/pages/desk/kb/Articles.vue
@@ -137,12 +137,12 @@
 						</div>
 					</template>
 					<template #field-title="{ value, row }">
-						<router-link
+						<RouterLink
 							:to="{
 								path: `/kb/articles/${row.name}`,
 							}"
 							class="cursor-pointer text-gray-600 hover:text-gray-900"
-							>{{ value }}</router-link
+							>{{ value }}</RouterLink
 						>
 					</template>
 					<template #field-status="{ value }">

diff --git a/desk/src/pages/desk/sla/SlaPolicies.vue b/desk/src/pages/desk/sla/SlaPolicies.vue
@@ -39,7 +39,7 @@
         >
           <template #field-name="{ row }">
             <div class="group flex w-full items-center">
-              <router-link
+              <RouterLink
                 :to="{
                   path: `/sla/${row.name}`,
                 }"
@@ -54,7 +54,7 @@
                     class="h-[16px] w-[16px] fill-blue-500"
                   />
                 </a>
-              </router-link>
+              </RouterLink>
             </div>
           </template>
           <template #field-enabled="{ row }">

diff --git a/desk/src/pages/desk/ticket-list/TicketSummary.vue b/desk/src/pages/desk/ticket-list/TicketSummary.vue
@@ -1,5 +1,5 @@
 <template>
-  <router-link
+  <RouterLink
     :to="toRoute"
     class="flex justify-between"
     :class="{
@@ -32,7 +32,7 @@
         {{ ticketName }}
       </div>
     </div>
-  </router-link>
+  </RouterLink>
 </template>
 
 <script setup lang="ts">

diff --git a/desk/src/pages/desk/ticket/OpenTicketList.vue b/desk/src/pages/desk/ticket/OpenTicketList.vue
@@ -16,12 +16,12 @@
     </div>
     <div v-if="isExpanded" class="flex flex-col gap-2 pt-4">
       <div v-for="t in tickets" :key="t.name">
-        <router-link :to="t.to" target="_blank" class="flex items-start gap-2">
+        <RouterLink :to="t.to" target="_blank" class="flex items-start gap-2">
           <div class="flex h-5 w-5 items-center justify-center">
             <IconWebLink class="h-5 w-5 text-gray-600" />
           </div>
           <div class="text-base text-gray-800">{{ t.subject }}</div>
-        </router-link>
+        </RouterLink>
       </div>
     </div>
   </div>