Merge pull request #1583 from nextcloud/chore/stable28-bump-ncvue-to_…

…8.8.1

[stable28] Bump nextcloud/vue from `8.6.2` to `8.8.1`

.github/workflows/block-merge-eol.yml

@@ -2,6 +2,9 @@
 #
 # https://github.com/nextcloud/.github
 # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
+#
+# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: MIT
 
 name: Block merges for EOL
 
@@ -23,15 +26,15 @@ jobs:
     runs-on: ubuntu-latest-low
 
     steps:
-      - name: Download updater config
-        run: curl https://raw.githubusercontent.com/nextcloud/updater_server/production/config/config.php --output config.php
-
       - name: Set server major version environment
         run: |
           # retrieve version number from branch reference
           server_major=$(echo "${{ github.base_ref }}" | sed -En 's/stable//p')
           echo "server_major=$server_major" >> $GITHUB_ENV
+          echo "current_month=$(date +%Y-%m)" >> $GITHUB_ENV
 
       - name: Checking if ${{ env.server_major }} is EOL
         run: |
-          php -r 'echo json_encode(require_once "config.php");' | jq --arg version "${{ env.server_major }}" '.stable[$version]["100"].eol // .beta[$version]["100"].eol' | grep --silent -i 'false'
+          curl -s https://raw.githubusercontent.com/nextcloud-releases/updater_server/production/config/major_versions.json \
+            | jq '.["${{ env.server_major }}"]["eol"] // "9999-99" | . >= "${{ env.current_month }}"' \
+            | grep -q true

cypress/e2e/sidebar.cy.ts

@@ -37,7 +37,8 @@ describe('Check activity listing in the sidebar', { testIsolation: true }, () =>
 		cy.get('.activity-entry').last().should('contains.text', 'You created')
 	})
 
-	it('Has favorite activity', () => {
+	// TODO: FIX - currently extremely flaky -> skip
+	it.skip('Has favorite activity', () => {
 		addToFavorites('welcome.txt')
 		showActivityTab('welcome.txt')
 		cy.get('.activity-entry').first().should('contains.text', 'Added to favorites')
@@ -54,7 +55,8 @@ describe('Check activity listing in the sidebar', { testIsolation: true }, () =>
 		cy.get('.activity-entry').first().should('contains.text', 'Shared as public link')
 	})
 
-	it('Has rename activity', () => {
+	// TODO: FIX - currently extremely flaky -> skip
+	it.skip('Has rename activity', () => {
 		renameFile('welcome.txt', 'new name')
 		renameFile('new name.txt', 'welcome')
 
@@ -71,7 +73,8 @@ describe('Check activity listing in the sidebar', { testIsolation: true }, () =>
 		cy.get('.activity-entry').first().should('contains.text', 'You moved')
 	})
 
-	it('Has tag activity', () => {
+	// TODO: FIX - currently extremely flaky -> skip
+	it.skip('Has tag activity', () => {
 		addTag('welcome.txt', 'my_tag')
 
 		showActivityTab('welcome.txt')

js/ActivityTab-CLqOTmH9.chunk.mjs

@@ -0,0 +1,3 @@
+(function(){"use strict";try{if(typeof document<"u"){var e=document.createElement("style");e.appendChild(document.createTextNode("[data-v-395262ee] .empty-content__icon span{background-size:64px;width:64px;height:64px}.activity__actions[data-v-395262ee]{display:flex;flex-direction:column;width:100%}")),document.head.appendChild(e)}}catch(t){console.error("vite-plugin-css-injected-by-js",t)}})();
+/*! third party licenses: js/vendor.LICENSE.txt */
+import{b as o,N as r,d as c,v as l}from"./NcCheckboxRadioSwitch-DnnuXT1_-KVarLN0p.chunk.mjs";import{d as u,r as f,o as v,g as p,f as d,t as n}from"./index-7GNHJcAy.chunk.mjs";import{c as g,e as y,a as m,f as h}from"./Activity-DnSi_WFC.chunk.mjs";import{g as _,a as I,b}from"./api-CYh3r_4s.chunk.mjs";import{l as A}from"./logger-D_1A6-cX.chunk.mjs";import{l as S}from"./activity-sidebar.mjs";import"./_commonjsHelpers-BdswosdL.chunk.mjs";const N=u({__name:"ActivitySidebarPlugin",props:{plugin:null,fileInfo:null},emits:["reload-activities"],setup(t,{emit:i}){const a=t,s=f();return v(()=>a.plugin.mount(s.value,{context:p()?.proxy,fileInfo:a.fileInfo,reload:()=>i("reload-activities")})),d(()=>a.plugin.unmount()),{__sfc:!0,props:a,emit:i,attachTarget:s}}});var w=function(){var t=this,i=t._self._c;return t._self._setupProxy,i("div",{ref:"attachTarget"})},x=[],P=o(N,w,x,!1,null,null);const C=P.exports,k={name:"ActivityTab",components:{Activity:g,NcEmptyContent:y,NcIconSvgWrapper:m,NcLoadingIcon:r,ActivitySidebarPlugin:C},data(){return{error:"",loading:!0,fileInfo:null,activities:[],lightningBoltSVG:S,sidebarPlugins:[]}},mounted(){this.sidebarPlugins=_()},methods:{async update(t){this.fileInfo=t,this.resetState(),await this.getActivities()},async getActivities(){try{this.loading=!0;const t=await this.processActivities(await this.loadRealActivities()),i=await I({fileInfo:this.fileInfo});this.activities=[...t,...i].sort((a,s)=>s.timestamp-a.timestamp)}catch(t){this.error=n("activity","Unable to load the activity list"),console.error("Error loading the activity list",t)}finally{this.loading=!1}},resetState(){this.loading=!0,this.error="",this.activities=[]},async loadRealActivities(){try{const{data:t}=await c.get(l("apps/activity/api/v2/activity/filter"),{params:{format:"json",object_type:"files",object_id:this.fileInfo.id}});return t.ocs.data}catch(t){if(t.response!==void 0&&t.response.status===304)return[];throw e}},processActivities(t){t=t.map(a=>new h(a)),A.debug(`Processed ${t.length} activity(ies)`,{activities:t,fileInfo:this.fileInfo});const i=b();return t.filter(a=>!i||i.every(s=>s(a)))},t:n}};var E=function(){var t=this,i=t._self._c;return i("div",{class:{"icon-loading":t.loading}},[t.error?i("NcEmptyContent",{attrs:{name:t.error},scopedSlots:t._u([{key:"icon",fn:function(){return[i("NcIconSvgWrapper",{attrs:{svg:t.lightningBoltSVG}})]},proxy:!0}],null,!1,63559581)}):[t.sidebarPlugins.length>0?i("div",{staticClass:"activity__actions"},t._l(t.sidebarPlugins,function(a,s){return i("ActivitySidebarPlugin",{key:s,attrs:{plugin:a,"file-info":t.fileInfo},on:{"reload-activities":function(T){return t.getActivities()}}})}),1):t._e(),t.loading?i("NcEmptyContent",{attrs:{name:t.t("activity","Loading activities")},scopedSlots:t._u([{key:"icon",fn:function(){return[i("NcLoadingIcon")]},proxy:!0}],null,!1,3085876643)}):t.activities.length===0?i("NcEmptyContent",{attrs:{name:t.t("activity","No activity yet")},scopedSlots:t._u([{key:"icon",fn:function(){return[i("span",{staticClass:"icon-activity"})]},proxy:!0}])}):i("ul",t._l(t.activities,function(a){return i("Activity",{key:a.id,attrs:{activity:a,"show-previews":!1},on:{reload:function(s){return t.getActivities()}}})}),1)]],2)},j=[],L=o(k,E,j,!1,null,"395262ee");const U=L.exports;export{U as default};