From f1187bc3fdd2a7fb63e53b69091e6e4f9a5b4a13 Mon Sep 17 00:00:00 2001
From: Instantnoodl <dschmidt@adornis.de>
Date: Tue, 4 Feb 2025 10:17:03 +0000
Subject: [PATCH 1/2] fix: smaller fixes
---
lab/wiki/client/action-picker-provider.ts | 4 ++--
lab/wiki/client/x-wiki-editor.ts | 4 ++--
lab/wiki/print-components/x-wiki-print.ts | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lab/wiki/client/action-picker-provider.ts b/lab/wiki/client/action-picker-provider.ts
index f23b3864ac..61528c091a 100644
--- a/lab/wiki/client/action-picker-provider.ts
+++ b/lab/wiki/client/action-picker-provider.ts
@@ -80,7 +80,7 @@ export const createWikiActionPickerProvider = (opts: {
onNavigate: (id: string, jumpTo?: string, highlightTags?: string) => void;
scoreModifier?: (search: string, result: WikiSearchResult) => number;
minScore?: number;
- previewType?: 'text' | 'summary' | ((result: WikiSearchResult) => string);
+ previewType?: 'text' | 'summary' | ((result: WikiSearchResult, meta: any) => string);
}) => {
let lastSearch = '';
@@ -146,7 +146,7 @@ export const createWikiActionPickerProvider = (opts: {
break;
default:
if (typeof opts.previewType === 'function') {
- text += opts.previewType(obj);
+ text += opts.previewType(r, obj);
}
break;
}
diff --git a/lab/wiki/client/x-wiki-editor.ts b/lab/wiki/client/x-wiki-editor.ts
index c81da515e2..74220be6b2 100644
--- a/lab/wiki/client/x-wiki-editor.ts
+++ b/lab/wiki/client/x-wiki-editor.ts
@@ -269,11 +269,11 @@ export class XWikiEditor extends ChemistryLitElement {
],
}),
}}
- @value-picked=${(e: ValueEvent<string>) => {
+ @value-picked=${(e: ValueEvent<Maybe<string>>) => {
if (!this._entry.value) {
return;
}
- this._entry.value.parentID = e.detail.value;
+ this._entry.value.parentID = e.detail.value ?? null;
}}
>
</x-entity-picker>
diff --git a/lab/wiki/print-components/x-wiki-print.ts b/lab/wiki/print-components/x-wiki-print.ts
index 99e9e04343..e4fdc85dfd 100644
--- a/lab/wiki/print-components/x-wiki-print.ts
+++ b/lab/wiki/print-components/x-wiki-print.ts
@@ -11,7 +11,7 @@ import { html } from 'lit';
import { customElement, property, state } from 'lit/decorators.js';
import { createRef, ref, type Ref } from 'lit/directives/ref.js';
import { unsafeHTML } from 'lit/directives/unsafe-html.js';
-import { combineLatest, filter, firstValueFrom, map, switchMap, tap, timer } from 'rxjs';
+import { combineLatest, filter, firstValueFrom, interval, map, switchMap, tap, timer } from 'rxjs';
import { queryAll } from '../client/query-shadow-root.js';
import { WikiEntry } from '../db/WikiEntry.js';
@@ -45,7 +45,7 @@ export class XWikiPrint extends ChemistryLitElement {
let done = false;
// * Wait for all images to load
- timer(500).subscribe(() => {
+ interval(500).subscribe(() => {
if (done) return;
if (this.contentRef.value) {
--
GitLab
From 80caa83fed178c9475557cbe18c8c3023f449cfe Mon Sep 17 00:00:00 2001
From: Instantnoodl <dschmidt@adornis.de>
Date: Tue, 4 Feb 2025 10:21:56 +0000
Subject: [PATCH 2/2] fix: corepack in ci
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6cd64e4b89..b3beb976c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,6 +17,7 @@ variables:
- git config user.name "$GITLAB_USER_NAME"
- git remote set-url origin "https://gitlab-ci-token:$GITLAB_TOKEN@$CI_SERVER_HOST/$CI_PROJECT_PATH.git"
- git checkout $CI_COMMIT_REF_NAME
+ - npm install -g corepack@latest
- corepack enable
- pnpm i --frozen-lockfile --filter @adornis/esbuild --config.dedupe-peer-dependents false
- pnpm --filter @adornis/esbuild build
--
GitLab