diff --git a/package-lock.json b/package-lock.json index ba4d54eac3..604488a83b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@fullcalendar/multimonth": "6.1.20", "@fullcalendar/vue3": "6.1.20", "@google/model-viewer": "4.3.0", - "@sentry/vue": "10.55.0", + "@sentry/vue": "10.56.0", "@unhead/vue": "3.1.1", "@vuepic/vue-datepicker": "11.0.3", "bowser": "2.14.1", @@ -80,7 +80,7 @@ "vite": "8.0.16", "vitest": "4.1.8", "vitest-localstorage-mock": "0.1.2", - "vue-eslint-parser": "10.4.0" + "vue-eslint-parser": "10.4.1" }, "engines": { "node": ">=22.22.1", @@ -2262,88 +2262,88 @@ "license": "MIT" }, "node_modules/@sentry-internal/browser-utils": { - "version": "10.55.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.55.0.tgz", - "integrity": "sha512-zUvyBr13EK0evKsSTzwSimRzZ3P9kugS32dLCj3ea5gNN+/DFtU/GsMTdcIQDhusEDraIlH17AGgqJH5gUAv5w==", + "version": "10.56.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-10.56.0.tgz", + "integrity": "sha512-I8tZWAFg8SZpD8BFUpglEtSTzhZjacmcThB5/Mlq/iFiiT8mBPG4ZWDWssSfmIBKvZywJZJ83uDA0+uiJU73Tw==", "license": "MIT", "dependencies": { - "@sentry/core": "10.55.0" + "@sentry/core": "10.56.0" }, "engines": { "node": ">=18" } }, "node_modules/@sentry-internal/feedback": { - "version": "10.55.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.55.0.tgz", - "integrity": "sha512-32X9WW1xs5DjCRlp89QJ/PLw4kbTIX6MsBDXN2RBN1nWBjm/2WcwXqO/v/WoIS4W2kTWXcZnQwalLSI22Fp33A==", + "version": "10.56.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-10.56.0.tgz", + "integrity": "sha512-fkRR9JroESTIlErkht3OrH4DXKd/DbPozr2KLdX7boMo31hPu4cL9fuqzwOrwyDPRq9B4j+qEgIWB8JrTbgvmg==", "license": "MIT", "dependencies": { - "@sentry/core": "10.55.0" + "@sentry/core": "10.56.0" }, "engines": { "node": ">=18" } }, "node_modules/@sentry-internal/replay": { - "version": "10.55.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.55.0.tgz", - "integrity": "sha512-OkQpANGwYU5UKfwLk6Y+NpESRC8nrLBjawRDLwF6cJ8HpNScOuNNJDEJEGwXHVkJPH0pcIixsH8y0Qfcltq6Xw==", + "version": "10.56.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-10.56.0.tgz", + "integrity": "sha512-DjF09hpy3TF7Km/kOZc73YJmBqcbPCxuZ5rtRs+KtVHu3Vq48xeW83qKUcFEZv20ur9UD99OAJ/gaEt//1Qbwg==", "license": "MIT", "dependencies": { - "@sentry-internal/browser-utils": "10.55.0", - "@sentry/core": "10.55.0" + "@sentry-internal/browser-utils": "10.56.0", + "@sentry/core": "10.56.0" }, "engines": { "node": ">=18" } }, "node_modules/@sentry-internal/replay-canvas": { - "version": "10.55.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.55.0.tgz", - "integrity": "sha512-lu/y7k9cK7FZ/qJpL0fBX4WqK6IFa/+bTPhedEaC5UpzjUNP7BfXt0H+R7q9CHWmp20Ffh/wGfO3j7O+Tv2MAA==", + "version": "10.56.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-10.56.0.tgz", + "integrity": "sha512-SDg2K0CAZT/TnhrixQGwXoi6ZsWUB+DQy3UUk0bSQm6c/5k5zFBpGOiughQN+DYsDilKREfPKmUEEnqvUjm1HQ==", "license": "MIT", "dependencies": { - "@sentry-internal/replay": "10.55.0", - "@sentry/core": "10.55.0" + "@sentry-internal/replay": "10.56.0", + "@sentry/core": "10.56.0" }, "engines": { "node": ">=18" } }, "node_modules/@sentry/browser": { - "version": "10.55.0", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.55.0.tgz", - "integrity": "sha512-5n1kxmW1m4j16ZDV9kt+Zo5uafFnKTy7s5YyEcGnC45KnOiO1Gy+QFd3woXns1K5GNxpjF7oOOc6tXgZLuXnQQ==", + "version": "10.56.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-10.56.0.tgz", + "integrity": "sha512-80X3NmsGB6tLmfzXYdjzWWdVAdL5CRukGKLcRWIcNhgGjtskOmnzaGb93egEZGI5bUTbtONJ0oyscQ3Z9yoAtQ==", "license": "MIT", "dependencies": { - "@sentry-internal/browser-utils": "10.55.0", - "@sentry-internal/feedback": "10.55.0", - "@sentry-internal/replay": "10.55.0", - "@sentry-internal/replay-canvas": "10.55.0", - "@sentry/core": "10.55.0" + "@sentry-internal/browser-utils": "10.56.0", + "@sentry-internal/feedback": "10.56.0", + "@sentry-internal/replay": "10.56.0", + "@sentry-internal/replay-canvas": "10.56.0", + "@sentry/core": "10.56.0" }, "engines": { "node": ">=18" } }, "node_modules/@sentry/core": { - "version": "10.55.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.55.0.tgz", - "integrity": "sha512-XUyoNtDSYCvgJnoNzlh+YeAXfIPhCRIXbhWqqM3GQ3AFtZICi85lkyfsrwXEl9wzlPGYnU+Eg8F4tOfScx+FcQ==", + "version": "10.56.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-10.56.0.tgz", + "integrity": "sha512-L+u1dIz5SANrmST5jhIwETtt4apILgKrylv12X4hKJU0PvZl+NorjeV/ty3MwzpKQPg6b6q6qMOSLc1rLpy3iQ==", "license": "MIT", "engines": { "node": ">=18" } }, "node_modules/@sentry/vue": { - "version": "10.55.0", - "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-10.55.0.tgz", - "integrity": "sha512-K2tpJP4s7BYeOADubP4huFMJNEHWBy7jaggNIt0bH7TBKeTZo0r9wfCjJUI+i7Bg0gTgX3JggE9bV45vs96Amw==", + "version": "10.56.0", + "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-10.56.0.tgz", + "integrity": "sha512-bDQ+RNPc/D9ZkFj/iK+IDYYxlQNJFYPQx9YEq1TNCKHudZrhc4AXnXxY7COmre0CQOXrVkuc6vYOGJnbB460Cg==", "license": "MIT", "dependencies": { - "@sentry/browser": "10.55.0", - "@sentry/core": "10.55.0" + "@sentry/browser": "10.56.0", + "@sentry/core": "10.56.0" }, "engines": { "node": ">=18" @@ -9637,9 +9637,9 @@ "license": "MIT" }, "node_modules/vue-eslint-parser": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.4.0.tgz", - "integrity": "sha512-Vxi9pJdbN3ZnVGLODVtZ7y4Y2kzAAE2Cm0CZ3ZDRvydVYxZ6VrnBhLikBsRS+dpwj4Jv4UCv21PTEwF5rQ9WXg==", + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.4.1.tgz", + "integrity": "sha512-Gk6gRDj0n/fkRa3C3l0bBheoBckUq/Rs0F/TvMWIS6nzzx67amAViMe9CkNgsP2tXyQONvGiHQESHwFtZ3aYDA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 89d7bfde79..157fb6a5ae 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@fullcalendar/multimonth": "6.1.20", "@fullcalendar/vue3": "6.1.20", "@google/model-viewer": "4.3.0", - "@sentry/vue": "10.55.0", + "@sentry/vue": "10.56.0", "@unhead/vue": "3.1.1", "@vuepic/vue-datepicker": "11.0.3", "bowser": "2.14.1", @@ -92,7 +92,7 @@ "vite": "8.0.16", "vitest": "4.1.8", "vitest-localstorage-mock": "0.1.2", - "vue-eslint-parser": "10.4.0" + "vue-eslint-parser": "10.4.1" }, "engines": { "node": ">=22.22.1", diff --git a/src/components/lists/PeopleList.vue b/src/components/lists/PeopleList.vue index 788d105e22..41d611605f 100644 --- a/src/components/lists/PeopleList.vue +++ b/src/components/lists/PeopleList.vue @@ -28,6 +28,9 @@ {{ $t('people.list.studio') }} + + {{ $t('people.list.country') }} + {{ $t('people.list.contract') }} @@ -79,6 +82,9 @@ + + {{ countryName(person.country) }} + {{ $t(`people.contract.${person.contract_type}`) }} @@ -124,7 +130,7 @@ - +

{{ nbUsersDetails }} @@ -136,6 +142,9 @@ import { AlertTriangleIcon } from 'lucide-vue-next' import { mapGetters } from 'vuex' +import { getCountryName } from '@/lib/countries' +import { localeCode } from '@/lib/lang' + import { grabListMixin } from '@/components/mixins/grablist' import { domMixin } from '@/components/mixins/dom' @@ -257,6 +266,10 @@ export default { }, methods: { + countryName(country) { + return getCountryName(country, localeCode.value) + }, + isExpired(expirationDate) { return expirationDate < this.today }, @@ -320,6 +333,11 @@ export default { min-width: 180px; } +.country { + width: 160px; + min-width: 160px; +} + .contract { width: 160px; min-width: 160px; @@ -455,6 +473,7 @@ export default { .phone, .studio, + .country, .contract, .position, .seniority, diff --git a/src/components/modals/EditPersonModal.vue b/src/components/modals/EditPersonModal.vue index 76682318c3..1f0fa95aa7 100644 --- a/src/components/modals/EditPersonModal.vue +++ b/src/components/modals/EditPersonModal.vue @@ -118,6 +118,12 @@ v-model="form.studio_id" v-if="!isBot" /> + [ { label: t('main.no'), value: 'false' } ]) +const countryOptions = computed(() => getCountryOptions(localeCode.value)) + const contractOptions = [ { label: 'open-ended', value: 'open-ended' }, { label: 'fixed-term', value: 'fixed-term' }, @@ -290,6 +300,7 @@ const form = ref({ active: 'true', departments: [], studio_id: null, + country: null, expiration_date: null, is_bot: false }) @@ -303,6 +314,11 @@ const user = computed(() => store.getters.user) const isEditing = computed(() => Boolean(props.personToEdit?.id)) +// Country feeds the carbon footprint calculation; hidden for bots/clients (guests never reach this modal). +const showCountryField = computed( + () => !props.isBot && form.value.role !== 'client' +) + const modalTitle = computed(() => { if (isEditing.value) { const prefix = props.isBot ? t('bots.edit_title') : t('people.edit_title') @@ -349,7 +365,9 @@ const emitForm = event => { emit(event, { ...form.value, last_name: form.value.last_name || '', - active: form.value.active === 'true' || form.value.active === true + active: form.value.active === 'true' || form.value.active === true, + // Don't store a country for excluded roles (field hidden but value kept). + country: showCountryField.value ? form.value.country : null }) } @@ -379,6 +397,7 @@ const resetForm = () => { active: p.active ? 'true' : 'false', departments: [...(p.departments || [])], studio_id: p.studio_id, + country: p.country || null, expiration_date: p.expiration_date, is_bot: p.is_bot, notifications_enabled: p.notifications_enabled ? 'true' : 'false', @@ -402,6 +421,7 @@ const resetForm = () => { active: 'true', departments: [], studio_id: null, + country: null, expiration_date: null, is_bot: props.isBot, email: props.isBot ? user.value.email : null diff --git a/src/components/pages/Assets.vue b/src/components/pages/Assets.vue index d6eadf54a8..0416d52ca1 100644 --- a/src/components/pages/Assets.vue +++ b/src/components/pages/Assets.vue @@ -30,8 +30,9 @@ /> diff --git a/src/components/pages/People.vue b/src/components/pages/People.vue index 30e40484ee..b15bd79b77 100644 --- a/src/components/pages/People.vue +++ b/src/components/pages/People.vue @@ -232,8 +232,13 @@ export default { optionalCsvColumns: [ 'Phone', 'Role', - 'Contract Type', + 'Departments', 'Studio', + 'Country', + 'Contract Type', + 'Position', + 'Seniority', + 'Daily Salary', 'Active' ], dataMatchers: ['Email'], diff --git a/src/components/pages/Profile.vue b/src/components/pages/Profile.vue index 8a80c1b136..d186b313ce 100644 --- a/src/components/pages/Profile.vue +++ b/src/components/pages/Profile.vue @@ -60,6 +60,12 @@ v-model="form.locale" @update:model-value="localeChanged" /> + @@ -183,7 +189,8 @@ import { useI18n } from 'vue-i18n' import { useHead } from '@unhead/vue' import { useStore } from 'vuex' -import lang from '@/lib/lang' +import { getCountryOptions } from '@/lib/countries' +import lang, { localeCode } from '@/lib/lang' import ChangeAvatarModal from '@/components/modals/ChangeAvatarModal.vue' import Card from '@/components/widgets/Card.vue' @@ -210,6 +217,7 @@ const form = ref({ notifications_discord_userid: '', email: '', phone: '', + country: null, timezone: 'Europe/Paris', locale: 'en_US' }) @@ -262,6 +270,8 @@ const timezoneOptions = computed(() => .map(tz => ({ label: tz, value: tz })) ) +const countryOptions = computed(() => getCountryOptions(localeCode.value)) + // Functions const syncFormFromUser = () => { diff --git a/src/components/pages/TaskType.vue b/src/components/pages/TaskType.vue index b158a8dcea..b815eefc0c 100644 --- a/src/components/pages/TaskType.vue +++ b/src/components/pages/TaskType.vue @@ -16,8 +16,9 @@

{ value: 'showLinkedAssets', when: (props.type === 'asset' || props.type === 'tasktype-asset') && - props.hasLinkedAssets + props.hasLinkedAssets && + !props.isAllEpisodes } ] .filter(opt => opt.when !== false) diff --git a/src/components/widgets/UserCalendar.vue b/src/components/widgets/UserCalendar.vue index e8169ec3e5..aa8ee5bf73 100644 --- a/src/components/widgets/UserCalendar.vue +++ b/src/components/widgets/UserCalendar.vue @@ -72,6 +72,8 @@ import allLocales from '@fullcalendar/core/locales-all' import dayGridPlugin from '@fullcalendar/daygrid' import multiMonthPlugin from '@fullcalendar/multimonth' +import { localeCode } from '@/lib/lang' + import EntityThumbnail from '@/components/widgets/EntityThumbnail.vue' import ProductionName from '@/components/widgets/ProductionName.vue' import Spinner from '@/components/widgets/Spinner.vue' @@ -113,7 +115,7 @@ const calendarOptions = ref({ initialView: 'dayGridMonth', firstDay: 1, locales: allLocales, - locale: 'en' + locale: localeCode.value }) const resetEvents = () => { @@ -231,6 +233,11 @@ watch( resetEvents() } ) + +watch(localeCode, code => { + calendarOptions.value.locale = code + calendarRef.value?.getApi().setOption('locale', code) +})