Skip to content

Commit

Permalink
Merge branch 'master' into changeRespCode
Browse files Browse the repository at this point in the history
  • Loading branch information
ScharfViktor authored Nov 15, 2023
2 parents 81ccc74 + 3baa5fe commit f2dd00e
Show file tree
Hide file tree
Showing 252 changed files with 6,113 additions and 1,551 deletions.
45 changes: 29 additions & 16 deletions .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ def pnpmCache(ctx):
},
"steps": skipIfUnchanged(ctx, "cache") +
installPnpm() +
installPlaywright() +
rebuildBuildArtifactCache(ctx, "pnpm", ".pnpm-store") +
rebuildBuildArtifactCache(ctx, "playwright", ".playwright"),
"trigger": {
Expand Down Expand Up @@ -579,11 +580,14 @@ def buildCacheWeb(ctx):
},
"steps": skipIfUnchanged(ctx, "cache") +
restoreBuildArtifactCache(ctx, "pnpm", ".pnpm-store") +
installPnpm() +
[{
"name": "build-web",
"image": OC_CI_NODEJS,
"environment": {
"NO_INSTALL": "true",
},
"commands": [
"pnpm config set store-dir ./.pnpm-store",
"make dist",
],
}] +
Expand Down Expand Up @@ -740,6 +744,7 @@ def e2eTests(ctx):
restoreBuildArtifactCache(ctx, "pnpm", ".pnpm-store") + \
restoreBuildArtifactCache(ctx, "playwright", ".playwright") + \
installPnpm() + \
installPlaywright() + \
restoreBuildArtifactCache(ctx, "web-dist", "dist") + \
setupServerConfigureWeb(params["logLevel"]) + \
restoreOcisCache()
Expand Down Expand Up @@ -1009,12 +1014,22 @@ def installPnpm():
return [{
"name": "pnpm-install",
"image": OC_CI_NODEJS,
"commands": [
'npm install --silent --global --force "$(jq -r ".packageManager" < package.json)"',
"pnpm config set store-dir ./.pnpm-store",
"pnpm install",
],
}]

def installPlaywright():
return [{
"name": "playwright-install",
"image": OC_CI_NODEJS,
"environment": {
"PLAYWRIGHT_BROWSERS_PATH": ".playwright",
},
"commands": [
"pnpm config set store-dir ./.pnpm-store",
"pnpm install",
"pnpm playwright install chromium",
],
}]

Expand Down Expand Up @@ -1258,6 +1273,12 @@ def ocisService(type, tika_enabled = False):
"FRONTEND_SEARCH_MIN_LENGTH": "2",
"FRONTEND_OCS_ENABLE_DENIALS": True,
"FRONTEND_PASSWORD_POLICY_BANNED_PASSWORDS_LIST": "%s/tests/drone/banned-passwords.txt" % dir["web"],
"OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD": False,
"FRONTEND_PASSWORD_POLICY_MIN_CHARACTERS": 0,
"FRONTEND_PASSWORD_POLICY_MIN_LOWERCASE_CHARACTERS": 0,
"FRONTEND_PASSWORD_POLICY_MIN_UPPERCASE_CHARACTERS": 0,
"FRONTEND_PASSWORD_POLICY_MIN_DIGITS": 0,
"FRONTEND_PASSWORD_POLICY_MIN_SPECIAL_CHARACTERS": 0,
}
if type == "app-provider":
environment["GATEWAY_GRPC_ADDR"] = "0.0.0.0:9142"
Expand Down Expand Up @@ -1312,12 +1333,14 @@ def checkForExistingOcisCache(ctx):
return [
{
"name": "check-for-existing-cache",
"image": OC_UBUNTU,
"image": MINIO_MC,
"environment": minio_mc_environment,
"commands": [
"curl -o .drone.env %s/.drone.env" % web_repo_path,
"curl -o check-oCIS-cache.sh %s/tests/drone/check-oCIS-cache.sh" % web_repo_path,
". ./.drone.env",
"mc alias set s3 $MC_HOST $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY",
"mc ls --recursive s3/$CACHE_BUCKET/ocis-build",
"bash check-oCIS-cache.sh",
],
},
Expand Down Expand Up @@ -1381,13 +1404,11 @@ def runWebuiAcceptanceTests(ctx, suite, alternateSuiteName, filterTags, extraEnv
for env in extraEnvironment:
environment[env] = extraEnvironment[env]

return restoreBuildArtifactCache(ctx, "pnpm", ".pnpm-store") + [{
return restoreBuildArtifactCache(ctx, "pnpm", ".pnpm-store") + installPnpm() + [{
"name": "webui-acceptance-tests",
"image": OC_CI_NODEJS,
"environment": environment,
"commands": [
"pnpm config set store-dir ./.pnpm-store",
"pnpm install", # FIXME: use --filter ./tests/acceptance (currently @babel/register is not found)
"cd %s/tests/acceptance && ./run.sh" % dir["web"],
],
"volumes": [{
Expand Down Expand Up @@ -1647,15 +1668,7 @@ def licenseCheck(ctx):
"os": "linux",
"arch": "amd64",
},
"steps": [
{
"name": "pnpm-install",
"image": OC_CI_NODEJS,
"commands": [
"pnpm config set store-dir ./.pnpm-store",
"pnpm install",
],
},
"steps": installPnpm() + [
{
"name": "node-check-licenses",
"image": OC_CI_NODEJS,
Expand Down
50 changes: 50 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ Summary
* Bugfix - Tags are no longer editable for a locked file: [#9873](https://github.com/owncloud/web/pull/9873)
* Bugfix - Prevent rendering of old/wrong set of resources in search list: [#9881](https://github.com/owncloud/web/pull/9881)
* Bugfix - Private link resolving via share jail ID: [#9913](https://github.com/owncloud/web/pull/9913)
* Bugfix - Keep both folders conflict in same-named folders: [#9915](https://github.com/owncloud/web/pull/9915)
* Enhancement - Make login url configurable: [#7317](https://github.com/owncloud/ocis/pull/7317)
* Enhancement - Permission checks for shares and favorites: [#7497](https://github.com/owncloud/ocis/issues/7497)
* Enhancement - Scroll to newly created folder: [#7600](https://github.com/owncloud/web/issues/7600)
* Enhancement - Application unification: [#9302](https://github.com/owncloud/web/issues/9302)
* Enhancement - Show local loading spinner in sharing button: [#9423](https://github.com/owncloud/web/pull/9423)
Expand Down Expand Up @@ -64,8 +66,11 @@ Summary
* Enhancement - Location picker in embed mode: [#9863](https://github.com/owncloud/web/pull/9863)
* Enhancement - Search tags filter chips style aligned: [#9864](https://github.com/owncloud/web/pull/9864)
* Enhancement - Enable dark theme on importer: [#9884](https://github.com/owncloud/web/pull/9884)
* Enhancement - Create shortcuts: [#9890](https://github.com/owncloud/web/pull/9890)
* Enhancement - Manage tags in details panel: [#9905](https://github.com/owncloud/web/pull/9905)
* Enhancement - Reorganize "New" menu: [#9906](https://github.com/owncloud/web/pull/9906)
* Enhancement - Provide vendor neutral file icons: [#9911](https://github.com/owncloud/web/pull/9911)
* Enhancement - Add media type filter chip: [#9912](https://github.com/owncloud/web/pull/9912)

Details
-------
Expand Down Expand Up @@ -216,6 +221,14 @@ Details
https://github.com/owncloud/web/issues/9867
https://github.com/owncloud/web/pull/9913

* Bugfix - Keep both folders conflict in same-named folders: [#9915](https://github.com/owncloud/web/pull/9915)

Parsing has been adjusted to account for edge case of multiple folders and sub-folders with the
same name

https://github.com/owncloud/web/issues/9158
https://github.com/owncloud/web/pull/9915

* Enhancement - Make login url configurable: [#7317](https://github.com/owncloud/ocis/pull/7317)

We've added a new configuration option loginUrl to web, this is helpful if you use an external
Expand All @@ -224,6 +237,13 @@ Details
https://github.com/owncloud/web/issues/9707
https://github.com/owncloud/ocis/pull/7317

* Enhancement - Permission checks for shares and favorites: [#7497](https://github.com/owncloud/ocis/issues/7497)

Permission checks for creating shares and favorites have been added.

https://github.com/owncloud/ocis/issues/7497
https://github.com/owncloud/web/pull/9810

* Enhancement - Scroll to newly created folder: [#7600](https://github.com/owncloud/web/issues/7600)

After creating a new folder that gets sorted into the currently displayed resources but
Expand Down Expand Up @@ -423,6 +443,7 @@ Details
session is started, e.g. by opening a new tab.

https://github.com/owncloud/web/pull/9696
https://github.com/owncloud/web/pull/9872

* Enhancement - Unify sharing expiration date menu items: [#9706](https://github.com/owncloud/web/pull/9706)

Expand Down Expand Up @@ -584,6 +605,28 @@ Details
https://github.com/owncloud/web/issues/9452
https://github.com/owncloud/web/pull/9884

* Enhancement - Create shortcuts: [#9890](https://github.com/owncloud/web/pull/9890)

We've added a new functionality to add to shortcuts to web, those can be created via the "+ New"
context menu. Users can enter URLs or pick a file via the drop down menu and create a '.url' file.

'.url' files can be opened via web or downloaded and opened on the desktop.

https://github.com/owncloud/web/issues/9796
https://github.com/owncloud/web/issues/9887
https://github.com/owncloud/web/issues/9850
https://github.com/owncloud/web/pull/9890
https://github.com/owncloud/web/pull/9908

* Enhancement - Manage tags in details panel: [#9905](https://github.com/owncloud/web/pull/9905)

We've enhanced the details panel, now tags are viewable and manageable there. That change
makes it easier for the user to manage tags, as they don't need to click an additional context
menu action.

https://github.com/owncloud/web/issues/9783
https://github.com/owncloud/web/pull/9905

* Enhancement - Reorganize "New" menu: [#9906](https://github.com/owncloud/web/pull/9906)

We've reorganized the "new" menu and added optional file extension indicators that will show
Expand All @@ -599,6 +642,13 @@ Details
https://github.com/owncloud/web/issues/9847
https://github.com/owncloud/web/pull/9911

* Enhancement - Add media type filter chip: [#9912](https://github.com/owncloud/web/pull/9912)

We've added a new filter option in the search list to filter by media type.

https://github.com/owncloud/web/issues/9780
https://github.com/owncloud/web/pull/9912

Changelog for ownCloud Web [7.1.1] (2023-10-25)
=======================================
The following sections list the changes in ownCloud web 7.1.1 relevant to
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ RELEASE := ${CURDIR}/release
NODE_MODULES := ${CURDIR}/node_modules

node_modules: package.json pnpm-lock.yaml
pnpm install && touch ${NODE_MODULES}
[ -n "${NO_INSTALL}" ] || pnpm install
touch ${NODE_MODULES}

.PHONY: clean
clean:
Expand Down
2 changes: 1 addition & 1 deletion Makefile.release
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ build: build-web copy-config

.PHONY: build-web
build-web:
$(PNPM) install
[ -n "${NO_INSTALL}" ] || $(PNPM) install
$(PNPM) check:types
$(PNPM) build

Expand Down
File renamed without changes.
6 changes: 6 additions & 0 deletions changelog/unreleased/bugfix-keep-both-conflict
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Keep both folders conflict in same-named folders

Parsing has been adjusted to account for edge case of multiple folders and sub-folders with the same name

https://github.com/owncloud/web/pull/9915
https://github.com/owncloud/web/issues/9158
File renamed without changes.
6 changes: 6 additions & 0 deletions changelog/unreleased/enhancement-add-file-media-filter-chip
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: Add media type filter chip

We've added a new filter option in the search list to filter by media type.

https://github.com/owncloud/web/pull/9912
https://github.com/owncloud/web/issues/9780
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ Enhancement: Added app banner for mobile devices
We've added an app banner at the top of the web view for mobile devices asking the user whether they want to continue working in the app. By dismissing it, it will not show again until a new session is started, e.g. by opening a new tab.

https://github.com/owncloud/web/pull/9696
https://github.com/owncloud/web/pull/9872

12 changes: 12 additions & 0 deletions changelog/unreleased/enhancement-create-shortcuts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Enhancement: Create shortcuts

We've added a new functionality to add to shortcuts to web, those can be created via the "+ New" context menu.
Users can enter URLs or pick a file via the drop down menu and create a '.url' file.

'.url' files can be opened via web or downloaded and opened on the desktop.

https://github.com/owncloud/web/pull/9890
https://github.com/owncloud/web/pull/9908
https://github.com/owncloud/web/issues/9796
https://github.com/owncloud/web/issues/9887
https://github.com/owncloud/web/issues/9850
8 changes: 8 additions & 0 deletions changelog/unreleased/enhancement-manage-tags-in-details-panel
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Enhancement: Manage tags in details panel

We've enhanced the details panel, now tags are viewable and manageable there.
That change makes it easier for the user to manage tags, as they don't need to click an additional
context menu action.

https://github.com/owncloud/web/pull/9905
https://github.com/owncloud/web/issues/9783
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: Permission checks for shares and favorites

Permission checks for creating shares and favorites have been added.

https://github.com/owncloud/ocis/issues/7497
https://github.com/owncloud/web/pull/9810
File renamed without changes.
59 changes: 34 additions & 25 deletions dev/docker/ocis.idp.config.yaml
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
clients:
- id: web
name: ownCloud web app
application_type: web
insecure: true
trusted: true
redirect_uris:
- https://host.docker.internal:9200/
- https://host.docker.internal:9200/oidc-callback.html
- https://host.docker.internal:9200/oidc-silent-redirect.html
- https://host.docker.internal:9201/
- https://host.docker.internal:9201/oidc-callback.html
- https://host.docker.internal:9201/oidc-silent-redirect.html
origins:
- https://host.docker.internal:9200
- https://host.docker.internal:9201
- id: filepicker
name: ownCloud file picker
application_type: ""
trusted: true
secret: ""
redirect_uris:
- https://host.docker.internal:3000
- https://host.docker.internal:3000?redirect=true
origins:
- https://host.docker.internal:3000
- id: web
name: ownCloud web app
application_type: web
insecure: true
trusted: true
redirect_uris:
- https://host.docker.internal:9200/
- https://host.docker.internal:9200/oidc-callback.html
- https://host.docker.internal:9200/oidc-silent-redirect.html
- https://host.docker.internal:9201/
- https://host.docker.internal:9201/oidc-callback.html
- https://host.docker.internal:9201/oidc-silent-redirect.html
- https://ocis.owncloud.test:10200/
- https://ocis.owncloud.test:10200/oidc-callback.html
- https://ocis.owncloud.test:10200/oidc-silent-redirect.html
- https://ocis.owncloud.test:10201/
- https://ocis.owncloud.test:10201/oidc-callback.html
- https://ocis.owncloud.test:10201/oidc-silent-redirect.html
origins:
- https://host.docker.internal:9200
- https://host.docker.internal:9201
- https://ocis.owncloud.test:10200
- https://ocis.owncloud.test:10201

- id: filepicker
name: ownCloud file picker
application_type: ""
trusted: true
secret: ""
redirect_uris:
- https://host.docker.internal:3000
- https://host.docker.internal:3000?redirect=true
origins:
- https://host.docker.internal:3000
46 changes: 46 additions & 0 deletions dev/docker/ocis.storage.ocmproviders.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
[
{
"name": "host.docker.internal:9200",
"full_name": "host.docker.internal 9200",
"organization": "ownCloud",
"domain": "host.docker.internal",
"homepage": "https://owncloud.com",
"services": [
{
"endpoint": {
"type": {
"name": "OCM",
"description": "ownCloud Open Cloud Mesh API"
},
"name": "ownCloud - OCM API",
"path": "https://host.docker.internal:9200/ocm/",
"is_monitored": true
},
"api_version": "0.0.1",
"host": "host.docker.internal:9200"
}
]
},
{
"name": "ocis.owncloud.test:10200",
"full_name": "ocis.owncloud.test 10200",
"organization": "ownCloud",
"domain": "ocis.owncloud.test",
"homepage": "https://owncloud.com",
"services": [
{
"endpoint": {
"type": {
"name": "OCM",
"description": "ownCloud Open Cloud Mesh API"
},
"name": "ownCloud - OCM API",
"path": "https://ocis.owncloud.test:10200/ocm/",
"is_monitored": true
},
"api_version": "0.0.1",
"host": "ocis.owncloud.test:10200"
}
]
}
]
Loading

0 comments on commit f2dd00e

Please sign in to comment.