diff --git a/ee/app/assets/javascripts/dependencies/components/dependency_location.vue b/ee/app/assets/javascripts/dependencies/components/dependency_location.vue index 4398209822f3d138e745d9c604f5487ee6e0552f..09dd5d9a00633b11f0620a36c45aa32331c89992 100644 --- a/ee/app/assets/javascripts/dependencies/components/dependency_location.vue +++ b/ee/app/assets/javascripts/dependencies/components/dependency_location.vue @@ -100,17 +100,9 @@ export default { <gl-popover :target="() => $refs.moreLink.$el" placement="top" - :title="s__('Dependencies|Dependency path')" + :title="s__('Dependencies|Direct dependents')" > <dependency-path-viewer :dependencies="ancestors" /> - - <!-- footer --> - <div class="gl-mt-4"> - <gl-icon class="!gl-align-middle" name="information" :size="12" variant="info" /> - <span class="gl-align-middle gl-text-subtle"> - {{ s__('Dependencies|There may be multiple paths') }} - </span> - </div> </gl-popover> </span> </gl-intersperse> diff --git a/ee/app/assets/javascripts/dependencies/constants.js b/ee/app/assets/javascripts/dependencies/constants.js index 9e812002b57af62d0e478bba68437a32be0f551d..f47d240fc1770aa577f6c3deea557ad4f7efd923 100644 --- a/ee/app/assets/javascripts/dependencies/constants.js +++ b/ee/app/assets/javascripts/dependencies/constants.js @@ -13,9 +13,9 @@ export const DEPENDENCIES_TABLE_I18N = { projects: s__('Dependencies|Projects'), vulnerabilities: s__('Dependencies|Vulnerabilities'), tooltipText: s__( - 'Dependencies|The component dependency path is based on the lock file. There may be several paths. In these cases, the longest path is displayed.', + 'Dependencies|The location includes the lock file. For transitive dependencies a list of its direct dependents is shown.', ), - tooltipMoreText: s__('Dependencies|Learn more about dependency paths'), - locationDependencyTitle: s__('Dependencies|Location and dependency path'), + tooltipMoreText: s__('Dependencies|Learn more about direct dependents'), + locationDependencyTitle: s__('Dependencies|List of direct dependents'), toggleVulnerabilityList: s__('Dependencies|Toggle vulnerability list'), }; diff --git a/ee/spec/frontend/dependencies/components/dependency_location_spec.js b/ee/spec/frontend/dependencies/components/dependency_location_spec.js index 63d54e4e9d03a4cd57304d4c37365188c6040d62..01c4f69faa5461ee1641c7d9249af66d831c02d1 100644 --- a/ee/spec/frontend/dependencies/components/dependency_location_spec.js +++ b/ee/spec/frontend/dependencies/components/dependency_location_spec.js @@ -56,7 +56,7 @@ describe('Dependency Location component', () => { it('should have the complete path', () => { expect(trimText(findPopover().text())).toBe( - 'swell 1.2 / emmajsq 10.11 / zeb 12.1 / post 2.5 / core 1.0 There may be multiple paths', + 'swell 1.2 / emmajsq 10.11 / zeb 12.1 / post 2.5 / core 1.0', ); }); }); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 356ed99456a642ab5845f317d945457f29430556..84c9c8ab28ce0850b23f656838c5e6f6c7faf4ee 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -18689,7 +18689,7 @@ msgstr "" msgid "Dependencies|Component name" msgstr "" -msgid "Dependencies|Dependency path" +msgid "Dependencies|Direct dependents" msgstr "" msgid "Dependencies|Error exporting the dependency list. Please reload the page." @@ -18704,16 +18704,16 @@ msgstr "" msgid "Dependencies|Filtering unavailable" msgstr "" -msgid "Dependencies|Learn more about dependency paths" +msgid "Dependencies|Learn more about direct dependents" msgstr "" msgid "Dependencies|License" msgstr "" -msgid "Dependencies|Location" +msgid "Dependencies|List of direct dependents" msgstr "" -msgid "Dependencies|Location and dependency path" +msgid "Dependencies|Location" msgstr "" msgid "Dependencies|Packager" @@ -18734,10 +18734,7 @@ msgstr "" msgid "Dependencies|Software Bill of Materials (SBOM) based on the latest successful scan of each project." msgstr "" -msgid "Dependencies|The component dependency path is based on the lock file. There may be several paths. In these cases, the longest path is displayed." -msgstr "" - -msgid "Dependencies|There may be multiple paths" +msgid "Dependencies|The location includes the lock file. For transitive dependencies a list of its direct dependents is shown." msgstr "" msgid "Dependencies|There was a problem fetching the licenses for this group."