From 6fdf3deae4f61619c5939d7316c0f616fc8e301a Mon Sep 17 00:00:00 2001
From: Nicolas Kempf Le Stanc <nicolas@conciergerie.dev>
Date: Thu, 12 Dec 2024 14:40:27 +0100
Subject: [PATCH] feat: use beta/admin as default

Also use non-deprecated function from datagouv/components
---
 components/ProducerSelect.vue                    | 4 ++--
 components/SiteHeader/SiteHeader.vue             | 7 +++----
 pages/beta/admin/organizations/[oid]/members.vue | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/components/ProducerSelect.vue b/components/ProducerSelect.vue
index 1f5aea12..0657404e 100644
--- a/components/ProducerSelect.vue
+++ b/components/ProducerSelect.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script setup lang="ts">
-import { useUserAvatar, type Organization, type User } from '@datagouv/components'
+import { getUserAvatar, type Organization, type User } from '@datagouv/components'
 import type { Owned } from '~/types/types'
 
 const props = withDefaults(defineProps<{
@@ -53,7 +53,7 @@ const { t } = useI18n()
 const user = useMe()
 const { $api } = useNuxtApp()
 
-const avatar = computed(() => useUserAvatar(user.value, 24))
+const avatar = computed(() => getUserAvatar(user.value, 24))
 
 const ownedOptions = computed<Array<Owned>>(() => {
   return [...user.value.organizations.map(organization => ({ organization, owner: null })), { owner: user.value, organization: null }]
diff --git a/components/SiteHeader/SiteHeader.vue b/components/SiteHeader/SiteHeader.vue
index a42d8ea6..b2f778cd 100644
--- a/components/SiteHeader/SiteHeader.vue
+++ b/components/SiteHeader/SiteHeader.vue
@@ -190,7 +190,7 @@
                       class="fr-btn fr-icon-svg fr-icon--sm fr-grid-row"
                     >
                       <NuxtImg
-                        :src="useUserAvatar(me, 24)"
+                        :src="getUserAvatar(me, 24)"
                         width="24"
                         height="24"
                         loading="lazy"
@@ -202,8 +202,7 @@
                   </li>
                   <li>
                     <NuxtLinkLocale
-                      to="/admin/"
-                      :external="true"
+                      to="/beta/admin/"
                       class="fr-btn"
                     >
                       <RiSettings3Line
@@ -386,7 +385,7 @@
 <script setup lang="ts">
 import { RiAccountCircleLine, RiAddLine, RiDatabase2Line, RiGovernmentLine, RiLockLine, RiMenuLine, RiSearchLine, RiRobot2Line, RiLineChartLine, RiServerLine, RiArticleLine, RiSettings3Line, RiLogoutBoxRLine } from '@remixicon/vue'
 import { Disclosure, DisclosureButton, DisclosurePanel, Popover, PopoverButton, PopoverPanel } from '@headlessui/vue'
-import { useUserAvatar } from '@datagouv/components'
+import { getUserAvatar } from '@datagouv/components'
 import { NuxtLinkLocale } from '#components'
 import SiteLogo from '~/components/SiteLogo.vue'
 import { useMaybeMe } from '~/utils/auth'
diff --git a/pages/beta/admin/organizations/[oid]/members.vue b/pages/beta/admin/organizations/[oid]/members.vue
index 1b9931d4..ee3b2052 100644
--- a/pages/beta/admin/organizations/[oid]/members.vue
+++ b/pages/beta/admin/organizations/[oid]/members.vue
@@ -69,7 +69,7 @@
                     <div class="flex items-center space-x-2">
                       <NuxtImg
                         class="rounded-full border border-default-grey size-5"
-                        :src="useUserAvatar(user, 24)"
+                        :src="getUserAvatar(user, 24)"
                         loading="lazy"
                         alt=""
                       />
@@ -279,11 +279,11 @@
 </template>
 
 <script setup lang="ts">
-import { Avatar, formatDate, formatFromNow, useUserAvatar, type Member, type Organization } from '@datagouv/components'
+import { Avatar, formatDate, formatFromNow, getUserAvatar, type Member, type Organization } from '@datagouv/components'
 import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { RiMailLine } from '@remixicon/vue'
-import type { AdminBadgeState, AdminBadgeType, MemberRole, PendingMembershipRequest, UserSuggest } from '~/types/types'
+import type { AdminBadgeType, MemberRole, PendingMembershipRequest, UserSuggest } from '~/types/types'
 import AdminTable from '~/components/AdminTable/Table/AdminTable.vue'
 import AdminTableTh from '~/components/AdminTable/Table/AdminTableTh.vue'
 import ModalWithButton from '~/components/Modal/ModalWithButton.vue'