diff --git a/packages/plugin-runtime-types/package.json b/packages/plugin-runtime-types/package.json index 5b6ee95f..7c6fb290 100644 --- a/packages/plugin-runtime-types/package.json +++ b/packages/plugin-runtime-types/package.json @@ -1,6 +1,6 @@ { "name": "@yaakapp/api", - "version": "0.5.0", + "version": "0.5.3", "main": "lib/index.js", "typings": "./lib/index.d.ts", "files": [ diff --git a/packages/plugin-runtime-types/src/bindings/gen_models.ts b/packages/plugin-runtime-types/src/bindings/gen_models.ts index 4b5e5ad2..a9e7794c 100644 --- a/packages/plugin-runtime-types/src/bindings/gen_models.ts +++ b/packages/plugin-runtime-types/src/bindings/gen_models.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -export type Environment = { model: "environment", id: string, workspaceId: string, environmentId: string | null, createdAt: string, updatedAt: string, name: string, variables: Array, }; +export type Environment = { model: "environment", id: string, workspaceId: string, createdAt: string, updatedAt: string, name: string, public: boolean, base: boolean, variables: Array, }; export type EnvironmentVariable = { enabled?: boolean, name: string, value: string, id?: string, }; diff --git a/packages/plugin-runtime-types/src/index.ts b/packages/plugin-runtime-types/src/index.ts index 3f19e322..14313963 100644 --- a/packages/plugin-runtime-types/src/index.ts +++ b/packages/plugin-runtime-types/src/index.ts @@ -3,3 +3,7 @@ export type * from './themes'; export * from './bindings/gen_models'; export * from './bindings/gen_events'; + +// Some extras for utility + +export type { PartialImportResources } from './plugins/ImporterPlugin'; diff --git a/packages/plugin-runtime-types/src/plugins/Context.ts b/packages/plugin-runtime-types/src/plugins/Context.ts index 15715c65..f55a3870 100644 --- a/packages/plugin-runtime-types/src/plugins/Context.ts +++ b/packages/plugin-runtime-types/src/plugins/Context.ts @@ -34,7 +34,7 @@ export interface Context { openUrl( args: OpenWindowRequest & { onNavigate?: (args: { url: string }) => void; - onClose: () => void; + onClose?: () => void; }, ): Promise<{ close: () => void }>; }; diff --git a/packages/plugin-runtime-types/src/plugins/FilterPlugin.ts b/packages/plugin-runtime-types/src/plugins/FilterPlugin.ts index 57a1af07..b7ebf581 100644 --- a/packages/plugin-runtime-types/src/plugins/FilterPlugin.ts +++ b/packages/plugin-runtime-types/src/plugins/FilterPlugin.ts @@ -1,6 +1,6 @@ import type { Context } from './Context'; -export type FilterPluginResponse = { filtered: string }; +type FilterPluginResponse = { filtered: string }; export type FilterPlugin = { name: string; diff --git a/packages/plugin-runtime-types/src/plugins/ImporterPlugin.ts b/packages/plugin-runtime-types/src/plugins/ImporterPlugin.ts index 309f8cda..f2ccff9b 100644 --- a/packages/plugin-runtime-types/src/plugins/ImporterPlugin.ts +++ b/packages/plugin-runtime-types/src/plugins/ImporterPlugin.ts @@ -1,15 +1,21 @@ -import { Environment, Folder, GrpcRequest, HttpRequest, Workspace } from '../bindings/gen_models'; -import type { AtLeast } from '../helpers'; +import { ImportResources } from '../bindings/gen_events'; +import { AtLeast } from '../helpers'; import type { Context } from './Context'; -type ImportPluginResponse = null | { - resources: { - workspaces: AtLeast[]; - environments: AtLeast[]; - folders: AtLeast[]; - httpRequests: AtLeast[]; - grpcRequests: AtLeast[]; - }; +type RootFields = 'name' | 'id' | 'model'; +type CommonFields = RootFields | 'workspaceId'; + +export type PartialImportResources = { + workspaces: Array>; + environments: Array>; + folders: Array>; + httpRequests: Array>; + grpcRequests: Array>; + websocketRequests: Array>; +}; + +export type ImportPluginResponse = null | { + resources: PartialImportResources; }; export type ImporterPlugin = { diff --git a/src-web/components/EnvironmentEditDialog.tsx b/src-web/components/EnvironmentEditDialog.tsx index f42ed7d6..d9bccdfe 100644 --- a/src-web/components/EnvironmentEditDialog.tsx +++ b/src-web/components/EnvironmentEditDialog.tsx @@ -258,7 +258,11 @@ const EnvironmentEditor = function ({ )} {activeEnvironment.public && promptToEncrypt && ( - + This environment is sharable. Ensure variable values are encrypted to avoid accidental leaking of secrets during directory sync or data export.