Skip to content

Commit

Permalink
Merge branch 'doc/taipy#1464-doc-for-progress-control' of github.com:…
Browse files Browse the repository at this point in the history
…Avaiga/taipy into doc/taipy#1464-doc-for-progress-control
  • Loading branch information
FabienLelaquais committed Sep 20, 2024
2 parents 704d8de + 9591078 commit a806d35
Show file tree
Hide file tree
Showing 41 changed files with 779 additions and 629 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@

![Hactoberfestnew](https://github.com/user-attachments/assets/149a5cee-6af1-4d4e-9c43-6fcf82a9b07e)


<div align="center">
<a href="https://taipy.io?utm_source=github" target="_blank">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://github.com/Avaiga/taipy/assets/100117126/509bf101-54c2-4321-adaf-a2af63af9682">
<img alt="Taipy" src="https://github.com/Avaiga/taipy/assets/100117126/4df8a733-d8d0-4893-acf0-d24ef9e8b58a" width="400" />
<img alt="Taipy" src="https://github.com/Avaiga/taipy/assets/100117126/4df8a733-d8d0-4893-acf0-d24ef9e8b58a" width="300" />
</picture>
</a>
</div>
Expand Down
10 changes: 5 additions & 5 deletions frontend/taipy-gui/base/src/exports.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { TaipyApp, createApp, OnChangeHandler, OnInitHandler } from "./app";
import { WsAdapter } from "./wsAdapter";
// import { TaipyApp } from "./app";
import { ModuleData } from "./dataManager";

export {
WsAdapter,
// TaipyApp,
};
export default TaipyApp;
export { TaipyApp, createApp, WsAdapter };
export type { OnChangeHandler, OnInitHandler, ModuleData };
67 changes: 47 additions & 20 deletions frontend/taipy-gui/base/src/packaging/taipy-gui-base.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Socket } from 'socket.io-client';
import { Socket } from "socket.io-client";

export type ModuleData = Record<string, VarName>;
export type VarName = Record<string, VarData>;
Expand Down Expand Up @@ -48,10 +48,7 @@ declare class DataManager {
constructor(variableModuleData: ModuleData);
init(variableModuleData: ModuleData): ModuleData;
getEncodedName(varName: string, module: string): string | undefined;
getName(encodedName: string): [
string,
string
] | undefined;
getName(encodedName: string): [string, string] | undefined;
get(encodedName: string, dataEventKey?: string): unknown;
addRequestDataOptions(encodedName: string, dataEventKey: string, options: RequestDataOptions): void;
getInfo(encodedName: string): VarData | undefined;
Expand All @@ -60,7 +57,25 @@ declare class DataManager {
update(encodedName: string, value: unknown, dataEventKey?: string): void;
deleteRequestedData(encodedName: string, dataEventKey: string): void;
}
export type WsMessageType = "A" | "U" | "DU" | "MU" | "RU" | "AL" | "BL" | "NA" | "ID" | "MS" | "DF" | "PR" | "ACK" | "GMC" | "GDT" | "AID" | "GR" | "FV";
export type WsMessageType =
| "A"
| "U"
| "DU"
| "MU"
| "RU"
| "AL"
| "BL"
| "NA"
| "ID"
| "MS"
| "DF"
| "PR"
| "ACK"
| "GMC"
| "GDT"
| "AID"
| "GR"
| "FV";
export interface WsMessage {
type: WsMessageType | string;
name: string;
Expand All @@ -70,17 +85,23 @@ export interface WsMessage {
module_context: string;
ack_id?: string;
}
export declare abstract class WsAdapter {
abstract supportedMessageTypes: string[];
abstract handleWsMessage(message: WsMessage, app: TaipyApp): boolean;
}
export type OnInitHandler = (taipyApp: TaipyApp) => void;
export type OnChangeHandler = (taipyApp: TaipyApp, encodedName: string, value: unknown, dataEventKey?: string) => void;
export type OnNotifyHandler = (taipyApp: TaipyApp, type: string, message: string) => void;
export type OnReloadHandler = (taipyApp: TaipyApp, removedChanges: ModuleData) => void;
export type OnWsMessage = (taipyApp: TaipyApp, event: string, payload: unknown) => void;
export type OnWsStatusUpdate = (taipyApp: TaipyApp, messageQueue: string[]) => void;
export type Route = [
string,
string
];
export type RequestDataCallback = (taipyApp: TaipyApp, encodedName: string, dataEventKey: string, value: unknown) => void;
export type Route = [string, string];
export type RequestDataCallback = (
taipyApp: TaipyApp,
encodedName: string,
dataEventKey: string,
value: unknown,
) => void;
export declare class TaipyApp {
socket: Socket;
_onInit: OnInitHandler | undefined;
Expand All @@ -100,7 +121,12 @@ export declare class TaipyApp {
path: string | undefined;
routes: Route[] | undefined;
wsAdapters: WsAdapter[];
constructor(onInit?: OnInitHandler | undefined, onChange?: OnChangeHandler | undefined, path?: string | undefined, socket?: Socket | undefined);
constructor(
onInit?: OnInitHandler | undefined,
onChange?: OnChangeHandler | undefined,
path?: string | undefined,
socket?: Socket | undefined,
);
get onInit(): OnInitHandler | undefined;
set onInit(handler: OnInitHandler | undefined);
onInitEvent(): void;
Expand All @@ -123,10 +149,7 @@ export declare class TaipyApp {
sendWsMessage(type: WsMessageType | string, id: string, payload: unknown, context?: string | undefined): void;
registerWsAdapter(wsAdapter: WsAdapter): void;
getEncodedName(varName: string, module: string): string | undefined;
getName(encodedName: string): [
string,
string
] | undefined;
getName(encodedName: string): [string, string] | undefined;
get(encodedName: string, dataEventKey?: string): unknown;
getInfo(encodedName: string): VarData | undefined;
getDataTree(): ModuleData | undefined;
Expand All @@ -144,7 +167,11 @@ export declare class TaipyApp {
getWsStatus(): string[];
getBaseUrl(): string;
}
export declare abstract class WsAdapter {
abstract supportedMessageTypes: string[];
abstract handleWsMessage(message: WsMessage, app: TaipyApp): boolean;
}
export declare const createApp: (
onInit?: OnInitHandler,
onChange?: OnChangeHandler,
path?: string,
socket?: Socket,
) => TaipyApp;

export { TaipyApp as default };
3 changes: 2 additions & 1 deletion frontend/taipy-gui/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module.exports = {
],
coverageReporters: ["json", "html", "text"],
modulePathIgnorePatterns: ["<rootDir>/packaging/"],
transformIgnorePatterns: ["<rootDir>/node_modules/(?!react-jsx-parser/)"],
moduleNameMapper: {"react-markdown": "<rootDir>/node_modules/react-markdown/react-markdown.min.js"},
transformIgnorePatterns: ["<rootDir>/node_modules/(?!react-jsx-parser|react-markdown/)"],
...createJsWithTsPreset()
};
Loading

0 comments on commit a806d35

Please sign in to comment.