From f50a19baf3aaa7cabd49158152679f324305a1c8 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:38:55 +0300 Subject: [PATCH 1/4] fix(doc): version detection on doc.zyfra or prizm.site #1133 --- apps/doc/src/app/version-manager/util.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 apps/doc/src/app/version-manager/util.ts diff --git a/apps/doc/src/app/version-manager/util.ts b/apps/doc/src/app/version-manager/util.ts new file mode 100644 index 0000000000..e69de29bb2 From f67da8ef805891eadad0479f78a38f62899128c7 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:39:03 +0300 Subject: [PATCH 2/4] fix(doc): version detection on doc.zyfra or prizm.site #1133 --- apps/doc/src/app/version-manager/util.ts | 7 +++ .../version-manager.component.ts | 6 +- .../app/version-manager/versions.constants.ts | 62 +++++-------------- 3 files changed, 26 insertions(+), 49 deletions(-) diff --git a/apps/doc/src/app/version-manager/util.ts b/apps/doc/src/app/version-manager/util.ts index e69de29bb2..003ded1d46 100644 --- a/apps/doc/src/app/version-manager/util.ts +++ b/apps/doc/src/app/version-manager/util.ts @@ -0,0 +1,7 @@ +export function isInnerDoc() { + return window.location.host.includes('doc.prizm.site'); +} + +export function getDocSite(innerSite: string, tempSite: string) { + return new URL(isInnerDoc() ? innerSite : tempSite); +} diff --git a/apps/doc/src/app/version-manager/version-manager.component.ts b/apps/doc/src/app/version-manager/version-manager.component.ts index 97a2fb728d..7c614b0adf 100644 --- a/apps/doc/src/app/version-manager/version-manager.component.ts +++ b/apps/doc/src/app/version-manager/version-manager.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { Router } from '@angular/router'; import { LOCATION } from '@ng-web-apis/common'; @@ -33,7 +33,7 @@ export class VersionManagerComponent { if (this.locationRef.hostname !== 'localhost') { this.initialVersion = this.versions.find(version => - [version.link, ...version.otherLinks].find( + [version.link(), ...version.otherLinks].find( i => this.locationRef.hostname === i.hostname || version.cb?.(this.locationRef.hostname, version) ) ) ?? null; @@ -44,7 +44,7 @@ export class VersionManagerComponent { if (version.baseHref) { return `${this.locationRef.origin}/${version.baseHref}${this.router.url}${this.locationRef.search}`; } else { - return version.link?.href; + return version.link?.().href; } } } diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index d7c7b365c8..d7ad07c75c 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -1,6 +1,8 @@ +import { getDocSite } from './util'; + export interface PrizmVersionMeta { label: string; - link: URL; + link: () => URL; stackblitz: string | null; otherLinks: URL[]; version?: string; @@ -9,11 +11,21 @@ export interface PrizmVersionMeta { } export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ + { + label: '4.3.2 (ng17)', + version: '4.3.2', + stackblitz: 'https://stackblitz.com/edit/prizm-v4-demo', + link: getDocSite.bind(null, 'http://doc.prizm.site', 'http://prizm.site'), + otherLinks: [new URL('https://prizm-v3.web.app')], + cb: (hostName: string, current: PrizmVersionMeta) => { + return hostName.startsWith('prizm-v4--'); + }, + }, { label: '3.13.2 (ng16)', version: '3.13.2', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', - link: new URL('http://prizm.site'), + link: getDocSite.bind(null, 'http://3.12.0.doc.prizm.site', 'https://prizm-v3.web.app'), otherLinks: [new URL('https://prizm-v3.web.app')], cb: (hostName: string, current: PrizmVersionMeta) => { return hostName.startsWith('prizm-v3--'); @@ -23,7 +35,7 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ label: '2.14.2 (ng15)', version: '2.14.2', stackblitz: 'https://stackblitz.com/edit/prizm-v2-demo', - link: new URL('https://prizm-v2.web.app'), + link: getDocSite.bind(null, 'http://2.14.2.doc.prizm.site', 'https://prizm-v2.web.app'), otherLinks: [], cb: (hostName: string, current: PrizmVersionMeta) => { return hostName.startsWith('prizm-v2--'); @@ -33,52 +45,10 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ label: '1.17.2 (ng14)', version: '1.17.2', stackblitz: 'https://stackblitz.com/edit/prizm-v1-demo', - link: new URL('https://prizm-v1.web.app'), + link: getDocSite.bind(null, 'http://1.17.2.doc.prizm.site', 'https://prizm-v1.web.app'), otherLinks: [], cb: (hostName: string, current: PrizmVersionMeta) => { return hostName.startsWith('prizm-v1--'); }, }, - { - label: '3.13.2-next (ng16)', - version: '3.13.2-next', - stackblitz: 'https://stackblitz.com/edit/prizm-v3-next-demo', - link: new URL('https://prizm-v3-next.web.app'), - otherLinks: [], - }, - { - label: '2.14.2-next (ng15)', - stackblitz: 'https://stackblitz.com/edit/prizm-v2-next-demo', - version: '2.14.2-next', - link: new URL('https://prizm-v2-next.web.app'), - otherLinks: [], - }, - { - label: '1.17.2-next (ng14)', - version: '1.17.2-next', - stackblitz: 'https://stackblitz.com/edit/prizm-v1-next-demo', - link: new URL('https://prizm-v1-next.web.app'), - otherLinks: [], - }, - { - label: '3.13.2-beta (ng16)', - version: '3.13.2-beta', - stackblitz: 'https://stackblitz.com/edit/prizm-v3-beta-demo', - link: new URL('https://prizm-v3-beta.web.app'), - otherLinks: [], - }, - { - label: '2.14.2-beta (ng15)', - version: '2.14.2-beta', - stackblitz: 'https://stackblitz.com/edit/prizm-v2-beta-demo', - link: new URL('https://prizm-v2-beta.web.app'), - otherLinks: [], - }, - { - label: '1.17.2-beta (ng14)', - version: '1.17.2-beta', - stackblitz: 'https://stackblitz.com/edit/prizm-v1-beta-demo', - link: new URL('https://prizm-v1-beta.web.app'), - otherLinks: [], - }, ]; From 9b59b646e6cc17d88966ac4a4d9c7f61919bab08 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:57:16 +0300 Subject: [PATCH 3/4] Update apps/doc/src/app/version-manager/versions.constants.ts Co-authored-by: ickisIckis --- apps/doc/src/app/version-manager/versions.constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index d7ad07c75c..a1a975d3f4 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -25,7 +25,7 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ label: '3.13.2 (ng16)', version: '3.13.2', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', - link: getDocSite.bind(null, 'http://3.12.0.doc.prizm.site', 'https://prizm-v3.web.app'), + link: getDocSite.bind(null, 'http://3.13.2.doc.prizm.site', 'https://prizm-v3.web.app'), otherLinks: [new URL('https://prizm-v3.web.app')], cb: (hostName: string, current: PrizmVersionMeta) => { return hostName.startsWith('prizm-v3--'); From 7b87976fc39b8d06ac80e0fb990964f917b12134 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:30:32 +0300 Subject: [PATCH 4/4] fix(chore): update detector for multiple domains #1133 --- .github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md | 5 +++++ apps/doc/src/app/version-manager/util.ts | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md index 2a388a8eb9..4d6365f52b 100644 --- a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md +++ b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md @@ -24,6 +24,8 @@ ### Checklist: +- [ ] Изменить версии в соответствующем массиве на ветке MAIN + - apps/doc/src/app/version-manager/versions.constants.ts - [ ] Замените NEW_VERSION на новую версию в этом PR - [ ] Замените CURRENT_DATE на текущую дату в этом PR - [ ] Добавить в каждый тип ваши изменения в этом PR @@ -87,3 +89,6 @@ - [ ] libs/theme/package.json.ng15 - [ ] libs/theme/package.json.ng16 - [ ] Составить readMe файл с описанием изменений на русском +- [ ] Выпуск тега для v1 +- [ ] Выпуск тега для v2 +- [ ] Выпуск тега для v3 diff --git a/apps/doc/src/app/version-manager/util.ts b/apps/doc/src/app/version-manager/util.ts index 003ded1d46..77e42a902e 100644 --- a/apps/doc/src/app/version-manager/util.ts +++ b/apps/doc/src/app/version-manager/util.ts @@ -1,5 +1,7 @@ export function isInnerDoc() { - return window.location.host.includes('doc.prizm.site'); + return ( + window.location.host.includes('doc.prizm.site') || window.location.host.includes('doc.prizm.zyfra.com') + ); } export function getDocSite(innerSite: string, tempSite: string) {