Skip to content

Commit

Permalink
fix(doc): version detection on doc.zyfra or prizm.site #1133
Browse files Browse the repository at this point in the history
  • Loading branch information
ZurabDev committed Jun 7, 2024
1 parent f6e8708 commit b21b320
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 58 deletions.
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

### Checklist:

- [ ] Изменить версии в соответствующем массиве на ветке MAIN
- apps/doc/src/app/version-manager/versions.constants.ts
- [ ] Замените NEW_VERSION на новую версию в этом PR
- [ ] Замените CURRENT_DATE на текущую дату в этом PR
- [ ] Добавить в каждый тип ваши изменения в этом PR
Expand Down
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

### Checklist:

- [ ] Изменить версии в соответствующем массиве на ветке V3
- apps/doc/src/app/version-manager/versions.constants.ts
- [ ] Замените NEW_VERSION на новую версию в этом PR
- [ ] Замените CURRENT_DATE на текущую дату в этом PR
- [ ] Добавить в каждый тип ваши изменения в этом PR
Expand Down
7 changes: 7 additions & 0 deletions apps/doc/src/app/version-manager/util.ts
Original file line number Diff line number Diff line change
@@ -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);
}
7 changes: 3 additions & 4 deletions apps/doc/src/app/version-manager/version-manager.component.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -12,7 +12,6 @@ import {
import { PRIZM_CURRENT_VERSION } from './current.const';
import { LanguageManagerService } from './language-manager.service';
import { PrizmLanguageSwitcher } from '@prizm-ui/i18n';
import { tap } from 'rxjs/operators';

@Component({
selector: 'prizm-version-manager',
Expand Down Expand Up @@ -44,7 +43,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;
Expand All @@ -55,7 +54,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;
}
}

Expand Down
61 changes: 7 additions & 54 deletions apps/doc/src/app/version-manager/versions.constants.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { PrizmLanguageName } from '@prizm-ui/i18n';
import { getDocSite } from './util';

export interface PrizmVersionMeta {
label: string;
link: URL;
link: () => URL;
stackblitz: string | null;
otherLinks: URL[];
version?: string;
Expand Down Expand Up @@ -30,7 +31,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [
label: '4.3.1 (ng17)',
version: '4.3.1',
stackblitz: 'https://stackblitz.com/edit/prizm-v4-demo',
link: new URL('http://prizm.site'),
link: getDocSite.bind(null, 'https://doc.prizm.zyfra.com', 'http://prizm.site'),

otherLinks: [new URL('https://prizm-v4.web.app')],
cb: (hostName: string, current: PrizmVersionMeta) => {
return hostName.startsWith('prizm-v4--');
Expand All @@ -40,7 +42,7 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [
label: '3.12.0 (ng16)',
version: '3.12.0',
stackblitz: 'https://stackblitz.com/edit/prizm-v2-demo',
link: new URL('https://prizm-v3.web.app'),
link: getDocSite.bind(null, 'http://3.12.0.doc.prizm.site', 'https://prizm-v3.web.app'),
otherLinks: [],
cb: (hostName: string, current: PrizmVersionMeta) => {
return hostName.startsWith('prizm-v3--');
Expand All @@ -50,7 +52,7 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [
label: '2.13.0 (ng15)',
version: '2.13.0',
stackblitz: 'https://stackblitz.com/edit/prizm-v2-demo',
link: new URL('https://prizm-v2.web.app'),
link: getDocSite.bind(null, 'http://2.13.0.doc.prizm.site', 'https://prizm-v2.web.app'),
otherLinks: [],
cb: (hostName: string, current: PrizmVersionMeta) => {
return hostName.startsWith('prizm-v2--');
Expand All @@ -60,59 +62,10 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [
label: '1.16.0 (ng14)',
version: '1.16.0',
stackblitz: 'https://stackblitz.com/edit/prizm-v1-demo',
link: new URL('https://prizm-v1.web.app'),
link: getDocSite.bind(null, 'http://1.16.0.doc.prizm.site', 'https://prizm-v1.web.app'),
otherLinks: [],
cb: (hostName: string, current: PrizmVersionMeta) => {
return hostName.startsWith('prizm-v1--');
},
},
{
label: '4.3.1-next (ng16)',
version: '4.3.1-next',
stackblitz: 'https://stackblitz.com/edit/prizm-v4-next-demo',
link: new URL('https://prizm-v4-next.web.app'),
otherLinks: [],
},
{
label: '3.12.0-next (ng16)',
version: '3.12.0-next',
stackblitz: 'https://stackblitz.com/edit/prizm-v3-next-demo',
link: new URL('https://prizm-v3-next.web.app'),
otherLinks: [],
},
{
label: '2.13.0-next (ng15)',
stackblitz: 'https://stackblitz.com/edit/prizm-v2-next-demo',
version: '2.13.0-next',
link: new URL('https://prizm-v2-next.web.app'),
otherLinks: [],
},
{
label: '1.16.0-next (ng14)',
version: '1.16.0-next',
stackblitz: 'https://stackblitz.com/edit/prizm-v1-next-demo',
link: new URL('https://prizm-v1-next.web.app'),
otherLinks: [],
},
// {
// label: '3.9.0-beta (ng16)',
// version: '3.9.0-beta',
// stackblitz: 'https://stackblitz.com/edit/prizm-v3-beta-demo',
// link: new URL('https://prizm-v3-beta.web.app'),
// otherLinks: [],
// },
// {
// label: '2.10.0-beta (ng15)',
// version: '2.10.0-beta',
// stackblitz: 'https://stackblitz.com/edit/prizm-v2-beta-demo',
// link: new URL('https://prizm-v2-beta.web.app'),
// otherLinks: [],
// },
// {
// label: '1.13.0-beta (ng14)',
// version: '1.13.0-beta',
// stackblitz: 'https://stackblitz.com/edit/prizm-v1-beta-demo',
// link: new URL('https://prizm-v1-beta.web.app'),
// otherLinks: [],
// },
];

0 comments on commit b21b320

Please sign in to comment.