Upgrade: Bump @nextcloud/axios from 2.4.0 to 2.5.0

cypress/e2e/filesUtils.ts

@@ -38,6 +38,11 @@ export function moveFile (fileName: string, dirName: string) {
 }
 
 export function toggleMenuAction(fileName: string) {
-	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${fileName}"] [data-cy-files-list-row-actions] .action-item__menutoggle`).click()
-	cy.get('[data-cy-files-list-row-action]').should('be.visible')
+	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${CSS.escape(fileName)}"] [data-cy-files-list-row-actions]`)
+		.should('be.visible')
+		.findByRole('button', { name: 'Actions' })
+		.should('be.visible')
+		.click()
+	cy.get('[data-cy-files-list-row-action]')
+		.should('be.visible')
 }

cypress/e2e/sidebarUtils.ts

@@ -8,7 +8,10 @@ import { toggleMenuAction } from './filesUtils'
 function showSidebarForFile(fileName: string) {
 	closeSidebar()
 	toggleMenuAction(fileName)
-	cy.get('[data-cy-files-list-row-action="details"] button').click()
+	cy.get('[data-cy-files-list-row-action="details"]')
+		.should('be.visible')
+		.findByRole('menuitem')
+		.click()
 	cy.get('#app-sidebar-vue').should('be.visible')
 }
 
@@ -57,18 +60,34 @@ export function createPublicShare(fileName: string) {
 export function addTag(fileName: string, tag: string) {
 	showSidebarForFile(fileName)
 
-	cy.get('.app-sidebar-header__menu button').click()
-	cy.get('.action-button__icon.icon-tag').click()
-	cy.get('.system-tags input').type(`${tag}{enter}{esc}`)
+	cy.get('#app-sidebar-vue .app-sidebar-header')
+		.should('be.visible')
+		.findByRole('button', { name: 'Actions' })
+		.click()
 
-	cy.wait(500)
+	cy.findByRole('menuitem', { name: 'Tags' })
+		.should('be.visible')
+		.click()
+
+	cy.intercept('PUT', '**/remote.php/dav/systemtags-relations/files/**').as('tag')
+
+	cy.findByLabelText('Search or create collaborative tags')
+		.type(`${tag}{enter}{esc}`)
+
+	cy.wait('@tag')
 }
 
 export function addComment(fileName: string, comment: string) {
 	showSidebarForFile(fileName)
-	cy.get('#app-sidebar-vue').contains('Activity').click()
-	cy.get('.comment__editor .rich-contenteditable__input').type(comment)
-	cy.get('.comment__submit button').click()
+	cy.get('#app-sidebar-vue')
+		.findByRole('tab', { name: 'Activity' })
+		.click()
+
+	cy.intercept('POST', '**/remote.php/dav/comments/files/*').as('comment')
+	cy.get('#app-sidebar-vue')
+		.findByRole('textbox', { name: 'New comment' })
+		.should('be.visible')
+		.type(`{selectAll}${comment}{enter}`)
 
-	cy.wait(500)
+	cy.wait('@comment')
 }

cypress/support/commands.ts

@@ -8,6 +8,8 @@ import { addCompareSnapshotCommand } from 'cypress-visual-regression/dist/comman
 
 import 'cypress-wait-until'
 
+import '@testing-library/cypress/add-commands'
+
 // Add custom commands
 addCommands()
 addCompareSnapshotCommand()

cypress/tsconfig.json

@@ -3,6 +3,7 @@
 	"include": ["./**/*.ts"],
 	"compilerOptions": {
 		"types": [
+			"@testing-library/cypress",
 			"cypress",
 			"dockerode",
 			"node"

js/ActivityTab-Cerf5hB0.chunk.mjs

@@ -0,0 +1,2 @@
+(function(){"use strict";try{if(typeof document<"u"){var t=document.createElement("style");t.appendChild(document.createTextNode(".activity[data-v-4f32db6b]{display:flex;flex-direction:column;overflow:hidden;height:100%}.activity__actions[data-v-4f32db6b]{display:flex;flex-direction:column;width:100%}.activity__empty-content[data-v-4f32db6b]{height:100%}[data-v-4f32db6b] .empty-content__icon span{background-size:64px;width:64px;height:64px}")),document.head.appendChild(t)}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
+import{b as c,e as l,f as u,v}from"./NcCheckboxRadioSwitch-D2GbHtCS-DkAPkbep.chunk.mjs";import{d as f,r as p,o as d,g as y,f as g,t as o}from"./index-CTfcNKj-.chunk.mjs";import{a as m,b as h,N as _,c as b}from"./Activity-dL8aERkk.chunk.mjs";import{g as r,a as I,b as A}from"./api-wy7VpNU4.chunk.mjs";import{l as S}from"./logger-CimJwhmx.chunk.mjs";import{l as P}from"./activity-sidebar.mjs";import"./_commonjsHelpers-D9DevfhH.chunk.mjs";const x=f({__name:"ActivitySidebarPlugin",props:{plugin:null,fileInfo:null},emits:["reload-activities"],setup(t,{emit:i}){const a=t,s=p();return d(()=>{var n;return a.plugin.mount(s.value,{context:(n=y())==null?void 0:n.proxy,fileInfo:a.fileInfo,reload:()=>i("reload-activities")})}),g(()=>a.plugin.unmount()),{__sfc:!0,props:a,emit:i,attachTarget:s}}});var N=function(){var t=this,i=t._self._c;return t._self._setupProxy,i("div",{ref:"attachTarget"})},w=[],C=c(x,N,w,!1,null,null);const k=C.exports,E={name:"ActivityTab",components:{Activity:m,NcEmptyContent:h,NcIconSvgWrapper:_,NcLoadingIcon:l,ActivitySidebarPlugin:k},data(){return{error:"",loading:!0,fileInfo:null,activities:[],lightningBoltSVG:P,sidebarPlugins:[]}},mounted(){this.sidebarPlugins=r()},methods:{async update(t){this.sidebarPlugins=[];let i=r();i.length>0&&this.$nextTick(()=>{this.sidebarPlugins=i}),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=o("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 u.get(v("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 b(a)),S.debug("Processed ".concat(t.length," activity(ies)"),{activities:t,fileInfo:this.fileInfo});const i=A();return t.filter(a=>!i||i.every(s=>s(a)))},t:o}};var T=function(){var t=this,i=t._self._c;return i("div",{staticClass:"activity",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(n){return t.getActivities()}}})}),1):t._e(),t.loading?i("NcEmptyContent",{staticClass:"activity__empty-content",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",{staticClass:"activity__empty-content",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=c(E,T,j,!1,null,"4f32db6b");const U=L.exports;export{U as default};