feat: finally switch protobuf jstype string to number

Signed-off-by: Alexander Trost <galexrt@googlemail.com>
fivenet-app · Jan 24, 2025 · b9f6e47 · b9f6e47
1 parent 8ad1317
commit b9f6e47
Show file tree

Hide file tree

Showing 306 changed files with 10,178 additions and 10,540 deletions.
diff --git a/app/components/FiveNetHints.vue b/app/components/FiveNetHints.vue
@@ -1,23 +1,23 @@
 <script lang="ts" setup>
 import type { RoutesNamedLocations } from '@typed-router';
 
-type Hint = { id: string; keyboard?: boolean; to?: RoutesNamedLocations };
+type Hint = { key: string; keyboard?: boolean; to?: RoutesNamedLocations };
 
 const hints = shuffle([
     {
-        id: 'commandpalette',
+        key: 'commandpalette',
         keyboard: true,
     },
     {
-        id: 'startpage',
+        key: 'startpage',
         to: { name: 'settings' },
     },
     {
-        id: 'documenteditor',
+        key: 'documenteditor',
         to: { name: 'settings' },
     },
     {
-        id: 'sociallogin_discord',
+        key: 'sociallogin_discord',
         to: { name: 'auth-account-info', query: { tab: 'oauth2Connections' }, hash: '#' },
     },
 ] as Hint[]);

diff --git a/app/components/calendar/CalendarCreateOrUpdateModal.vue b/app/components/calendar/CalendarCreateOrUpdateModal.vue
@@ -14,7 +14,7 @@ import AccessManager from '../partials/access/AccessManager.vue';
 import { enumToAccessLevelEnums } from '../partials/access/helpers';
 
 const props = defineProps<{
-    calendarId?: string;
+    calendarId?: number;
 }>();
 
 const { isOpen } = useModal();
@@ -77,7 +77,7 @@ const {
 async function createOrUpdateCalendar(values: Schema): Promise<CreateOrUpdateCalendarResponse> {
     try {
         const response = await calendarStore.createOrUpdateCalendar({
-            id: data.value?.calendar?.id ?? '0',
+            id: data.value?.calendar?.id ?? 0,
             name: values.name,
             job: values.private ? undefined : activeChar.value?.job,
             public: values.public,
@@ -203,7 +203,7 @@ const onSubmitThrottle = useThrottleFn(async (event: FormSubmitEvent<Schema>) =>
                         <UFormGroup name="access" :label="$t('common.access')" class="flex-1">
                             <AccessManager
                                 v-model:jobs="state.access.jobs"
-                                :target-id="calendarId ?? '0'"
+                                :target-id="calendarId ?? 0"
                                 :access-roles="enumToAccessLevelEnums(AccessLevel, 'enums.calendar.AccessLevel')"
                             />
                         </UFormGroup>

diff --git a/app/components/calendar/CalendarViewSlideover.vue b/app/components/calendar/CalendarViewSlideover.vue
@@ -12,7 +12,7 @@ import CalendarCreateOrUpdateModal from './CalendarCreateOrUpdateModal.vue';
 import { checkCalendarAccess } from './helpers';
 
 const props = defineProps<{
-    calendarId: string;
+    calendarId: number;
 }>();
 
 const { can } = useAuth();

diff --git a/app/components/calendar/FindCalendarsModal.vue b/app/components/calendar/FindCalendarsModal.vue
@@ -29,7 +29,7 @@ async function listCalendars(): Promise<ListCalendarsResponse> {
     return response;
 }
 
-async function subscribeToCalendar(calendarId: string, subscribe: boolean): Promise<SubscribeToCalendarResponse> {
+async function subscribeToCalendar(calendarId: number, subscribe: boolean): Promise<SubscribeToCalendarResponse> {
     const call = getGRPCCalendarClient().subscribeToCalendar({
         delete: !subscribe,
         sub: {

diff --git a/app/components/calendar/entry/EntryCreateOrUpdateModal.vue b/app/components/calendar/entry/EntryCreateOrUpdateModal.vue
@@ -16,8 +16,8 @@ import type { UserShort } from '~~/gen/ts/resources/users/users';
 import type { CreateOrUpdateCalendarEntryResponse } from '~~/gen/ts/services/calendar/calendar';
 
 const props = defineProps<{
-    calendarId?: string;
-    entryId?: string;
+    calendarId?: number;
+    entryId?: number;
 }>();
 
 const { isOpen } = useModal();
@@ -69,7 +69,7 @@ async function createOrUpdateCalendarEntry(values: Schema): Promise<CreateOrUpda
     try {
         const response = await calendarStore.createOrUpdateCalendarEntry(
             {
-                id: data.value?.entry?.id ?? '0',
+                id: data.value?.entry?.id ?? 0,
                 calendarId: values.calendar.id,
                 title: values.title,
                 startTime: toTimestamp(values.startTime),

diff --git a/app/components/calendar/entry/EntryRSVPList.vue b/app/components/calendar/entry/EntryRSVPList.vue
@@ -14,7 +14,7 @@ import EntryShareForm from './EntryShareForm.vue';
 const props = withDefaults(
     defineProps<{
         modelValue: CalendarEntryRSVP | undefined;
-        entryId: string;
+        entryId: number;
         rsvpOpen?: boolean;
         disabled?: boolean;
         showRemove?: boolean;

diff --git a/app/components/calendar/entry/EntryShareForm.vue b/app/components/calendar/entry/EntryShareForm.vue
@@ -8,7 +8,7 @@ import type { UserShort } from '~~/gen/ts/resources/users/users';
 import type { ShareCalendarEntryResponse } from '~~/gen/ts/services/calendar/calendar';
 
 const props = defineProps<{
-    entryId: string;
+    entryId: number;
 }>();
 
 const emit = defineEmits<{

diff --git a/app/components/calendar/entry/EntryViewSlideover.vue b/app/components/calendar/entry/EntryViewSlideover.vue
@@ -18,7 +18,7 @@ import { NotificationType } from '~~/gen/ts/resources/notifications/notification
 import EntryRSVPList from './EntryRSVPList.vue';
 
 const props = defineProps<{
-    entryId: string;
+    entryId: number;
 }>();
 
 const modal = useModal();

diff --git a/app/components/centrum/MarkersList.vue b/app/components/centrum/MarkersList.vue
@@ -13,7 +13,7 @@ const livemapStore = useLivemapStore();
 const { deleteMarkerMarker, goto } = livemapStore;
 const { markersMarkers } = storeToRefs(livemapStore);
 
-async function deleteMarker(id: string): Promise<void> {
+async function deleteMarker(id: number): Promise<void> {
     try {
         const call = getGRPCLivemapperClient().deleteMarker({
             id,

diff --git a/app/components/centrum/dispatches/DispatchAssignModal.vue b/app/components/centrum/dispatches/DispatchAssignModal.vue
@@ -11,15 +11,15 @@ const centrumStore = useCentrumStore();
 const { dispatches, getSortedUnits } = storeToRefs(centrumStore);
 
 const props = defineProps<{
-    dispatchId: string;
+    dispatchId: number;
 }>();
 
 const dispatch = computed(() => dispatches.value.get(props.dispatchId));
 
 const { isOpen } = useModal();
 
 const schema = z.object({
-    units: z.custom<string>().array().max(10),
+    units: z.custom<number>().array().max(10),
 });
 
 type Schema = z.output<typeof schema>;
@@ -34,8 +34,8 @@ async function assignDispatch(): Promise<void> {
     }
 
     try {
-        const toAdd: string[] = [];
-        const toRemove: string[] = [];
+        const toAdd: number[] = [];
+        const toRemove: number[] = [];
         state.units.forEach((u) => {
             toAdd.push(u);
         });

diff --git a/app/components/centrum/dispatches/DispatchCreateOrUpdateSlideover.vue b/app/components/centrum/dispatches/DispatchCreateOrUpdateSlideover.vue
@@ -36,7 +36,7 @@ async function createDispatch(values: Schema): Promise<void> {
     try {
         const call = getGRPCCentrumClient().createDispatch({
             dispatch: {
-                id: '0',
+                id: 0,
                 job: '',
                 message: values.message,
                 description: values.description,

diff --git a/app/components/centrum/dispatches/DispatchDetailsByIDSlideover.vue b/app/components/centrum/dispatches/DispatchDetailsByIDSlideover.vue
@@ -4,7 +4,7 @@ import { useCentrumStore } from '~/store/centrum';
 import type { GetDispatchResponse } from '~~/gen/ts/services/centrum/centrum';
 
 const props = defineProps<{
-    dispatchId: string;
+    dispatchId: number;
 }>();
 
 const centrumStore = useCentrumStore();
@@ -14,7 +14,7 @@ const { isOpen } = useSlideover();
 
 const { data, refresh } = useLazyAsyncData(`centrum-dispatch-${props.dispatchId}`, () => getDispatch(props.dispatchId));
 
-async function getDispatch(id: string): Promise<GetDispatchResponse> {
+async function getDispatch(id: number): Promise<GetDispatchResponse> {
     if (dispatches.value.has(id)) {
         return {
             dispatch: dispatches.value.get(id),

diff --git a/app/components/centrum/dispatches/DispatchDetailsSlideover.vue b/app/components/centrum/dispatches/DispatchDetailsSlideover.vue
@@ -18,7 +18,7 @@ import { StatusDispatch, TakeDispatchResp } from '~~/gen/ts/resources/centrum/di
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 
 const props = defineProps<{
-    dispatchId: string;
+    dispatchId: number;
     dispatch?: Dispatch;
 }>();
 
@@ -38,7 +38,7 @@ const notifications = useNotificatorStore();
 
 const dispatch = computed(() => (props.dispatch ? props.dispatch : dispatches.value.get(props.dispatchId)));
 
-async function selfAssign(id: string): Promise<void> {
+async function selfAssign(id: number): Promise<void> {
     if (ownUnitId.value === undefined) {
         notifications.add({
             title: { key: 'notifications.centrum.unitUpdated.not_in_unit.title' },
@@ -61,7 +61,7 @@ async function selfAssign(id: string): Promise<void> {
     }
 }
 
-async function deleteDispatch(id: string): Promise<void> {
+async function deleteDispatch(id: number): Promise<void> {
     try {
         const call = getGRPCCentrumClient().deleteDispatch({ id });
         await call;

diff --git a/app/components/centrum/dispatches/DispatchFeed.vue b/app/components/centrum/dispatches/DispatchFeed.vue
@@ -3,12 +3,12 @@ import DispatchFeedItem from '~/components/centrum/dispatches/DispatchFeedItem.v
 import type { ListDispatchActivityResponse } from '~~/gen/ts/services/centrum/centrum';
 
 const props = defineProps<{
-    dispatchId?: string;
+    dispatchId?: number;
 }>();
 
 const offset = ref(0);
 
-const { data, refresh } = useLazyAsyncData(`centrum-dispatch-${props.dispatchId ?? '0'}-activity-${offset.value}`, () =>
+const { data, refresh } = useLazyAsyncData(`centrum-dispatch-${props.dispatchId ?? 0}-activity-${offset.value}`, () =>
     listDispatchActivity(),
 );
 
@@ -18,7 +18,7 @@ async function listDispatchActivity(): Promise<ListDispatchActivityResponse> {
             pagination: {
                 offset: offset.value,
             },
-            id: props.dispatchId ?? '0',
+            id: props.dispatchId ?? 0,
         });
         const { response } = await call;
 

diff --git a/app/components/centrum/dispatches/DispatchStatusUpdateModal.vue b/app/components/centrum/dispatches/DispatchStatusUpdateModal.vue
@@ -9,7 +9,7 @@ import { StatusDispatch } from '~~/gen/ts/resources/centrum/dispatches';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 
 const props = defineProps<{
-    dispatchId: string;
+    dispatchId: number;
     status?: StatusDispatch;
 }>();
 
@@ -32,7 +32,7 @@ const state = reactive<Schema>({
     status: props.status ?? StatusDispatch.NEW,
 });
 
-async function updateDispatchStatus(dispatchId: string, values: Schema): Promise<void> {
+async function updateDispatchStatus(dispatchId: number, values: Schema): Promise<void> {
     try {
         const call = getGRPCCentrumClient().updateDispatchStatus({
             dispatchId,

diff --git a/app/components/centrum/livemap/CentrumSidebar.vue b/app/components/centrum/livemap/CentrumSidebar.vue
@@ -48,9 +48,9 @@ const { livemap } = storeToRefs(settingsStore);
 
 const canStream = can('CentrumService.Stream');
 
-const selectedDispatch = ref<string | undefined>();
+const selectedDispatch = ref<number | undefined>();
 
-async function updateDispatchStatus(dispatchId: string, status: StatusDispatch): Promise<void> {
+async function updateDispatchStatus(dispatchId: number, status: StatusDispatch): Promise<void> {
     try {
         const call = getGRPCCentrumClient().updateDispatchStatus({ dispatchId, status });
         await call;
@@ -66,7 +66,7 @@ async function updateDispatchStatus(dispatchId: string, status: StatusDispatch):
     }
 }
 
-async function updateDspStatus(dispatchId?: string, status?: StatusDispatch): Promise<void> {
+async function updateDspStatus(dispatchId?: number, status?: StatusDispatch): Promise<void> {
     if (!dispatchId) {
         notifications.add({
             title: { key: 'notifications.centrum.sidebar.no_dispatch_selected.title', parameters: {} },
@@ -87,7 +87,7 @@ async function updateDspStatus(dispatchId?: string, status?: StatusDispatch): Pr
     await updateDispatchStatus(dispatchId, status);
 }
 
-async function updateUnitStatus(id: string, status: StatusUnit): Promise<void> {
+async function updateUnitStatus(id: number, status: StatusUnit): Promise<void> {
     try {
         const call = getGRPCCentrumClient().updateUnitStatus({
             unitId: id,
@@ -106,7 +106,7 @@ async function updateUnitStatus(id: string, status: StatusUnit): Promise<void> {
     }
 }
 
-async function updateUtStatus(id: string, status?: StatusUnit): Promise<void> {
+async function updateUtStatus(id: number, status?: StatusUnit): Promise<void> {
     if (status === undefined) {
         if (!getOwnUnit.value) {
             return;
@@ -175,13 +175,13 @@ watch(open, async () => {
 });
 
 const canSubmitUnitStatus = ref(true);
-const onSubmitUnitStatusThrottle = useThrottleFn(async (unitId: string, status?: StatusUnit) => {
+const onSubmitUnitStatusThrottle = useThrottleFn(async (unitId: number, status?: StatusUnit) => {
     canSubmitUnitStatus.value = false;
     await updateUtStatus(unitId, status).finally(() => useTimeoutFn(() => (canSubmitUnitStatus.value = true), 300));
 }, 1000);
 
 const canSubmitDispatchStatus = ref(true);
-const onSubmitDispatchStatusThrottle = useThrottleFn(async (dispatchId?: string, status?: StatusDispatch) => {
+const onSubmitDispatchStatusThrottle = useThrottleFn(async (dispatchId?: number, status?: StatusDispatch) => {
     canSubmitDispatchStatus.value = false;
     await updateDspStatus(dispatchId, status).finally(() => useTimeoutFn(() => (canSubmitDispatchStatus.value = true), 300));
 }, 1000);

diff --git a/app/components/centrum/livemap/DispatchMarker.vue b/app/components/centrum/livemap/DispatchMarker.vue
@@ -55,7 +55,12 @@ const zIndexOffset = computed(() => {
 </script>
 
 <template>
-    <LMarker :key="dispatch.id" :lat-lng="[dispatch.y, dispatch.x]" :name="dispatch.id" :z-index-offset="zIndexOffset">
+    <LMarker
+        :key="dispatch.id"
+        :lat-lng="[dispatch.y, dispatch.x]"
+        :name="dispatch.id.toString()"
+        :z-index-offset="zIndexOffset"
+    >
         <LIcon :icon-anchor="iconAnchor" :popup-anchor="popupAnchor" :icon-size="[size, size]">
             <div class="flex flex-col items-center uppercase">
                 <span

diff --git a/app/components/centrum/livemap/DispatchesLayer.vue b/app/components/centrum/livemap/DispatchesLayer.vue
@@ -24,7 +24,7 @@ const dispatchesFiltered = computedAsync(async () =>
     [...(dispatches.value.values() ?? [])].filter(
         (m) =>
             !ownDispatches.value.includes(m.id) &&
-            (m.id.startsWith(dispatchQuery.value) ||
+            (m.id.toString().startsWith(dispatchQuery.value) ||
                 m.message.toLowerCase().includes(dispatchQuery.value) ||
                 (m.creator?.firstname + ' ' + m.creator?.lastname).toLowerCase().includes(dispatchQuery.value)),
     ),

diff --git a/app/components/centrum/livemap/JoinUnitSlideover.vue b/app/components/centrum/livemap/JoinUnitSlideover.vue
@@ -14,10 +14,10 @@ const { isOpen } = useSlideover();
 const centrumStore = useCentrumStore();
 const { ownUnitId, getSortedUnits } = storeToRefs(centrumStore);
 
-async function joinOrLeaveUnit(unitId?: string): Promise<void> {
+async function joinOrLeaveUnit(unitId?: number): Promise<void> {
     try {
         const call = getGRPCCentrumClient().joinUnit({
-            unitId,
+            unitId: unitId,
         });
         const { response } = await call;
 
@@ -35,7 +35,7 @@ async function joinOrLeaveUnit(unitId?: string): Promise<void> {
 }
 
 const canSubmit = ref(true);
-const onSubmitThrottle = useThrottleFn(async (unitID?: string) => {
+const onSubmitThrottle = useThrottleFn(async (unitID?: number) => {
     canSubmit.value = false;
     await joinOrLeaveUnit(unitID).finally(() => useTimeoutFn(() => (canSubmit.value = true), 400));
 }, 1000);

diff --git a/app/components/centrum/livemap/OwnDispatchEntry.vue b/app/components/centrum/livemap/OwnDispatchEntry.vue
@@ -9,11 +9,11 @@ import { StatusDispatch } from '~~/gen/ts/resources/centrum/dispatches';
 
 const props = defineProps<{
     dispatch: Dispatch;
-    selectedDispatch: string | undefined;
+    selectedDispatch: number | undefined;
 }>();
 
 defineEmits<{
-    (e: 'update:selectedDispatch', dsp: string | undefined): void;
+    (e: 'update:selectedDispatch', dsp: number | undefined): void;
 }>();
 
 const centrumStore = useCentrumStore();

diff --git a/app/components/centrum/livemap/TakeDispatchSlideover.vue b/app/components/centrum/livemap/TakeDispatchSlideover.vue
@@ -12,7 +12,7 @@ const { isOpen } = useSlideover();
 const centrumStore = useCentrumStore();
 const { dispatches, pendingDispatches, getCurrentMode } = storeToRefs(centrumStore);
 
-const selectedDispatches = ref<string[]>([]);
+const selectedDispatches = ref<number[]>([]);
 const queryDispatches = ref('');
 
 async function takeDispatches(resp: TakeDispatchResp): Promise<void> {
@@ -51,7 +51,7 @@ async function takeDispatches(resp: TakeDispatchResp): Promise<void> {
     }
 }
 
-function selectDispatch(id: string, state: boolean): void {
+function selectDispatch(id: number, state: boolean): void {
     const idx = selectedDispatches.value.findIndex((did) => did === id);
     if (idx > -1 && !state) {
         selectedDispatches.value.splice(idx, 1);
@@ -69,7 +69,7 @@ const canTakeDispatch = computed(
 const filteredDispatches = computedAsync(async () => {
     const filtered: Dispatch[] = [];
     dispatches.value.forEach((d) => {
-        if (d.id.includes(queryDispatches.value) || d.message.includes(queryDispatches.value)) {
+        if (d.id.toString().includes(queryDispatches.value) || d.message.includes(queryDispatches.value)) {
             if (d.status === undefined || d.status.status < StatusDispatch.COMPLETED) filtered.push(d);
         }
     });