Share type sciencemesh by michielbdejong · Pull Request #36228 · nextcloud/server

michielbdejong · 2023-01-18T20:07:01Z

Resolves: Support for new 'sciencemesh' share type #36227

Summary

Add the sciencemesh share type in all the places where share types are enumerated.

apps/files_sharing/lib/Controller/DeletedShareAPIController.php

apps/files_sharing/lib/Controller/ShareAPIController.php

solracsf · 2023-01-19T16:17:13Z

Can you look at PSALM + failed tests?

apps/files_sharing/lib/Controller/ShareAPIController.php

+	 */
+	private function getSciencemeshShareHelper() {
+		if (!$this->appManager->isEnabledForUser('sciencemesh')) {
+			throw new QueryException();


juliusknorr

Looks reasonable, just two minor comments inline :)

apps/files_sharing/lib/Controller/DeletedShareAPIController.php

apps/files_sharing/lib/Controller/ShareAPIController.php

michielbdejong · 2023-01-26T12:09:12Z

I'll fix apps/files_sharing/tests/MountProviderTest.php and apps/files_sharing/tests/Controller/ShareAPIControllerTest.php

michielbdejong · 2023-01-30T13:41:45Z

Hm, only one 'spreed' integration test is failing now https://drone.nextcloud.com/nextcloud/server/29215/45/4
It's missing a file from autoload.php
I'll try to run this test in a dev environment.

server/.drone.yml

Lines 1230 to 1264 in aee6b37

    
           kind: pipeline 
        
           name: integration-sharing-v1-video-verification 
        
           steps: 
        
           - name: submodules 
        
             image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest 
        
             commands: 
        
               - git submodule update --init 
        
           - name: install-talk 
        
             image: ghcr.io/nextcloud/continuous-integration-php8.0:latest 
        
             commands: 
        
               # JavaScript files are not used in integration tests so it is not needed to 
        
               # build them. 
        
               - git clone --depth 1 https://github.com/nextcloud/spreed apps/spreed 
        
               - cd apps/spreed 
        
               - composer --version 
        
               - composer self-update --2 
        
               - composer install --no-dev 
        
               - cd ../.. 
        
           - name: integration-sharing-v1-video-verification 
        
             image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest 
        
             commands: 
        
               - bash tests/drone-run-integration-tests.sh || exit 0 
        
               - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int 
        
               - cd build/integration 
        
               - ./run.sh sharing_features/sharing-v1-video-verification.feature 
        
           trigger: 
        
             branch: 
        
               - master 
        
               - stable* 
        
             event: 
        
               - pull_request 
        
               - push

michielbdejong · 2023-01-30T14:37:23Z

When I run this in a dev environment I see:

32 scenarios (32 passed)
386 steps (386 passed)

So based on that I think the test failure might have been intermittent? Can someone maybe rerun the integration-sharing-v1-video-verification test on drone?

michielbdejong · 2023-02-01T08:21:56Z

@juliushaertl can you have a look please when you have time?

apps/files_sharing/lib/Controller/DeletedShareAPIController.php

+	 */
+	private function getSciencemeshShareHelper() {
+		if (!$this->appManager->isEnabledForUser('sciencemesh')) {
+			throw new QueryException();


michielbdejong · 2023-02-08T12:02:47Z

@juliushaertl please let us know if there is anything else we can do, we are waiting for this to be merged asap if possible.

lib/private/Share/Constants.php

juliusknorr · 2023-02-13T20:10:52Z

lib/private/Share/Constants.php

-	 * @deprecated 21.0.0 - use IShare::TYPE_SCIENCEMESH instead
-	 */
-	public const SHARE_TYPE_SCIENCEMESH = 15;
+    // Note to developers: Do not add new share types here


Suggested change

// Note to developers: Do not add new share types here

// Note to developers: Do not add new share types here

Thanks! I think this is the change I committed in ddd991d - it should be 1 tab, right?

The GitHub viewer here has 8-space tabs and the one for ddd991d displays 4-space tabs. Also, when I click 'Sign off and commit suggestion' here, nothing happens, so I think this is correct OK now.
Will double-check this after the rebase.

juliusknorr · 2023-02-13T20:12:56Z

Triggered the checks again. Can you maybe rebase to latest master as well when fixing the indentation issue? The drone failure looks unrelated.

juliusknorr

Code looks good 👍

Mind to do another rebase to latest master to retriever the failed tests? Looks unrelated to me though...

Signed-off-by: Michiel de Jong <[email protected]>

michielbdejong · 2023-02-21T10:44:25Z

This workflow requires approval from a maintainer.

michielbdejong · 2023-02-22T14:32:35Z

@juliushaertl can you trigger CI please?

michielbdejong · 2023-02-24T14:27:47Z

@skjnldsv can you maybe approve the workflows so this can be merged?

michielbdejong · 2023-02-24T14:29:21Z

This has been stuck for 11 days now...

michielbdejong · 2023-03-02T08:25:18Z

@juliushaertl Please merge this today if possible.

michielbdejong · 2023-03-07T09:08:41Z

I'm giving a presentation about this at 3pm.
I think @karlitschek said we are maybe already too late for release 26 and we should target this to release 27 now?
What is the next step here? It would be great if this can still be merged today, before my presentation!

AndyScherzinger · 2023-03-08T13:59:55Z

@artonge can you look into the updating of the js bundle please? Thanks in advance

artonge · 2023-03-08T15:50:14Z

Can't push on not owned origin. I created a mirror here: #37139

juliusknorr · 2023-03-08T17:31:29Z

Closing as #37139 has been merged

michielbdejong force-pushed the share-type-sciencemesh branch from 4463eb2 to 29fe154 Compare January 18, 2023 20:08

michielbdejong mentioned this pull request Jan 18, 2023

Dynamic share providers #31571

Closed

github-advanced-security bot found potential problems Jan 18, 2023

View reviewed changes

solracsf added this to the Nextcloud 26 milestone Jan 18, 2023

solracsf added 3. to review Waiting for reviews 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jan 18, 2023

github-advanced-security bot found potential problems Jan 24, 2023

View reviewed changes

PVince81 requested review from artonge, come-nc, juliusknorr and skjnldsv January 24, 2023 11:49

skjnldsv removed their request for review January 24, 2023 13:54

juliusknorr requested changes Jan 25, 2023

View reviewed changes

apps/files_sharing/lib/Controller/DeletedShareAPIController.php Show resolved Hide resolved

apps/files_sharing/lib/Controller/ShareAPIController.php Outdated Show resolved Hide resolved

michielbdejong force-pushed the share-type-sciencemesh branch from 206558b to ee4a8ac Compare January 25, 2023 13:03

blizzz mentioned this pull request Feb 1, 2023

26.0.0 beta 2 #36484

Merged

michielbdejong force-pushed the share-type-sciencemesh branch from b7915f2 to 2dc787f Compare February 3, 2023 08:41

github-advanced-security bot found potential problems Feb 8, 2023

View reviewed changes

nickvergessen reviewed Feb 10, 2023

View reviewed changes

lib/private/Share/Constants.php Outdated Show resolved Hide resolved

michielbdejong requested review from nickvergessen and removed request for artonge and come-nc February 11, 2023 08:06

juliusknorr reviewed Feb 13, 2023

View reviewed changes

michielbdejong force-pushed the share-type-sciencemesh branch from ddd991d to 1a9037d Compare February 14, 2023 10:35

juliusknorr approved these changes Feb 17, 2023

View reviewed changes

Add SHARE_TYPE_SCIENCEMESH

3085f04

Signed-off-by: Michiel de Jong <[email protected]>

michielbdejong force-pushed the share-type-sciencemesh branch from 1a9037d to 3085f04 Compare February 20, 2023 09:56

michielbdejong requested review from juliusknorr and removed request for nickvergessen February 20, 2023 10:29

skjnldsv mentioned this pull request Feb 23, 2023

26.0.0 beta 5 #36834

Merged

michielbdejong mentioned this pull request Feb 24, 2023

Provide patch for NC-25-enterprise pondersource/sciencemesh-php#157

Open

blizzz mentioned this pull request Mar 7, 2023

26.0.0 RC2 #37078

Merged

nickvergessen assigned AndyScherzinger Mar 8, 2023

juliusknorr approved these changes Mar 8, 2023

View reviewed changes

AndyScherzinger requested a review from artonge March 8, 2023 13:59

AndyScherzinger assigned artonge Mar 8, 2023

artonge approved these changes Mar 8, 2023

View reviewed changes

artonge mentioned this pull request Mar 8, 2023

Share type sciencemesh #37139

Merged

juliusknorr closed this Mar 8, 2023

AndyScherzinger unassigned AndyScherzinger and artonge Mar 9, 2023

	// Note to developers: Do not add new share types here
	// Note to developers: Do not add new share types here

Uh oh!

Conversation

michielbdejong commented Jan 18, 2023

Summary

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

solracsf commented Jan 19, 2023

Uh oh!

Check notice

juliusknorr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

michielbdejong commented Jan 26, 2023

Uh oh!

michielbdejong commented Jan 30, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

michielbdejong commented Jan 30, 2023

Uh oh!

michielbdejong commented Feb 1, 2023

Uh oh!

Check notice

michielbdejong commented Feb 8, 2023

Uh oh!

Uh oh!

juliusknorr Feb 13, 2023

Choose a reason for hiding this comment

Uh oh!

michielbdejong Feb 14, 2023

Choose a reason for hiding this comment

Uh oh!

michielbdejong Feb 14, 2023

Choose a reason for hiding this comment

Uh oh!

juliusknorr commented Feb 13, 2023

Uh oh!

juliusknorr left a comment

Choose a reason for hiding this comment

Uh oh!

michielbdejong commented Feb 21, 2023

Uh oh!

michielbdejong commented Feb 22, 2023

Uh oh!

michielbdejong commented Feb 24, 2023

Uh oh!

michielbdejong commented Feb 24, 2023

Uh oh!

michielbdejong commented Mar 2, 2023

Uh oh!

michielbdejong commented Mar 7, 2023

Uh oh!

AndyScherzinger commented Mar 8, 2023

Uh oh!

artonge commented Mar 8, 2023

Uh oh!

juliusknorr commented Mar 8, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

michielbdejong commented Jan 30, 2023 •

edited

Loading