From b76059531ae19091b8de8cbd2fe04036880cf446 Mon Sep 17 00:00:00 2001 From: Neil Dewhurst Date: Thu, 29 Aug 2024 11:26:29 +0100 Subject: [PATCH 1/2] fix deprecated bug and add comments --- src/js/60-docs-roles.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/js/60-docs-roles.js b/src/js/60-docs-roles.js index 4e9b3c92..d4d82d57 100644 --- a/src/js/60-docs-roles.js +++ b/src/js/60-docs-roles.js @@ -25,9 +25,20 @@ document.addEventListener('DOMContentLoaded', function () { var label = role.replace('label--', '') var labelParts = label.split('-') - // label could be eg aura-db-enterprise - we use the full label - // label could be eg new-5.20 - we use 'new' for the label and add the version as text - label = (rolesData[label] && rolesData[label].labelCategory !== 'version') ? label : labelParts.slice(0, -1).join('-') + + // roles can be single word ie beta - use beta as label class and text from rolesDatee.beta + // roles can be single word + version ie new-5.20 - use new as label class and text from rolesData.new + version number + // roles can be multiple words ie aura-db-enterprise - use aura-db-enterprise as label class and text from rolesData.aura-db-enterprise + // roles like deprecated can appear with or without a version number - deprecated-5.20 or deprecated + // - use deprecated as label class and text from rolesData.deprecated + // - use deprecated as label class and text from rolesData.deprecated + version number + + // so if the role is a single word, we use the role as is - ie deprecated + // if it is longer we test to see if it is a 'versionable' roke - ie deprecated-5.20 + // if it is a versionable role, and a veresion is specified, we remove the version and use the remaining text as the label class + if (labelParts.length >1) { + label = (rolesData[label] && rolesData[label].labelCategory !== 'version') ? label : labelParts.slice(0, -1).join('-') + } // ignore labels that are not defined in rolesData if (!rolesData[label]) { From d73c0c0d1afa1ee438cda698f8404db0482bc45b Mon Sep 17 00:00:00 2001 From: Neil Dewhurst Date: Thu, 29 Aug 2024 11:26:49 +0100 Subject: [PATCH 2/2] linted --- src/js/60-docs-roles.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/js/60-docs-roles.js b/src/js/60-docs-roles.js index d4d82d57..dc5eab26 100644 --- a/src/js/60-docs-roles.js +++ b/src/js/60-docs-roles.js @@ -25,7 +25,6 @@ document.addEventListener('DOMContentLoaded', function () { var label = role.replace('label--', '') var labelParts = label.split('-') - // roles can be single word ie beta - use beta as label class and text from rolesDatee.beta // roles can be single word + version ie new-5.20 - use new as label class and text from rolesData.new + version number // roles can be multiple words ie aura-db-enterprise - use aura-db-enterprise as label class and text from rolesData.aura-db-enterprise @@ -36,7 +35,7 @@ document.addEventListener('DOMContentLoaded', function () { // so if the role is a single word, we use the role as is - ie deprecated // if it is longer we test to see if it is a 'versionable' roke - ie deprecated-5.20 // if it is a versionable role, and a veresion is specified, we remove the version and use the remaining text as the label class - if (labelParts.length >1) { + if (labelParts.length > 1) { label = (rolesData[label] && rolesData[label].labelCategory !== 'version') ? label : labelParts.slice(0, -1).join('-') }