Add suggestions

server/api/org.go

@@ -18,6 +18,7 @@ import (
 	"net/http"
 
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/model"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
 
 	"github.com/gin-gonic/gin"
@@ -31,6 +32,11 @@ func GetOrgPermissions(c *gin.Context) {
 		owner = c.Param("owner")
 	)
 
+	if user == nil {
+		c.JSON(http.StatusOK, &model.OrgPerm{})
+		return
+	}
+
 	perm, err := server.Config.Services.Membership.Get(c, user, owner)
 	if err != nil {
 		c.String(http.StatusInternalServerError, "Error getting membership for %q. %s", owner, err)

server/store/datastore/secret.go

@@ -28,10 +28,10 @@ func (s storage) SecretFind(repo *model.Repo, name string) (*model.Secret, error
 	return secret, wrapGet(s.engine.Get(secret))
 }
 
-func (s storage) SecretList(repo *model.Repo, all bool) ([]*model.Secret, error) {
+func (s storage) SecretList(repo *model.Repo, includeGlobalAndOrgSecrets bool) ([]*model.Secret, error) {
 	secrets := make([]*model.Secret, 0, perPage)
 	var cond builder.Cond = builder.Eq{"secret_repo_id": repo.ID}
-	if all {
+	if includeGlobalAndOrgSecrets {
 		cond = cond.Or(builder.Eq{"secret_owner": repo.Owner}).
 			Or(builder.And(builder.Eq{"secret_owner": ""}, builder.Eq{"secret_repo_id": 0}))
 	}

web/src/assets/locales/en.json

@@ -31,7 +31,7 @@
     "branches": "Branches",
     "add": "Add repository",
     "user_none": "This organization / user does not have any projects yet.",
-    "not_allowed": "Not allowed to access this repository",
+    "not_allowed": "You are not allowed to access this repository",
 
     "enable": {
       "reload": "Reload repositories",
@@ -43,7 +43,7 @@
 
     "settings": {
       "settings": "Settings",
-      "not_allowed": "Not allowed to access this repository's settings",
+      "not_allowed": "You are not allowed to access this repository's settings",
 
       "general": {
         "general": "General",
@@ -208,7 +208,7 @@
   "org": {
     "settings": {
       "settings": "Settings",
-      "not_allowed": "Not allowed to access this organization's settings",
+      "not_allowed": "You are not allowed to access this organization's settings",
 
       "secrets": {
         "secrets": "Secrets",
@@ -238,11 +238,12 @@
   "admin": {
     "settings": {
       "settings": "Settings",
-      "not_allowed": "Not allowed to access server settings",
+      "not_allowed": "You are not allowed to access server settings",
 
       "secrets": {
         "secrets": "Secrets",
         "desc": "Global secrets can be passed to all repositories individual pipeline steps at runtime as environmental variables.",
+        "warning": "These secrets will be available for all server users.",
         "none": "There are no global secrets yet.",
         "add": "Add secret",
         "save": "Save secret",

web/src/assets/locales/lv.json

@@ -243,6 +243,7 @@
       "secrets": {
         "secrets": "Noslēpumi",
         "desc": "Noslēpumus var padot visu repozitoriju individuāliem konvejerdarba soļiem izpildes laikā kā vides mainīgos.",
+        "warning": "Šie noslēpumi būs pieejami visiem servera lietotājiem.",
         "none": "Pagaidām nav neviena globālā noslēpuma.",
         "add": "Pievienot noslēpumu",
         "save": "Saglabāt noslēpumu",

web/src/components/admin/settings/AdminSecretsTab.vue

@@ -7,6 +7,7 @@
           {{ $t('admin.settings.secrets.desc') }}
           <DocsLink url="docs/usage/secrets" />
         </p>
+        <Warning :text="$t('admin.settings.secrets.warning')" />
       </div>
       <Button
         v-if="selectedSecret"
@@ -50,6 +51,7 @@ import { useI18n } from 'vue-i18n';
 
 import Button from '~/components/atomic/Button.vue';
 import DocsLink from '~/components/atomic/DocsLink.vue';
+import Warning from '~/components/atomic/Warning.vue';
 import Panel from '~/components/layout/Panel.vue';
 import SecretEdit from '~/components/secrets/SecretEdit.vue';
 import SecretList from '~/components/secrets/SecretList.vue';
@@ -74,6 +76,7 @@ export default defineComponent({
     DocsLink,
     SecretList,
     SecretEdit,
+    Warning,
   },
 
   setup() {

web/src/components/atomic/Warning.vue

@@ -0,0 +1,20 @@
+<template>
+  <div class="text-sm font-bold text-light-600 rounded-md border border-solid p-2 border-red-900 bg-red-600">
+    ⚠ {{ text }}
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  name: 'Warning',
+
+  props: {
+    text: {
+      type: String,
+      required: true,
+    },
+  },
+});
+</script>

web/src/lib/api/index.ts

@@ -5,13 +5,13 @@ import {
   BuildFeed,
   BuildLog,
   BuildProc,
+  OrgPermissions,
   Registry,
   Repo,
   RepoPermissions,
   RepoSettings,
   Secret,
 } from './types';
-import { OrgPermissions } from './types/org';
 
 type RepoListOptions = {
   all?: boolean;

web/src/router.ts

@@ -30,7 +30,6 @@ const routes: RouteRecordRaw[] = [
   },
   {
     path: '/org/:repoOwner',
-    name: 'org-wrapper',
     component: (): Component => import('~/views/org/OrgWrapper.vue'),
     props: true,
     children: [