diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-04 09:10:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-04 09:10:42 +0300 |
commit | f3f3149fc5249ad27378e4f2c22b8c3ff429a493 (patch) | |
tree | f50aec11527fd4f336bc0cf03387be828c66cd3c /app | |
parent | 0555f8b0429486b14e36f92152587030db33708c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/deprecated_notes.js | 21 | ||||
-rw-r--r-- | app/models/concerns/enums/package_metadata.rb | 6 | ||||
-rw-r--r-- | app/models/concerns/enums/sbom.rb | 6 |
3 files changed, 21 insertions, 12 deletions
diff --git a/app/assets/javascripts/deprecated_notes.js b/app/assets/javascripts/deprecated_notes.js index 70be08a8d7c..537c810bcff 100644 --- a/app/assets/javascripts/deprecated_notes.js +++ b/app/assets/javascripts/deprecated_notes.js @@ -1398,7 +1398,7 @@ export default class Notes { */ static isNewNote(noteEntity, note_ids) { if (note_ids.length === 0) { - Notes.loadNotesIds(note_ids); + note_ids = Notes.getNotesIds(); } const isNewEntry = $.inArray(noteEntity.id, note_ids) === -1; if (isNewEntry) { @@ -1408,16 +1408,17 @@ export default class Notes { } /** - * Load notes ids + * Get notes ids */ - static loadNotesIds(note_ids) { - const $notesList = $('.main-notes-list li[id^=note_]'); - for (const $noteItem of $notesList) { - if (Notes.isNodeTypeElement($noteItem)) { - const noteId = parseInt($noteItem.id.split('_')[1], 10); - note_ids.push(noteId); - } - } + static getNotesIds() { + /** + * The selector covers following notes + * - notes and thread below the snippets and commit page + * - notes on the file of commit page + * - notes on an image file of commit page + */ + const notesList = [...document.querySelectorAll('.notes:not(.notes-form) li[id]')]; + return notesList.map((noteItem) => parseInt(noteItem.dataset.noteId, 10)); } /** diff --git a/app/models/concerns/enums/package_metadata.rb b/app/models/concerns/enums/package_metadata.rb index e15fe758e69..abacee363c9 100644 --- a/app/models/concerns/enums/package_metadata.rb +++ b/app/models/concerns/enums/package_metadata.rb @@ -10,7 +10,11 @@ module Enums maven: 5, npm: 6, nuget: 7, - pypi: 8 + pypi: 8, + apk: 9, + rpm: 10, + deb: 11, + cbl_mariner: 12 }.with_indifferent_access.freeze def self.purl_types diff --git a/app/models/concerns/enums/sbom.rb b/app/models/concerns/enums/sbom.rb index 8848c0c5555..3ba911dbcc5 100644 --- a/app/models/concerns/enums/sbom.rb +++ b/app/models/concerns/enums/sbom.rb @@ -14,7 +14,11 @@ module Enums maven: 5, npm: 6, nuget: 7, - pypi: 8 + pypi: 8, + apk: 9, + rpm: 10, + deb: 11, + cbl_mariner: 12 }.with_indifferent_access.freeze def self.component_types |