Merge pull request #3834 from owncloud/set-public-link-defaultname-ca…

…pability Set public link defaultname capability
owncloud · May 19, 2022 · 8ece455 · 8ece455
2 parents bed3d9f + 582e050
commit 8ece455
Show file tree

Hide file tree

Showing 9 changed files with 267 additions and 170 deletions.
diff --git a/changelog/unreleased/fix-public-link-defaultname-capability b/changelog/unreleased/fix-public-link-defaultname-capability
@@ -0,0 +1,6 @@
+Bugfix: Set default name for public link via capabilities
+
+We have now added a default name for public link shares which is communicated via the capabilities.
+
+https://github.com/owncloud/ocis/pull/3834
+https://github.com/owncloud/ocis/issues/1237
diff --git a/extensions/frontend/pkg/revaconfig/config.go b/extensions/frontend/pkg/revaconfig/config.go
@@ -166,12 +166,13 @@ func FrontendConfigFromStruct(cfg *config.Config) map[string]interface{} {
 								"default_permissions":               22,
 								"search_min_length":                 3,
 								"public": map[string]interface{}{
-									"enabled":              true,
-									"send_mail":            true,
-									"social_share":         true,
-									"upload":               true,
-									"multiple":             true,
-									"supports_upload_only": true,
+									"enabled":                    true,
+									"send_mail":                  true,
+									"defaultPublicLinkShareName": "Public link",
+									"social_share":               true,
+									"upload":                     true,
+									"multiple":                   true,
+									"supports_upload_only":       true,
 									"password": map[string]interface{}{
 										"enforced": false,
 										"enforced_for": map[string]interface{}{

diff --git a/extensions/idp/package.json b/extensions/idp/package.json
@@ -70,7 +70,7 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.15.5",
+    "@babel/runtime": "7.17.9",
     "@material-ui/core": "^4.8.0",
     "@material-ui/icons": "^4.5.0",
     "axios": "^0.21.1",
@@ -105,7 +105,7 @@
     "babel-eslint": "10.1.0",
     "babel-jest": "^26.6.3",
     "babel-loader": "8.2.2",
-    "babel-plugin-named-asset-import": "^0.3.6",
+    "babel-plugin-named-asset-import": "^0.3.8",
     "babel-preset-react-app": "^10.0.0",
     "camelcase": "^6.2.0",
     "case-sensitive-paths-webpack-plugin": "2.4.0",

diff --git a/extensions/idp/yarn.lock b/extensions/idp/yarn.lock
@@ -63,7 +63,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.5, @babel/core@npm:^7.7.5":
+"@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.3, @babel/core@npm:^7.7.5":
   version: 7.15.5
   resolution: "@babel/core@npm:7.15.5"
   dependencies:
@@ -4115,12 +4115,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-named-asset-import@npm:^0.3.6":
-  version: 0.3.7
-  resolution: "babel-plugin-named-asset-import@npm:0.3.7"
+"babel-plugin-named-asset-import@npm:^0.3.8":
+  version: 0.3.8
+  resolution: "babel-plugin-named-asset-import@npm:0.3.8"
   peerDependencies:
     "@babel/core": ^7.1.0
-  checksum: 4c9a42a2762f3d596a09105d05991525a0553d095030459d0f71449b023801ccc43e90fa20b618c52283dc61ca528a4a59df244e5b1dd583867786088eb473b7
+  checksum: d1e58df8cb75d91d070feea31087bc989906d3465144bde7e9f3c3690b514a90a55d3aebf3e65e76c5d4c743ecedde5f640f09f43a21fa60f1a5d413cb3f7a67
   languageName: node
   linkType: hard
 
@@ -9067,7 +9067,6 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "identifier@workspace:."
   dependencies:
-    "@babel/core": ^7.15.5
     "@babel/runtime": 7.13.10
     "@material-ui/core": ^4.8.0
     "@material-ui/icons": ^4.5.0
@@ -9078,7 +9077,7 @@ __metadata:
     babel-eslint: 10.1.0
     babel-jest: ^26.6.3
     babel-loader: 8.2.2
-    babel-plugin-named-asset-import: ^0.3.6
+    babel-plugin-named-asset-import: ^0.3.8
     babel-preset-react-app: ^10.0.0
     camelcase: ^6.2.0
     case-sensitive-paths-webpack-plugin: 2.4.0

diff --git a/extensions/ocs/pkg/service/v0/data/user.go b/extensions/ocs/pkg/service/v0/data/user.go
@@ -8,7 +8,7 @@ type Users struct {
 // User holds the payload for a GetUser response
 type User struct {
 	Enabled           string `json:"enabled" xml:"enabled"`
-	UserID            string `json:"id" xml:"id"`// UserID is mapped to the preferred_name attribute in accounts
+	UserID            string `json:"id" xml:"id"` // UserID is mapped to the preferred_name attribute in accounts
 	DisplayName       string `json:"display-name" xml:"display-name"`
 	LegacyDisplayName string `json:"displayname" xml:"displayname"`
 	Email             string `json:"email" xml:"email"`

diff --git a/extensions/settings/package.json b/extensions/settings/package.json
@@ -54,7 +54,7 @@
     "easygettext": "^2.7.0",
     "eslint": "7.32.0",
     "eslint-config-standard": "^16.0.2",
-    "eslint-plugin-import": "^2.24.1",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-promise": "^4.1.1",
     "eslint-plugin-standard": "^5.0.0",