From 60de35f5251719e55bd04fe5a0d73ab72d032b9b Mon Sep 17 00:00:00 2001 From: Max <135981901+max-nav@users.noreply.github.com> Date: Wed, 10 Jan 2024 13:40:21 +0100 Subject: [PATCH] Removed decorator-lens (#168) --- packages/client/src/main.ts | 4 - .../src/styles/decorator-lens.module.css | 7 -- packages/client/src/views/decorator-lens.ts | 80 ------------------- packages/server/src/render-index.ts | 8 +- packages/server/src/views/decorator-lens.ts | 67 ---------------- packages/server/src/views/index.ts | 3 - 6 files changed, 1 insertion(+), 168 deletions(-) delete mode 100644 packages/client/src/styles/decorator-lens.module.css delete mode 100644 packages/client/src/views/decorator-lens.ts delete mode 100644 packages/server/src/views/decorator-lens.ts diff --git a/packages/client/src/main.ts b/packages/client/src/main.ts index dcf1f558..3134e8da 100644 --- a/packages/client/src/main.ts +++ b/packages/client/src/main.ts @@ -9,8 +9,6 @@ import './main.css'; import { useLoadIfActiveSession } from './screensharing'; import './views/breadcrumb'; import './views/context-link'; -import './views/decorator-lens'; -import { attachLensListener } from './views/decorator-lens'; import './views/decorator-utils'; import './views/dropdown-menu'; import './views/language-selector'; @@ -52,8 +50,6 @@ onLoadListeners({ texts: window.__DECORATOR_DATA__.texts, }); -attachLensListener(); - if (window.__DECORATOR_DATA__.params.logoutWarning) { logoutWarningController(window.__DECORATOR_DATA__.params.logoutWarning, window.__DECORATOR_DATA__.texts); } diff --git a/packages/client/src/styles/decorator-lens.module.css b/packages/client/src/styles/decorator-lens.module.css deleted file mode 100644 index 17f09576..00000000 --- a/packages/client/src/styles/decorator-lens.module.css +++ /dev/null @@ -1,7 +0,0 @@ -.decoratorLens { - display: none; -} - -.decoratorLens.active { - display: block; -} diff --git a/packages/client/src/views/decorator-lens.ts b/packages/client/src/views/decorator-lens.ts deleted file mode 100644 index 037cf1e9..00000000 --- a/packages/client/src/views/decorator-lens.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { type Params } from 'decorator-shared/params'; -import html from 'decorator-shared/html'; -import cls from '../styles/decorator-lens.module.css'; - -declare global { - interface HTMLElementTagNameMap { - 'decorator-lens': DecoratorLens; - } -} - -export function attachLensListener() { - document.body.addEventListener('keydown', (e) => { - const lens = document.querySelector('decorator-lens') as DecoratorLens; - if (e.key === 'F4' && lens) { - lens.classList.toggle(cls.active); - } - }); -} - -export class DecoratorLens extends HTMLElement { - activeParams: Partial = {}; - explicitParams: Partial = {}; - - constructor() { - super(); - const template = document.getElementById( - 'decorator-lens-template', - ) as HTMLTemplateElement; - - if (template && template.content) { - const shadowRoot = this.attachShadow({ mode: 'open' }); - shadowRoot.appendChild(template.content.cloneNode(true)); - - this.activeParams = JSON.parse( - shadowRoot.querySelector('script#active-params')?.innerHTML ?? '{}', - ); - this.explicitParams = JSON.parse( - shadowRoot.querySelector('script#explicit-params')?.innerHTML ?? '{}', - ); - - const wrapper = shadowRoot.querySelector('#decorator-lens-wrapper'); - - if (!wrapper) { - return; - } - - //@TODO: Talk with terje and discuss a good interface for working with the decoratør - wrapper.innerHTML = html` -
-

Active params

-
    - ${Object.entries(this.activeParams).map(([key, value]) => { - return html`
  • - ${key}: ${value.toString()} -
    • `; - })} -
-
-
-

explicit params

-
    - ${Object.entries(this.explicitParams).map(([key, value]) => { - return html`
  • - ${key}: ${value.toString()} -
    • `; - })} -
-
- `.render(); - } - } -} - -customElements.define('decorator-lens', DecoratorLens); diff --git a/packages/server/src/render-index.ts b/packages/server/src/render-index.ts index 6312d537..682507e7 100644 --- a/packages/server/src/render-index.ts +++ b/packages/server/src/render-index.ts @@ -6,8 +6,7 @@ import { texts } from './texts'; import { GetFeatures } from './unleash-service'; import { Index } from './views'; import { DecoratorData } from './views/decorator-data'; -import { DecoratorLens } from './views/decorator-lens'; -import { DecoratorUtils } from './views/decorator-utils'; + import { DecoratorUtils } from './views/decorator-utils'; import { ComplexHeader } from './views/header/complex-header'; import { SimpleHeader } from './views/header/simple-header'; import { getSplashPage } from './views/splash-page'; @@ -75,11 +74,6 @@ export default async ({ features, texts: localTexts, }), - lens: DecoratorLens({ - origin, - env: data, - query, - }), decoratorData: DecoratorData({ texts: localTexts, params: data, diff --git a/packages/server/src/views/decorator-lens.ts b/packages/server/src/views/decorator-lens.ts deleted file mode 100644 index 040394e3..00000000 --- a/packages/server/src/views/decorator-lens.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { Params } from 'decorator-shared/params'; -import { formatParams } from 'decorator-shared/json'; -import html, { json, unsafeHtml } from 'decorator-shared/html'; -import cls from 'decorator-client/src/styles/decorator-lens.module.css'; - -export function DecoratorLens({ - origin, - env, - query, -}: { - origin: string; - query: Partial; - env: Partial; -}) { - return html` -
- ${DecoratorLensTemplate({ env, query })} -
-
-
- -
- `; -} - -export function DecoratorLensTemplate({ - env, - query, -}: { - env: Partial; - query: Partial; -}) { - return html` - - `; -} diff --git a/packages/server/src/views/index.ts b/packages/server/src/views/index.ts index 5460a8d3..d5c3001f 100644 --- a/packages/server/src/views/index.ts +++ b/packages/server/src/views/index.ts @@ -104,7 +104,6 @@ export function Index({ language, header, footer, - lens, decoratorData, maskDocument = false, main, @@ -112,7 +111,6 @@ export function Index({ language: Language; header: Template; footer: Template; - lens: Template; decoratorData: Template; maskDocument?: boolean; main?: Template; @@ -202,7 +200,6 @@ export function Index({ - ${lens}