YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #407 from YunoHost/support-moar-git-urls

Browse source 
[enh] Support github-independent repo urls and/or pointing to specific branches
This commit is contained in:
Alexandre Aubin 2021-10-01 17:17:07 +02:00 • committed by GitHub
commit d07501aaae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/helpers/validators/customValidators.js
View file

@ -34,7 +34,7 @@ const emailForward = value => helpers.withParams(
} }
)(value) )(value)
const githubLink = helpers.regex('githubLink', /^https:\/\/github.com\/[a-zA-Z0-9-_.]+\/[a-zA-Z0-9-_.]+[/]?$/) const appRepoUrl = helpers.regex('appRepoUrl', /^https:\/\/[a-zA-Z0-9-_.]+\/[a-zA-Z0-9-_./]+\/[a-zA-Z0-9-_.]+_ynh(\/?(-\/)?tree\/[a-zA-Z0-9-_]+)?(\.git)?\/?$/)
const includes = items => item => helpers.withParams( const includes = items => item => helpers.withParams(
{ type: 'includes', value: item }, { type: 'includes', value: item },
@ -56,7 +56,7 @@ export {
emailForward, emailForward,
emailForwardLocalPart, emailForwardLocalPart,
emailLocalPart, emailLocalPart,
githubLink, appRepoUrl,
includes, includes,
name, name,
unique unique

2
app/src/i18n/locales/en.json
View file

@ -195,7 +195,7 @@
"dynDomain": "Invalid domain name: Must be lower-case alphanumeric and dash characters only", "dynDomain": "Invalid domain name: Must be lower-case alphanumeric and dash characters only",
"email": "Invalid email: must be alphanumeric and <code>_.-</code> characters only (e.g. someone@example.com, s0me-1@example.com)", "email": "Invalid email: must be alphanumeric and <code>_.-</code> characters only (e.g. someone@example.com, s0me-1@example.com)",
"emailForward": "Invalid email forward: must be alphanumeric and <code>_.-+</code> characters only (e.g. someone+tag@example.com, s0me-1+tag@example.com)", "emailForward": "Invalid email forward: must be alphanumeric and <code>_.-+</code> characters only (e.g. someone+tag@example.com, s0me-1+tag@example.com)",
"githubLink": "URL must be a valid GitHub link to a repository", "appRepoUrl": "YunoHost app repository URLs are expected to look like https://domain.tld/path/to/repo_ynh",
"name": "Names may not includes special characters except <code> ,.'-</code>", "name": "Names may not includes special characters except <code> ,.'-</code>",
"minValue": "Value must be a number equal or greater than {min}.", "minValue": "Value must be a number equal or greater than {min}.",
"maxValue": "Value must be a number equal or lesser than {max}.", "maxValue": "Value must be a number equal or lesser than {max}.",

2
app/src/i18n/locales/fr.json
View file

@ -374,7 +374,7 @@
"notInUsers": "L'utilisateur '{value}' existe déjà.", "notInUsers": "L'utilisateur '{value}' existe déjà.",
"minValue": "La valeur doit être un nombre égal ou supérieur à {min}.", "minValue": "La valeur doit être un nombre égal ou supérieur à {min}.",
"name": "Les noms ne peuvent pas comporter de caractères spéciaux, sauf <code> ,.'-</code>", "name": "Les noms ne peuvent pas comporter de caractères spéciaux, sauf <code> ,.'-</code>",
"githubLink": "L'URL doit être un lien GitHub valide vers un dépôt", "appRepoUrl": "Les URLs de dêpôt d'app YunoHost doivent ressembler à https://domain.tld/path/to/repo_ynh",
"emailForward": "Adresse de transfert de courrier électronique invalide : elle doit être composée de caractères alphanumérique et de <code>_.-+</code> seulement (par exemple, someone+tag@example.com, s0me-1+tag@example.com)", "emailForward": "Adresse de transfert de courrier électronique invalide : elle doit être composée de caractères alphanumérique et de <code>_.-+</code> seulement (par exemple, someone+tag@example.com, s0me-1+tag@example.com)",
"email": "Adresse de courriel invalide : elle doit être composée de caractères alphanumérique et des caractères <code>_.-</code> seulement (par exemple someone@example.com, s0me-1@example.com)", "email": "Adresse de courriel invalide : elle doit être composée de caractères alphanumérique et des caractères <code>_.-</code> seulement (par exemple someone@example.com, s0me-1@example.com)",
"dynDomain": "Nom de domaine invalide : Il doit être composé de minuscules alphanumériques et de tirets uniquement", "dynDomain": "Nom de domaine invalide : Il doit être composé de minuscules alphanumériques et de tirets uniquement",

5
app/src/views/app/AppCatalog.vue
View file

@ -160,7 +160,8 @@
import { validationMixin } from 'vuelidate' import { validationMixin } from 'vuelidate'
import LazyRenderer from '@/components/LazyRenderer' import LazyRenderer from '@/components/LazyRenderer'
import { required, githubLink } from '@/helpers/validators' import { required, appRepoUrl } from '@/helpers/validators'
import { randint } from '@/helpers/commons' import { randint } from '@/helpers/commons'
export default { export default {
@ -258,7 +259,7 @@ export default {
validations: { validations: {
customInstall: { customInstall: {
url: { required, githubLink } url: { required, appRepoUrl }
} }
}, },