(ViewInstance);
- const { partyList, parties } = instance;
+ const { allParties, cellParties } = instance;
const { readonly } = instance;
return (
({
+ items={(readonly ? cellParties : allParties).map((name) => ({
label: name,
key: name,
}))}
- value={parties}
+ value={cellParties}
onChange={(val) => {
!readonly && instance.onPartiesChange(val);
}}
@@ -72,10 +72,10 @@ export class SecretNoteCodeCellView extends JupyterCodeCellView {
view = SecretNoteCodeCellComponent;
- @prop() parties: string[] = [];
+ @prop() cellParties: string[] = [];
@prop() readonly = false;
- get partyList() {
+ get allParties() {
return this.serverManager.servers
.filter((s) => s.status === ServerStatus.Succeeded)
.map((server) => server.name);
@@ -94,7 +94,7 @@ export class SecretNoteCodeCellView extends JupyterCodeCellView {
this.serverManager = serverManager;
this.kernelManager = kernelManager;
this.readonly = isReadonly(configService);
- this.parties = this.getInitialParties();
+ this.cellParties = this.getInitialParties();
}
/**
@@ -114,7 +114,7 @@ export class SecretNoteCodeCellView extends JupyterCodeCellView {
return (
server &&
server.status === ServerStatus.Succeeded &&
- this.parties.includes(server.name)
+ this.cellParties.includes(server.name)
);
});
}
@@ -258,7 +258,7 @@ export class SecretNoteCodeCellView extends JupyterCodeCellView {
* Handle the change of parties user selected on the right-top corner of the cell.
*/
onPartiesChange(parties: string[]) {
- this.parties = parties;
+ this.cellParties = parties;
this.savePartiesToMeta(parties);
lastParties = parties;
}
@@ -275,23 +275,24 @@ export class SecretNoteCodeCellView extends JupyterCodeCellView {
if (execution && execution.parties) {
try {
const parties: string[] = JSON.parse(execution.parties as string);
- return this.readonly
- ? parties
- : // filter out parties that are not in the server list
- parties.filter((p) => this.partyList.includes(p));
+ if (this.readonly) {
+ return parties;
+ }
+ // filter out parties that are not in the server list
+ return parties.filter((p) => this.allParties.includes(p));
} catch (e) {
return [];
}
} else if (lastParties.length > 0) {
return lastParties; // load parties from previous cell settings
}
- return this.partyList;
+ return this.allParties;
}
/**
* Save the parties user selected to the cell model metadata.
*/
- savePartiesToMeta(parties = this.parties) {
+ savePartiesToMeta(parties = this.cellParties) {
const execution = this.model.metadata.execution as ExecutionMeta;
if (execution) {
execution.parties = JSON.stringify(parties);
diff --git a/packages/secretnote-sf/src/modules/editor/contents/contents-contrib.ts b/packages/secretnote-sf/src/modules/editor/contents/contents-contrib.ts
index b14189f..30adacc 100644
--- a/packages/secretnote-sf/src/modules/editor/contents/contents-contrib.ts
+++ b/packages/secretnote-sf/src/modules/editor/contents/contents-contrib.ts
@@ -1,42 +1,76 @@
-import type { NotebookModel, NotebookOption } from '@difizen/libro-jupyter';
-import { ContentContribution } from '@difizen/libro-jupyter';
+import type { ICell, NotebookModel, NotebookOption } from '@difizen/libro-jupyter';
+import { ContentContribution, isCode } from '@difizen/libro-jupyter';
import { URI, inject, singleton } from '@difizen/mana-app';
+import { l10n } from '@difizen/mana-l10n';
+import { message } from 'antd';
+import { uniq } from 'lodash-es';
+import { SecretNoteConfigService } from '@/modules/config';
import type { SecretNoteModel } from '@/modules/editor';
import { NotebookFileService } from '@/modules/notebook';
+import { genericErrorHandler, isReadonly, jsonParseSafe } from '@/utils';
@singleton({ contrib: ContentContribution })
export class SecretNoteContentContribution implements ContentContribution {
protected readonly notebookFileService: NotebookFileService;
+ protected readonly configService: SecretNoteConfigService;
- constructor(@inject(NotebookFileService) notebookFileService: NotebookFileService) {
+ constructor(
+ @inject(NotebookFileService) notebookFileService: NotebookFileService,
+ @inject(SecretNoteConfigService) configService: SecretNoteConfigService,
+ ) {
this.notebookFileService = notebookFileService;
+ this.configService = configService;
}
canHandle = () => {
return 3;
};
- async loadContent(options: NotebookOption, model: NotebookModel) {
- const secretNoteModel = model as SecretNoteModel;
+ async loadContent(options: NotebookOption, _model: NotebookModel) {
+ const model = _model as SecretNoteModel;
const fileUri = new URI(options.resource);
const filePath = fileUri.path.toString();
const currentFileContents = await this.notebookFileService.getFile(filePath);
if (currentFileContents) {
currentFileContents.content.nbformat_minor = 5;
- secretNoteModel.currentFileContents = currentFileContents;
+ model.currentFileContents = currentFileContents;
// use file path as id, will be passed to editor and lsp
// @see https://github.com/difizen/libro/commit/b91cd7588ba4adcb3ca83f241fe42471b30cdc26#diff-32d01fca78d40feed75dcc29437fae22f74ebe33ec16ee11fde7c6c220bedbdbR23
- secretNoteModel.id = secretNoteModel.filePath = currentFileContents.path;
+ model.id = model.filePath = currentFileContents.path;
- /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
// @ts-ignore
- if (!secretNoteModel.quickEditMode && !secretNoteModel.readOnly) {
- secretNoteModel.startKernelConnection();
+ if (!model.quickEditMode && !model.readOnly) {
+ model.startKernelConnection();
}
- return secretNoteModel.currentFileContents.content;
+ const { content } = model.currentFileContents;
+ // collect all parties in execution metadata and hint the user if possible
+ try {
+ if (!isReadonly(this.configService)) {
+ const requiredParties = uniq(
+ content?.cells
+ .map((v: ICell) =>
+ // @ts-ignore
+ isCode(v) ? jsonParseSafe(v?.metadata?.execution?.parties, []) : [],
+ )
+ .flat() as string[],
+ );
+ requiredParties.length &&
+ message.info(
+ l10n.t(
+ `当前 Notebook 需要参与方 {0} 执行，添加完成后请刷新页面`,
+ requiredParties.join(', '),
+ ),
+ 5,
+ );
+ }
+ } catch (e) {
+ genericErrorHandler(e, { silent: true });
+ }
+
+ return content;
}
}
}
diff --git a/packages/secretnote-sf/src/pages/sf-preview/index.less b/packages/secretnote-sf/src/pages/sf-preview/index.less
new file mode 100644
index 0000000..28efadf
--- /dev/null
+++ b/packages/secretnote-sf/src/pages/sf-preview/index.less
@@ -0,0 +1,9 @@
+.secretnote-sf-preview-container {
+ .mana-view-container {
+ > .libro-view {
+ > .libro-view-top {
+ display: none;
+ }
+ }
+ }
+}
diff --git a/packages/secretnote-sf/src/pages/sf-preview/index.tsx b/packages/secretnote-sf/src/pages/sf-preview/index.tsx
index bf1532b..49d2a2c 100644
--- a/packages/secretnote-sf/src/pages/sf-preview/index.tsx
+++ b/packages/secretnote-sf/src/pages/sf-preview/index.tsx
@@ -12,10 +12,11 @@ import {
} from '@/modules/preview';
import { ThemeModule } from '@/modules/theme';
import { ToolbarModule } from '@/modules/toolbar';
+import { useRunOnce } from '@/utils/hook';
import '@/lang';
-import { useRunOnce } from '@/utils/hook';
import '../../override.less';
+import './index.less';
export interface ISecretNotePreviewProps {
fileURL?: string; // file URL of the notebook to preview
@@ -23,9 +24,9 @@ export interface ISecretNotePreviewProps {
}
const App = (props: ISecretNotePreviewProps): JSX.Element => {
- useRunOnce(() =>
- localStorage.setItem(SecretNoteConfigLocalStorageKey, JSON.stringify(props)),
- );
+ useRunOnce(() => {
+ localStorage.setItem(SecretNoteConfigLocalStorageKey, JSON.stringify(props));
+ });
return (
(obj: T, keys: K[
Object.keys(obj).filter((k) => !keys.includes(k as K)),
) as Omit;
}
+
+/**
+ * JSON parse with fallback.
+ */
+export function jsonParseSafe(json: string, fallback: any = {}) {
+ try {
+ return JSON.parse(json);
+ } catch (e) {
+ return fallback;
+ }
+}
diff --git a/packages/secretnote-sf/src/utils/error.ts b/packages/secretnote-sf/src/utils/error.ts
index e05ee23..67673b3 100644
--- a/packages/secretnote-sf/src/utils/error.ts
+++ b/packages/secretnote-sf/src/utils/error.ts
@@ -14,11 +14,11 @@ export function genericErrorHandler(
reThrow?: boolean;
} = {},
) {
+ // eslint-disable-next-line no-console
+ console.error(e);
if (!options?.silent) {
message.error(getErrorString(e));
- console.error(e);
}
- // eslint-disable-next-line no-console
if (options?.reThrow) {
throw e;
}
diff --git a/pyprojects/secretnote/package.json b/pyprojects/secretnote/package.json
index d1fbc59..6bb4b89 100644
--- a/pyprojects/secretnote/package.json
+++ b/pyprojects/secretnote/package.json
@@ -1,7 +1,7 @@
{
"name": "secretnote",
"private": true,
- "version": "0.0.50",
+ "version": "0.0.51",
"type": "module",
"scripts": {
"dev:sf": "cd .. && NODE_ENV=development python -m secretnote sf --config=./secretnote/secretnote/sf/.jupyter/config_dev.py --no-browser",
diff --git a/pyprojects/secretnote/secretnote/__init__.py b/pyprojects/secretnote/secretnote/__init__.py
index bf41adb..a3ebe30 100644
--- a/pyprojects/secretnote/secretnote/__init__.py
+++ b/pyprojects/secretnote/secretnote/__init__.py
@@ -1 +1 @@
-__version__ = "0.0.50"
+__version__ = "0.0.51"