- Notifications
You must be signed in to change notification settings - Fork165
Updated Auto-Redirect Flow for Segments#1339
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
5 commits Select commitHold shift + click to select a range
ba100da CR-29590
olegt-codefreshac333f4 After review fix
olegt-codefresh73b83c4 swap commandbarSegment values for correct configuration
olegt-codefresh90032c1 CR-29589
olegt-codefreshf85350c docs: Exclude gitops collection pages from Sitemap.xml
olegt-codefreshFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -129,6 +129,7 @@ defaults: | ||
| type: gitops | ||
| values: | ||
| layout: gitops | ||
| sitemap: false | ||
| toc: true | ||
| wide: true | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,157 @@ | ||
| constGITOPS_DOC_COOKIE='cfdoctype=gitops' | ||
| constIS_GITOPS_DOC_COOKIE_SET=document.cookie.includes(GITOPS_DOC_COOKIE) | ||
| handleRedirect() | ||
| asyncfunctiongetArgoHubRedirectURL(currentPath){ | ||
| currentPath=currentPath.replace(SITE_BASE_URL,'') | ||
| constredirectMap=awaitfetchRedirectMap() | ||
| constnewPath=redirectMap[currentPath] | ||
| if(!newPath)returnnull | ||
| constnewURL= | ||
| newPath===`/${SITE_GITOPS_COLLECTION}/` | ||
| ?`${location.href}${SITE_GITOPS_COLLECTION}` | ||
| :location.href.replace(currentPath,newPath) | ||
| returnnewURL | ||
| } | ||
| asyncfunctionhandleRedirect(){ | ||
Contributor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. if gitops cookie is removed, but user is trying to reach gitops page, we will not redirect him to enterprise? ContributorAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. At this stage, we will maintain a one-way redirect and extend it if necessary. | ||
| if(SITE_IS_GITOPS_COLLECTION||!IS_GITOPS_DOC_COOKIE_SET)return | ||
| constargoHubRedirectURL=awaitgetArgoHubRedirectURL(location.pathname) | ||
| if(!argoHubRedirectURL)return | ||
| location.href=argoHubRedirectURL | ||
| } | ||
| asyncfunctionfetchRedirectMap(){ | ||
| constresponse=awaitfetch(`${SITE_BASE_URL}/assets/js/src/argohub-redirect-mapping.json`) | ||
| if(!response.ok){ | ||
| thrownewError('Failed to fetch the collections redirect map.') | ||
| } | ||
| returnresponse.json() | ||
| } | ||
| functionsetGitOpsDocumentationCookie(){ | ||
| constmaxAge=2592000 | ||
| configureGitOpsDocumentationCookie(maxAge) | ||
| } | ||
| functionremoveGitOpsDocumentationCookie(){ | ||
| configureGitOpsDocumentationCookie(0) | ||
| } | ||
| functionconfigureGitOpsDocumentationCookie(maxAge){ | ||
| letcookie=`${GITOPS_DOC_COOKIE}; Max-Age=${maxAge}; Path=/; SameSite=Strict` | ||
| if(location.protocol==='https:'){ | ||
| cookie+='; Secure' | ||
| } | ||
| if(location.hostname.endsWith('.codefresh.io')){ | ||
| cookie+='; Domain=.codefresh.io' | ||
| } | ||
| document.cookie=cookie | ||
| } | ||
| functiontoggleSegmentDropdown(){ | ||
| constselect=document.querySelector('.custom-select') | ||
| select.classList.toggle('open') | ||
| } | ||
| functionhandleDropdownKeydown(event){ | ||
| constselect=document.querySelector('.custom-select') | ||
| constoptions=select.querySelectorAll('.option') | ||
| constisOpen=select.classList.contains('open') | ||
| switch(event.key){ | ||
| case'Enter': | ||
| case' ': | ||
| event.preventDefault() | ||
| toggleSegmentDropdown() | ||
| break | ||
| case'ArrowDown': | ||
| event.preventDefault() | ||
| if(!isOpen)toggleSegmentDropdown() | ||
| options[0].focus() | ||
| break | ||
| case'Escape': | ||
| if(isOpen)toggleSegmentDropdown() | ||
| break | ||
| } | ||
| } | ||
| functionhandleOptionKeydown(event,option,selectedValue){ | ||
| constselect=document.querySelector('.custom-select') | ||
| constoptions=select.querySelectorAll('.option') | ||
| constcurrentIndex=Array.from(options).indexOf(option) | ||
| switch(event.key){ | ||
| case'Enter': | ||
| case' ': | ||
| event.preventDefault() | ||
| selectSegmentOption(option,selectedValue) | ||
| break | ||
| case'ArrowDown': | ||
| event.preventDefault() | ||
| if(currentIndex<options.length-1){ | ||
| options[currentIndex+1].focus() | ||
| } | ||
| break | ||
| case'ArrowUp': | ||
| event.preventDefault() | ||
| if(currentIndex>0){ | ||
| options[currentIndex-1].focus() | ||
| } | ||
| break | ||
| case'Escape': | ||
| select.classList.remove('open') | ||
| select.querySelector('.select-display').focus() | ||
| break | ||
| } | ||
| } | ||
| asyncfunctionselectSegmentOption(option,selectedValue){ | ||
| constselectDisplay=document.querySelector('.select-display') | ||
| selectDisplay.textContent=option.textContent | ||
| constredirectMap=awaitfetchRedirectMap() | ||
| constpathname=window.location.pathname | ||
| constcurrentPath=pathname.replace(SITE_BASE_URL,'') | ||
| if(selectedValue==='enterprise'){ | ||
| removeGitOpsDocumentationCookie() | ||
| constenterprisePath=Object.keys(redirectMap).find((key)=>redirectMap[key]===currentPath) | ||
| if(enterprisePath){ | ||
| window.location.href=`${SITE_BASE_URL}${enterprisePath}` | ||
| }else{ | ||
| window.location.href=`${SITE_BASE_URL}/` | ||
| } | ||
| }elseif(selectedValue==='gitops'){ | ||
| setGitOpsDocumentationCookie() | ||
| constgitOpsPath=redirectMap[currentPath] | ||
| if(gitOpsPath){ | ||
| window.location.href=`${SITE_BASE_URL}${gitOpsPath}` | ||
| }else{ | ||
| window.location.href=`${SITE_BASE_URL}/${SITE_GITOPS_COLLECTION}/` | ||
| } | ||
| } | ||
| } | ||
| document.addEventListener('click',(e)=>{ | ||
| constselect=document.querySelector('.custom-select') | ||
| if(!select.contains(e.target)){ | ||
| select.classList.remove('open') | ||
| } | ||
| }) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.