Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0b2fcf0f
Commit
0b2fcf0f
authored
Sep 08, 2021
by
Nicolò Maria Mezzopera
Committed by
Natalia Tepluhina
Sep 08, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Display available metadata for Composer"
parent
909d6c74
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
90 additions
and
8 deletions
+90
-8
app/assets/javascripts/packages_and_registries/package_registry/components/details/additional_metadata.vue
...ckage_registry/components/details/additional_metadata.vue
+43
-3
locale/gitlab.pot
locale/gitlab.pot
+9
-0
spec/frontend/packages_and_registries/package_registry/components/details/additional_metadata_spec.js
...e_registry/components/details/additional_metadata_spec.js
+38
-5
No files found.
app/assets/javascripts/packages_and_registries/package_registry/components/details/additional_metadata.vue
View file @
0b2fcf0f
...
@@ -5,7 +5,9 @@ import {
...
@@ -5,7 +5,9 @@ import {
PACKAGE_TYPE_NUGET
,
PACKAGE_TYPE_NUGET
,
PACKAGE_TYPE_CONAN
,
PACKAGE_TYPE_CONAN
,
PACKAGE_TYPE_MAVEN
,
PACKAGE_TYPE_MAVEN
,
PACKAGE_TYPE_COMPOSER
,
}
from
'
~/packages_and_registries/package_registry/constants
'
;
}
from
'
~/packages_and_registries/package_registry/constants
'
;
import
ClipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
import
DetailsRow
from
'
~/vue_shared/components/registry/details_row.vue
'
;
import
DetailsRow
from
'
~/vue_shared/components/registry/details_row.vue
'
;
export
default
{
export
default
{
...
@@ -15,11 +17,17 @@ export default {
...
@@ -15,11 +17,17 @@ export default {
recipeText
:
s__
(
'
PackageRegistry|Recipe: %{recipe}
'
),
recipeText
:
s__
(
'
PackageRegistry|Recipe: %{recipe}
'
),
appGroup
:
s__
(
'
PackageRegistry|App group: %{group}
'
),
appGroup
:
s__
(
'
PackageRegistry|App group: %{group}
'
),
appName
:
s__
(
'
PackageRegistry|App name: %{name}
'
),
appName
:
s__
(
'
PackageRegistry|App name: %{name}
'
),
targetShaCopyButton
:
s__
(
'
PackageRegistry|Copy target SHA
'
),
targetSha
:
s__
(
'
PackageRegistry|Target SHA: %{sha}
'
),
composerJson
:
s__
(
'
PackageRegistry|Composer.json with license: %{license} and version: %{version}
'
,
),
},
},
components
:
{
components
:
{
DetailsRow
,
DetailsRow
,
GlLink
,
GlLink
,
GlSprintf
,
GlSprintf
,
ClipboardButton
,
},
},
props
:
{
props
:
{
packageEntity
:
{
packageEntity
:
{
...
@@ -30,9 +38,12 @@ export default {
...
@@ -30,9 +38,12 @@ export default {
computed
:
{
computed
:
{
showMetadata
()
{
showMetadata
()
{
return
(
return
(
[
PACKAGE_TYPE_NUGET
,
PACKAGE_TYPE_CONAN
,
PACKAGE_TYPE_MAVEN
].
includes
(
[
this
.
packageEntity
.
packageType
,
PACKAGE_TYPE_NUGET
,
)
&&
this
.
packageEntity
.
metadata
PACKAGE_TYPE_CONAN
,
PACKAGE_TYPE_MAVEN
,
PACKAGE_TYPE_COMPOSER
,
].
includes
(
this
.
packageEntity
.
packageType
)
&&
this
.
packageEntity
.
metadata
);
);
},
},
showNugetMetadata
()
{
showNugetMetadata
()
{
...
@@ -44,6 +55,9 @@ export default {
...
@@ -44,6 +55,9 @@ export default {
showMavenMetadata
()
{
showMavenMetadata
()
{
return
this
.
packageEntity
.
packageType
===
PACKAGE_TYPE_MAVEN
;
return
this
.
packageEntity
.
packageType
===
PACKAGE_TYPE_MAVEN
;
},
},
showComposerMetadata
()
{
return
this
.
packageEntity
.
packageType
===
PACKAGE_TYPE_COMPOSER
;
},
},
},
};
};
</
script
>
</
script
>
...
@@ -101,6 +115,32 @@ export default {
...
@@ -101,6 +115,32 @@ export default {
</gl-sprintf>
</gl-sprintf>
</details-row>
</details-row>
</template>
</template>
<
template
v-else-if=
"showComposerMetadata"
>
<details-row
icon=
"information-o"
padding=
"gl-p-4"
dashed
data-testid=
"composer-target-sha"
>
<gl-sprintf
:message=
"$options.i18n.targetSha"
>
<template
#sha
>
<strong>
{{
packageEntity
.
metadata
.
targetSha
}}
</strong>
<clipboard-button
:title=
"$options.i18n.targetShaCopyButton"
:text=
"packageEntity.metadata.targetSha"
category=
"tertiary"
css-class=
"gl-p-0!"
/>
</
template
>
</gl-sprintf>
</details-row>
<details-row
icon=
"information-o"
padding=
"gl-p-4"
data-testid=
"composer-json"
>
<gl-sprintf
:message=
"$options.i18n.composerJson"
>
<
template
#license
>
<strong>
{{
packageEntity
.
metadata
.
composerJson
.
license
}}
</strong>
</
template
>
<
template
#version
>
<strong>
{{
packageEntity
.
metadata
.
composerJson
.
version
}}
</strong>
</
template
>
</gl-sprintf>
</details-row>
</template>
</div>
</div>
</div>
</div>
</template>
</template>
locale/gitlab.pot
View file @
0b2fcf0f
...
@@ -23798,6 +23798,9 @@ msgstr ""
...
@@ -23798,6 +23798,9 @@ msgstr ""
msgid "PackageRegistry|Composer"
msgid "PackageRegistry|Composer"
msgstr ""
msgstr ""
msgid "PackageRegistry|Composer.json with license: %{license} and version: %{version}"
msgstr ""
msgid "PackageRegistry|Conan"
msgid "PackageRegistry|Conan"
msgstr ""
msgstr ""
...
@@ -23861,6 +23864,9 @@ msgstr ""
...
@@ -23861,6 +23864,9 @@ msgstr ""
msgid "PackageRegistry|Copy require package include"
msgid "PackageRegistry|Copy require package include"
msgstr ""
msgstr ""
msgid "PackageRegistry|Copy target SHA"
msgstr ""
msgid "PackageRegistry|Copy yarn command"
msgid "PackageRegistry|Copy yarn command"
msgstr ""
msgstr ""
...
@@ -24035,6 +24041,9 @@ msgstr ""
...
@@ -24035,6 +24041,9 @@ msgstr ""
msgid "PackageRegistry|Source project located at %{link}"
msgid "PackageRegistry|Source project located at %{link}"
msgstr ""
msgstr ""
msgid "PackageRegistry|Target SHA: %{sha}"
msgstr ""
msgid "PackageRegistry|There are no other versions of this package."
msgid "PackageRegistry|There are no other versions of this package."
msgstr ""
msgstr ""
...
...
spec/frontend/packages_and_registries/package_registry/components/details/additional_metadata_spec.js
View file @
0b2fcf0f
...
@@ -5,6 +5,7 @@ import {
...
@@ -5,6 +5,7 @@ import {
mavenMetadata
,
mavenMetadata
,
nugetMetadata
,
nugetMetadata
,
packageData
,
packageData
,
composerMetadata
,
}
from
'
jest/packages_and_registries/package_registry/mock_data
'
;
}
from
'
jest/packages_and_registries/package_registry/mock_data
'
;
import
component
from
'
~/packages_and_registries/package_registry/components/details/additional_metadata.vue
'
;
import
component
from
'
~/packages_and_registries/package_registry/components/details/additional_metadata.vue
'
;
import
{
import
{
...
@@ -12,12 +13,15 @@ import {
...
@@ -12,12 +13,15 @@ import {
PACKAGE_TYPE_CONAN
,
PACKAGE_TYPE_CONAN
,
PACKAGE_TYPE_MAVEN
,
PACKAGE_TYPE_MAVEN
,
PACKAGE_TYPE_NPM
,
PACKAGE_TYPE_NPM
,
PACKAGE_TYPE_COMPOSER
,
}
from
'
~/packages_and_registries/package_registry/constants
'
;
}
from
'
~/packages_and_registries/package_registry/constants
'
;
import
ClipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
import
DetailsRow
from
'
~/vue_shared/components/registry/details_row.vue
'
;
import
DetailsRow
from
'
~/vue_shared/components/registry/details_row.vue
'
;
const
mavenPackage
=
{
packageType
:
PACKAGE_TYPE_MAVEN
,
metadata
:
mavenMetadata
()
};
const
mavenPackage
=
{
packageType
:
PACKAGE_TYPE_MAVEN
,
metadata
:
mavenMetadata
()
};
const
conanPackage
=
{
packageType
:
PACKAGE_TYPE_CONAN
,
metadata
:
conanMetadata
()
};
const
conanPackage
=
{
packageType
:
PACKAGE_TYPE_CONAN
,
metadata
:
conanMetadata
()
};
const
nugetPackage
=
{
packageType
:
PACKAGE_TYPE_NUGET
,
metadata
:
nugetMetadata
()
};
const
nugetPackage
=
{
packageType
:
PACKAGE_TYPE_NUGET
,
metadata
:
nugetMetadata
()
};
const
composerPackage
=
{
packageType
:
PACKAGE_TYPE_COMPOSER
,
metadata
:
composerMetadata
()
};
const
npmPackage
=
{
packageType
:
PACKAGE_TYPE_NPM
,
metadata
:
{}
};
const
npmPackage
=
{
packageType
:
PACKAGE_TYPE_NPM
,
metadata
:
{}
};
describe
(
'
Package Additional Metadata
'
,
()
=>
{
describe
(
'
Package Additional Metadata
'
,
()
=>
{
...
@@ -51,6 +55,9 @@ describe('Package Additional Metadata', () => {
...
@@ -51,6 +55,9 @@ describe('Package Additional Metadata', () => {
const
findMavenApp
=
()
=>
wrapper
.
findByTestId
(
'
maven-app
'
);
const
findMavenApp
=
()
=>
wrapper
.
findByTestId
(
'
maven-app
'
);
const
findMavenGroup
=
()
=>
wrapper
.
findByTestId
(
'
maven-group
'
);
const
findMavenGroup
=
()
=>
wrapper
.
findByTestId
(
'
maven-group
'
);
const
findElementLink
=
(
container
)
=>
container
.
findComponent
(
GlLink
);
const
findElementLink
=
(
container
)
=>
container
.
findComponent
(
GlLink
);
const
findComposerTargetSha
=
()
=>
wrapper
.
findByTestId
(
'
composer-target-sha
'
);
const
findComposerTargetShaCopyButton
=
()
=>
wrapper
.
findComponent
(
ClipboardButton
);
const
findComposerJson
=
()
=>
wrapper
.
findByTestId
(
'
composer-json
'
);
it
(
'
has the correct title
'
,
()
=>
{
it
(
'
has the correct title
'
,
()
=>
{
mountComponent
();
mountComponent
();
...
@@ -62,11 +69,12 @@ describe('Package Additional Metadata', () => {
...
@@ -62,11 +69,12 @@ describe('Package Additional Metadata', () => {
});
});
it
.
each
`
it
.
each
`
packageEntity | visible | packageType
packageEntity | visible | packageType
${
mavenPackage
}
|
${
true
}
|
${
PACKAGE_TYPE_MAVEN
}
${
mavenPackage
}
|
${
true
}
|
${
PACKAGE_TYPE_MAVEN
}
${
conanPackage
}
|
${
true
}
|
${
PACKAGE_TYPE_CONAN
}
${
conanPackage
}
|
${
true
}
|
${
PACKAGE_TYPE_CONAN
}
${
nugetPackage
}
|
${
true
}
|
${
PACKAGE_TYPE_NUGET
}
${
nugetPackage
}
|
${
true
}
|
${
PACKAGE_TYPE_NUGET
}
${
npmPackage
}
|
${
false
}
|
${
PACKAGE_TYPE_NPM
}
${
composerPackage
}
|
${
true
}
|
${
PACKAGE_TYPE_COMPOSER
}
${
npmPackage
}
|
${
false
}
|
${
PACKAGE_TYPE_NPM
}
`
(
`
(
`It is $visible that the component is visible when the package is $packageType`
,
`It is $visible that the component is visible when the package is $packageType`
,
({
packageEntity
,
visible
})
=>
{
({
packageEntity
,
visible
})
=>
{
...
@@ -127,4 +135,29 @@ describe('Package Additional Metadata', () => {
...
@@ -127,4 +135,29 @@ describe('Package Additional Metadata', () => {
expect
(
element
.
props
(
'
icon
'
)).
toBe
(
icon
);
expect
(
element
.
props
(
'
icon
'
)).
toBe
(
icon
);
});
});
});
});
describe
(
'
composer metadata
'
,
()
=>
{
beforeEach
(()
=>
{
mountComponent
({
packageEntity
:
composerPackage
});
});
it
.
each
`
name | finderFunction | text | icon
${
'
target-sha
'
}
|
${
findComposerTargetSha
}
|
${
'
Target SHA: b83d6e391c22777fca1ed3012fce84f633d7fed0
'
}
|
${
'
information-o
'
}
${
'
composer-json
'
}
|
${
findComposerJson
}
|
${
'
Composer.json with license: MIT and version: 1.0.0
'
}
|
${
'
information-o
'
}
`
(
'
$name element
'
,
({
finderFunction
,
text
,
icon
})
=>
{
const
element
=
finderFunction
();
expect
(
element
.
exists
()).
toBe
(
true
);
expect
(
element
.
text
()).
toBe
(
text
);
expect
(
element
.
props
(
'
icon
'
)).
toBe
(
icon
);
});
it
(
'
target-sha has a copy button
'
,
()
=>
{
expect
(
findComposerTargetShaCopyButton
().
exists
()).
toBe
(
true
);
expect
(
findComposerTargetShaCopyButton
().
props
()).
toMatchObject
({
text
:
'
b83d6e391c22777fca1ed3012fce84f633d7fed0
'
,
title
:
'
Copy target SHA
'
,
});
});
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment