From 6dc9dbb9a40aaa13176115df51348b29aebf0615 Mon Sep 17 00:00:00 2001
From: Alexander Ackermann <abackermann91@gmail.com>
Date: Fri, 17 Jul 2026 05:21:47 +0200
Subject: [PATCH 1/2] chore: remove activities app

# Conflicts:
#	packages/web-app-activities/l10n/translations.json
#	packages/web-app-admin-settings/src/index.ts
#	pnpm-lock.yaml

# Conflicts:
#	packages/web-app-activities/l10n/translations.json
---
 dev/docker/opencloud.web.config.json          |   1 -
 packages/web-app-activities/l10n/.tx/config   |  10 --
 packages/web-app-activities/package.json      |  20 ---
 .../src/LayoutContainer.vue                   |  13 --
 packages/web-app-activities/src/appid.ts      |   1 -
 .../src/components/ActivityItem.vue           |  90 --------------
 packages/web-app-activities/src/index.ts      |  77 ------------
 .../src/views/ActivityList.vue                |  66 ----------
 packages/web-app-activities/src/views/App.vue | 117 ------------------
 9 files changed, 395 deletions(-)
 delete mode 100644 packages/web-app-activities/l10n/.tx/config
 delete mode 100644 packages/web-app-activities/package.json
 delete mode 100644 packages/web-app-activities/src/LayoutContainer.vue
 delete mode 100644 packages/web-app-activities/src/appid.ts
 delete mode 100644 packages/web-app-activities/src/components/ActivityItem.vue
 delete mode 100644 packages/web-app-activities/src/index.ts
 delete mode 100644 packages/web-app-activities/src/views/ActivityList.vue
 delete mode 100644 packages/web-app-activities/src/views/App.vue

diff --git a/dev/docker/opencloud.web.config.json b/dev/docker/opencloud.web.config.json
index a83f88cf5b1..a8c1ba657a0 100644
--- a/dev/docker/opencloud.web.config.json
+++ b/dev/docker/opencloud.web.config.json
@@ -15,7 +15,6 @@
     "webfinger",
     "epub-reader",
     "app-store",
-    "activities",
     "preview",
     "mail",
     "contacts",
diff --git a/packages/web-app-activities/l10n/.tx/config b/packages/web-app-activities/l10n/.tx/config
deleted file mode 100644
index 5d768992bd7..00000000000
--- a/packages/web-app-activities/l10n/.tx/config
+++ /dev/null
@@ -1,10 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[o:opencloud-eu:p:opencloud-eu:r:web-activities]
-file_filter = locale/<lang>/app.po
-minimum_perc = 0
-resource_name = web-activities
-source_file = template.pot
-source_lang = en
-type = PO
diff --git a/packages/web-app-activities/package.json b/packages/web-app-activities/package.json
deleted file mode 100644
index d652aa4c722..00000000000
--- a/packages/web-app-activities/package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "web-app-activities",
-  "version": "0.0.0",
-  "private": true,
-  "description": "Opencloud activities app",
-  "license": "AGPL-3.0",
-  "devDependencies": {
-    "@opencloud-eu/web-test-helpers": "workspace:*"
-  },
-  "peerDependencies": {
-    "@opencloud-eu/design-system": "workspace:^",
-    "@opencloud-eu/web-client": "workspace:*",
-    "@opencloud-eu/web-pkg": "workspace:*",
-    "pinia": "^3.0.0 || ^4.0.0",
-    "luxon": "^3.7.2",
-    "vue-concurrency": "^5.0.1",
-    "vue-router": "^5.0.0",
-    "vue3-gettext": "^4.0.0-beta.1"
-  }
-}
diff --git a/packages/web-app-activities/src/LayoutContainer.vue b/packages/web-app-activities/src/LayoutContainer.vue
deleted file mode 100644
index 41db783345d..00000000000
--- a/packages/web-app-activities/src/LayoutContainer.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  <main id="activities" class="p-4 overflow-auto">
-    <router-view />
-  </main>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue'
-
-export default defineComponent({
-  name: 'LayoutContainer'
-})
-</script>
diff --git a/packages/web-app-activities/src/appid.ts b/packages/web-app-activities/src/appid.ts
deleted file mode 100644
index f6dd373072f..00000000000
--- a/packages/web-app-activities/src/appid.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const APPID = 'activities'
diff --git a/packages/web-app-activities/src/components/ActivityItem.vue b/packages/web-app-activities/src/components/ActivityItem.vue
deleted file mode 100644
index 4bfc92e0aa5..00000000000
--- a/packages/web-app-activities/src/components/ActivityItem.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <div class="flex items-center activity-item [&>*]:flex-1">
-    <div class="flex items-center text-left">
-      <oc-avatar :width="36" :user-name="activity.template.variables?.user?.displayName" />
-      <span class="ml-2" v-text="activity.template.variables?.user?.displayName" />
-    </div>
-    <div class="text-left">activity unknown</div>
-    <div class="truncate text-left">
-      <resource-list-item v-if="resource" :resource="resource" :is-resource-clickable="false" />
-      <div
-        v-if="resourceNotAccessible"
-        v-oc-tooltip="$gettext('The resource is unavailable, it may have been deleted.')"
-        class="text-role-on-surface-variant flex items-center p-1"
-      >
-        <oc-icon name="eye-off" />
-        <span class="ml-2" v-text="activity.template.variables?.resource?.name" />
-      </div>
-    </div>
-    <div class="text-right"><span v-text="recordedDateTime" /></div>
-  </div>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, onMounted, PropType, ref, unref } from 'vue'
-import { Activity as GraphActivity, User } from '@opencloud-eu/web-client/graph/generated'
-import { DateTime } from 'luxon'
-import {
-  formatDateFromDateTime,
-  formatRelativeDateFromDateTime,
-  ResourceListItem,
-  useClientService
-} from '@opencloud-eu/web-pkg'
-import { useGettext } from 'vue3-gettext'
-import { Resource, SpaceResource } from '@opencloud-eu/web-client'
-
-//FIXME: Use original type Activity from web-client when it's containing the variables field
-type Activity = GraphActivity & {
-  template: {
-    variables?: {
-      space?: SpaceResource
-      resource?: Resource
-      user?: User
-    }
-  }
-}
-export default defineComponent({
-  name: 'ActivityList',
-  components: { ResourceListItem },
-  props: {
-    activity: {
-      type: Object as PropType<Activity>,
-      required: true
-    }
-  },
-  setup(props) {
-    const clientService = useClientService()
-    const { current: currentLanguage } = useGettext()
-    const resource = ref<Resource>()
-    const resourceNotAccessible = ref(false)
-
-    const recordedDateTime = computed(() => {
-      const dateTime = DateTime.fromISO(props.activity.times.recordedTime)
-
-      const isWithinLastHour = dateTime > DateTime.now().minus({ hour: 1 })
-      if (isWithinLastHour) {
-        return formatRelativeDateFromDateTime(dateTime, currentLanguage)
-      }
-
-      return formatDateFromDateTime(dateTime, currentLanguage)
-    })
-
-    onMounted(async () => {
-      try {
-        resource.value = await clientService.webdav.getFileInfo(
-          unref(props.activity.template.variables?.space),
-          { fileId: props.activity.template.variables?.resource?.id }
-        )
-      } catch {
-        resourceNotAccessible.value = true
-      }
-    })
-
-    return {
-      recordedDateTime,
-      resource,
-      resourceNotAccessible
-    }
-  }
-})
-</script>
diff --git a/packages/web-app-activities/src/index.ts b/packages/web-app-activities/src/index.ts
deleted file mode 100644
index 735338aae7b..00000000000
--- a/packages/web-app-activities/src/index.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import translations from '../l10n/translations.json'
-import { useGettext } from 'vue3-gettext'
-import { computed, unref } from 'vue'
-import {
-  AppMenuItemExtension,
-  defineWebApplication,
-  Extension,
-  useUserStore
-} from '@opencloud-eu/web-pkg'
-import { urlJoin } from '@opencloud-eu/web-client'
-import { RouteRecordRaw } from 'vue-router'
-import { APPID } from './appid'
-import { storeToRefs } from 'pinia'
-
-export default defineWebApplication({
-  setup() {
-    const { $gettext } = useGettext()
-    const userStore = useUserStore()
-    const { user } = storeToRefs(userStore)
-
-    const appInfo = {
-      name: $gettext('Activities'),
-      id: APPID,
-      icon: 'pulse',
-      color: '#887ef1'
-    }
-
-    const routes: RouteRecordRaw[] = [
-      {
-        path: '/',
-        name: 'root',
-        component: () => import('./LayoutContainer.vue'),
-        redirect: urlJoin(appInfo.id, 'list'),
-        meta: {
-          authContext: 'user'
-        },
-        children: [
-          {
-            path: 'list',
-            name: 'list',
-            component: () => import('./views/App.vue'),
-            meta: {
-              authContext: 'user',
-              title: $gettext('Activities')
-            }
-          }
-        ]
-      }
-    ]
-
-    const menuItemExtension: AppMenuItemExtension = {
-      id: `app.${appInfo.id}.menuItem`,
-      type: 'appMenuItem',
-      label: () => appInfo.name,
-      color: appInfo.color,
-      icon: appInfo.icon,
-      priority: 30,
-      path: urlJoin(appInfo.id)
-    }
-    const extensions = computed(() => {
-      const result: Extension[] = []
-
-      if (unref(user)) {
-        result.push(menuItemExtension)
-      }
-
-      return result
-    })
-
-    return {
-      appInfo,
-      routes,
-      translations,
-      extensions
-    }
-  }
-})
diff --git a/packages/web-app-activities/src/views/ActivityList.vue b/packages/web-app-activities/src/views/ActivityList.vue
deleted file mode 100644
index 055a74b67cf..00000000000
--- a/packages/web-app-activities/src/views/ActivityList.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <oc-list class="activity-list max-w-5xl">
-    <li v-for="(activityItems, date) in activitiesDateCategorized" :key="date" class="mb-6">
-      <h2
-        class="font-semibold text-role-on-surface-variant activity-list-date text-base capitalize"
-        v-text="getDateHeadline(date)"
-      />
-      <oc-list class="ml-2 mt-2 timeline">
-        <li v-for="activityItem in activityItems" :key="activityItem.id">
-          <ActivityItem :activity="activityItem" />
-        </li>
-      </oc-list>
-    </li>
-  </oc-list>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, PropType } from 'vue'
-import { Activity } from '@opencloud-eu/web-client/graph/generated'
-import { DateTime } from 'luxon'
-import ActivityItem from '../components/ActivityItem.vue'
-import { formatDateFromDateTime } from '@opencloud-eu/web-pkg'
-import { useGettext } from 'vue3-gettext'
-
-type DateActivityCollection = Record<string, Activity[]>
-export default defineComponent({
-  name: 'ActivityList',
-  components: { ActivityItem },
-  props: {
-    activities: {
-      type: Array as PropType<Activity[]>,
-      required: true
-    }
-  },
-  setup(props) {
-    const { current: currentLanguage } = useGettext()
-
-    const activitiesDateCategorized = computed<DateActivityCollection>(() => {
-      return props.activities.reduce((acc: DateActivityCollection, activity) => {
-        const date = DateTime.fromISO(activity.times.recordedTime).toISODate()
-
-        if (!acc[date]) {
-          acc[date] = []
-        }
-        acc[date].push(activity)
-
-        return acc
-      }, {} as DateActivityCollection)
-    })
-    const getDateHeadline = (dateISO: string) => {
-      const dateTime = DateTime.fromISO(dateISO)
-
-      if (
-        dateTime.hasSame(DateTime.now(), 'day') ||
-        dateTime.hasSame(DateTime.now().minus({ day: 1 }), 'day')
-      ) {
-        return dateTime.toRelativeCalendar({ locale: currentLanguage })
-      }
-
-      return formatDateFromDateTime(dateTime, currentLanguage, DateTime.DATE_MED_WITH_WEEKDAY)
-    }
-
-    return { activitiesDateCategorized, getDateHeadline }
-  }
-})
-</script>
diff --git a/packages/web-app-activities/src/views/App.vue b/packages/web-app-activities/src/views/App.vue
deleted file mode 100644
index 166e28371c9..00000000000
--- a/packages/web-app-activities/src/views/App.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-  <h1 class="text-lg" v-text="$gettext('Activities')" />
-  <div class="w-full mb-4">
-    <item-filter
-      ref="mediaTypeFilter"
-      :allow-multiple="false"
-      :filter-label="$gettext('Location')"
-      :filterable-attributes="['name']"
-      :option-filter-label="$gettext('Filter location')"
-      :show-option-filter="true"
-      :items="filterableSpaces"
-      :close-on-click="true"
-      class="mr-2"
-      display-name-attribute="name"
-      filter-name="location"
-    >
-      <template #image="{ item }">
-        <oc-icon :name="getLocationFilterIcon(item)" />
-      </template>
-      <template #item="{ item }">
-        <div v-text="item.name" />
-      </template>
-    </item-filter>
-  </div>
-  <app-loading-spinner v-if="isLoading" />
-  <template v-else>
-    <no-content-message v-if="!activities.length" icon="pulse">
-      <template #message>
-        <span v-text="$gettext('No activities found')" />
-      </template>
-    </no-content-message>
-    <ActivityList v-else :activities="activities" />
-  </template>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, onMounted, ref, unref, watch } from 'vue'
-import {
-  AppLoadingSpinner,
-  ItemFilter,
-  NoContentMessage,
-  useClientService,
-  useRouteQuery,
-  useSpacesStore
-} from '@opencloud-eu/web-pkg'
-import { storeToRefs } from 'pinia'
-import {
-  call,
-  isPersonalSpaceResource,
-  isProjectSpaceResource,
-  SpaceResource
-} from '@opencloud-eu/web-client'
-import { useTask } from 'vue-concurrency'
-import { Activity } from '@opencloud-eu/web-client/graph/generated'
-import ActivityList from './ActivityList.vue'
-
-export default defineComponent({
-  name: 'App',
-  components: { ActivityList, NoContentMessage, ItemFilter, AppLoadingSpinner },
-  setup() {
-    const spacesStore = useSpacesStore()
-    const { spaces } = storeToRefs(spacesStore)
-    const clientService = useClientService()
-    const activities = ref<Activity[]>([])
-
-    const locationQuery = useRouteQuery('q_location')
-
-    const filterableSpaces = computed(() => {
-      return [...unref(spaces)]
-        .filter(
-          (space) =>
-            !space.disabled && (isProjectSpaceResource(space) || isPersonalSpaceResource(space))
-        )
-        .sort((a, b) => {
-          if (isPersonalSpaceResource(a) === isPersonalSpaceResource(b)) {
-            return a.name.localeCompare(b.name)
-          }
-          return isPersonalSpaceResource(a) ? -1 : 1
-        })
-    })
-
-    const loadActivitiesTask = useTask(function* (signal) {
-      const filters = ['sort:desc', 'limit:100']
-
-      if (unref(locationQuery)) {
-        filters.push(`itemid:${unref(locationQuery)}`)
-      }
-
-      activities.value = yield* call(
-        clientService.graphAuthenticated.activities.listActivities(filters.join(' AND '), {
-          signal
-        })
-      )
-    })
-
-    const isLoading = computed(() => loadActivitiesTask.isRunning || !loadActivitiesTask.last)
-
-    const getLocationFilterIcon = (space: SpaceResource) => {
-      if (isPersonalSpaceResource(space)) {
-        return 'folder'
-      }
-
-      return 'layout-grid'
-    }
-
-    onMounted(() => {
-      loadActivitiesTask.perform()
-    })
-
-    watch(locationQuery, () => {
-      loadActivitiesTask.perform()
-    })
-
-    return { activities, filterableSpaces, getLocationFilterIcon, isLoading }
-  }
-})
-</script>

From fa0d9f39f878032d26c1f326a805f8325b2d868d Mon Sep 17 00:00:00 2001
From: Alexander Ackermann <abackermann91@gmail.com>
Date: Fri, 17 Jul 2026 10:47:51 +0200
Subject: [PATCH 2/2] resolve conflicts

---
 .../web-app-activities/l10n/translations.json |  1 -
 pnpm-lock.yaml                                | 31 -------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 packages/web-app-activities/l10n/translations.json

diff --git a/packages/web-app-activities/l10n/translations.json b/packages/web-app-activities/l10n/translations.json
deleted file mode 100644
index 634a43bd64c..00000000000
--- a/packages/web-app-activities/l10n/translations.json
+++ /dev/null
@@ -1 +0,0 @@
-{"af":{},"bg":{},"ar":{"The resource is unavailable, it may have been deleted.":"المورد غير متوفر، ربما تم حذفه.","Activities":"أنشطة","Location":"موقع","Filter location":"تصفية الموقع","No activities found":"لم يتم العثور على أي أنشطة"},"bs":{},"cs":{"Activities":"Aktivity","Location":"Umístění"},"de":{"The resource is unavailable, it may have been deleted.":"Die Ressource ist nicht mehr verfügbar. Sie wurde möglicherweise gelöscht.","Activities":"Aktivitäten","Location":"Ort","Filter location":"Ort filtern","No activities found":"Keine Aktivitäten gefunden"},"es":{"The resource is unavailable, it may have been deleted.":"Este recurso es inaccesible, puede haber sido eliminado.","Activities":"Actividades","Location":"Ubicación","Filter location":"Filtro ubicación","No activities found":"No se han encontrado actividades"},"el":{"The resource is unavailable, it may have been deleted.":"Ο πόρος δεν είναι διαθέσιμος, ενδέχεται να έχει διαγραφεί.","Activities":"Δραστηριότητες","Location":"Τοποθεσία","Filter location":"Φιλτράρισμα τοποθεσίας","No activities found":"Δεν βρέθηκαν δραστηριότητες"},"et":{},"he":{"The resource is unavailable, it may have been deleted.":"המשאב אינו זמין, ייתכן שהוא נמחק.","Activities":"פעילויות","Location":"מיקום","Filter location":"מסנן מיקום","No activities found":"לא נמצאה פעילות"},"fr":{"The resource is unavailable, it may have been deleted.":"La ressource n'est pas disponible, elle a peut-être été supprimée.","Activities":"Activités","Location":"Emplacement","Filter location":"Emplacement du filtre","No activities found":"Aucune activité trouvée"},"gl":{},"hr":{},"id":{},"ja":{"The resource is unavailable, it may have been deleted.":"リソースを利用できません。削除された可能性があります","Activities":"アクティビティ","Location":"場所","Filter location":"場所でフィルター","No activities found":"アクティビティが見つかりませんでした"},"it":{"The resource is unavailable, it may have been deleted.":"La risorsa non è disponibile, potrebbe essere stata eliminata.","Activities":"Attività","Location":"Posizione","Filter location":"Filtra posizione","No activities found":"Nessuna attività trovata"},"nl":{"The resource is unavailable, it may have been deleted.":"De hulpbron is onbeschikbaar. Mogelijk is deze verwijderd.","Activities":"Activiteiten","Location":"Locatie","Filter location":"Locatie filteren","No activities found":"Geen activiteiten gevonden"},"pt":{"The resource is unavailable, it may have been deleted.":"O recurso não está disponível, podendo ter sido eliminado.","Activities":"Atividades","Location":"Localização","Filter location":"Filtrar localização","No activities found":"Nenhuma atividade encontrada"},"pl":{"The resource is unavailable, it may have been deleted.":"Zasób jest niedostępny. Być może został usunięty.","Activities":"Aktywności","Location":"Położenie","Filter location":"Filtruj położenie","No activities found":"Nie znaleziono aktywności"},"ka":{},"ko":{"The resource is unavailable, it may have been deleted.":"리소스를 사용할 수 없습니다. 삭제되었을 수 있습니다.","Activities":"활동","Location":"위치","Filter location":"필터 위치","No activities found":"활동을 찾을 수 없습니다"},"ro":{},"ru":{"The resource is unavailable, it may have been deleted.":"Ресурс недоступен, возможно он был удален.","Activities":"События","Location":"Расположение","Filter location":"Фильтр по расположению","No activities found":"Событий не найдено"},"si":{},"sk":{},"sq":{},"sr":{},"ta":{},"sv":{"The resource is unavailable, it may have been deleted.":"Resursen är inte tillgänglig, den kan ha raderats.","Activities":"Aktiviteter","Location":"Plats","Filter location":"Filtrera plats","No activities found":"Inga aktiviteter hittades"},"tr":{},"ug":{},"uk":{},"zh":{"The resource is unavailable, it may have been deleted.":"资源不可用，可能已被删除。","Activities":"活动","Location":"位置","Filter location":"筛选位置","No activities found":"未找到活动记录"}}
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d828bc64b16..6b725139fa7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -289,37 +289,6 @@ importers:
 
   packages/tsconfig: {}
 
-  packages/web-app-activities:
-    dependencies:
-      '@opencloud-eu/design-system':
-        specifier: workspace:^
-        version: link:../design-system
-      '@opencloud-eu/web-client':
-        specifier: workspace:*
-        version: link:../web-client
-      '@opencloud-eu/web-pkg':
-        specifier: workspace:*
-        version: link:../web-pkg
-      luxon:
-        specifier: ^3.7.2
-        version: 3.7.2
-      pinia:
-        specifier: ^3.0.0 || ^4.0.0
-        version: 4.0.2(@vue/devtools-api@8.1.5)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
-      vue-concurrency:
-        specifier: ^5.0.1
-        version: 5.0.3(vue@3.5.40(typescript@6.0.3))
-      vue-router:
-        specifier: ^5.0.0
-        version: 5.2.0(@vue/compiler-sfc@3.5.40)(esbuild@0.21.5)(pinia@4.0.2(@vue/devtools-api@8.1.5)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(rolldown@1.1.5)(rollup@4.60.0)(vite@8.1.5(@types/node@25.9.5)(esbuild@0.21.5)(jiti@2.7.0)(sass@1.101.0)(yaml@2.9.0))(vue@3.5.40(typescript@6.0.3))
-      vue3-gettext:
-        specifier: ^4.0.0-beta.1
-        version: 4.0.1(vue@3.5.40(typescript@6.0.3))
-    devDependencies:
-      '@opencloud-eu/web-test-helpers':
-        specifier: workspace:*
-        version: link:../web-test-helpers
-
   packages/web-app-admin-settings:
     dependencies:
       '@opencloud-eu/design-system':