Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: refactor the emui components to the shared package #1959

Merged
merged 5 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1498,9 +1498,7 @@ workflows:
- slack-secrets
filters:
branches:
ignore: /.*/
tags:
only: /^[0-9]+\.[0-9]+\.[0-9]+$/
only: bgazzard/emui-populate-components
- publish_files_artifacts_expander_image:
context:
- docker-user
Expand Down
2 changes: 1 addition & 1 deletion enclave-manager/web/lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "0.0.1",
"version": "0.0.4",
"npmClient": "yarn",
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"useNx": false,
Expand Down
7 changes: 6 additions & 1 deletion enclave-manager/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"framer-motion": "^10.16.4",
"lodash": "^4.17.21",
"luxon": "^3.4.3",
"react": "^18.2.0",
"react-dom": "^18.2.0"
"react-dom": "^18.2.0",
"react-icons": "^4.11.0",
"true-myth": "^7.1.0"
},
"devDependencies": {
"@craco/craco": "^7.1.0",
"@types/luxon": "^3.3.3",
"@types/node": "^16.7.13",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
Expand Down
18 changes: 3 additions & 15 deletions enclave-manager/web/packages/app/package.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,22 @@
{
"name": "@kurtosis/emui-app",
"version": "0.0.1",
"version": "0.0.4",
"private": true,
"homepage": ".",
"dependencies": {
"@monaco-editor/react": "^4.6.0",
"@tanstack/react-table": "^8.10.7",
"ansi-to-html": "^0.7.2",
"enclave-manager-sdk": "file:../../../api/typescript",
"html-react-parser": "^4.2.2",
"js-cookie": "^3.0.5",
"kurtosis-ui-components": "0.0.1",
"lodash": "^4.17.21",
"luxon": "^3.4.3",
"kurtosis-cloud-indexer-sdk": "^0.0.2",
"kurtosis-ui-components": "0.0.4",
"react-error-boundary": "^4.0.11",
"react-hook-form": "^7.47.0",
"react-icons": "^4.11.0",
"react-markdown": "^9.0.0",
"react-router-dom": "^6.17.0",
"react-virtuoso": "^4.6.2",
"streamsaver": "^2.0.6",
"true-myth": "^7.1.0",
"yaml": "^2.3.4"
},
"devDependencies": {
"@types/js-cookie": "^3.0.6",
"@types/luxon": "^3.3.3",
"@types/node": "^16.7.13",
"@types/streamsaver": "^2.0.4",
"monaco-editor": "^0.44.0",
"serve": "^14.2.1",
"source-map-explorer": "^2.5.3"
},
Expand Down
2 changes: 1 addition & 1 deletion enclave-manager/web/packages/app/src/client/constants.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isDefined } from "../utils";
import { isDefined } from "kurtosis-ui-components";

// Configurable:
export const KURTOSIS_CLOUD_PROTOCOL = "https";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ import {
InspectFilesArtifactContentsRequest,
RunStarlarkPackageRequest,
} from "enclave-manager-sdk/build/kurtosis_enclave_manager_api_pb";
import { assertDefined, asyncResult, isDefined, RemoveFunctions } from "kurtosis-ui-components";
import { EnclaveFullInfo } from "../../emui/enclaves/types";
import { assertDefined, asyncResult, isDefined } from "../../utils";
import { RemoveFunctions } from "../../utils/types";

export abstract class KurtosisClient {
protected readonly client: PromiseClient<typeof KurtosisEnclaveManagerServer>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Flex, Heading, Spinner } from "@chakra-ui/react";
import Cookies from "js-cookie";
import { assertDefined, isDefined, KurtosisAlert, stringifyError } from "kurtosis-ui-components";
import { createContext, PropsWithChildren, useContext, useEffect, useMemo, useState } from "react";
import { KurtosisAlert } from "../../components/KurtosisAlert";
import { assertDefined, isDefined, stringifyError } from "../../utils";
import { KURTOSIS_CLOUD_EM_PAGE, KURTOSIS_CLOUD_EM_URL } from "../constants";
import { AuthenticatedKurtosisClient } from "./AuthenticatedKurtosisClient";
import { KurtosisClient } from "./KurtosisClient";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { createPromiseClient, PromiseClient } from "@connectrpc/connect";
import { createConnectTransport } from "@connectrpc/connect-web";
import { asyncResult } from "../../utils";
import { parsePackageUrl } from "../../utils/packageUtils";
import { KurtosisPackageIndexer, PackageRepository, ReadPackageRequest } from "kurtosis-cloud-indexer-sdk";
import { asyncResult, parsePackageUrl } from "kurtosis-ui-components";
import { KURTOSIS_PACKAGE_INDEXER_URL } from "../constants";
import { KurtosisPackageIndexer } from "./api/kurtosis_package_indexer_connect";
import { PackageRepository, ReadPackageRequest } from "./api/kurtosis_package_indexer_pb";

export class KurtosisPackageIndexerClient {
private client: PromiseClient<typeof KurtosisPackageIndexer>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { assertDefined } from "kurtosis-ui-components";
import { createContext, PropsWithChildren, useContext, useMemo } from "react";
import { assertDefined } from "../../utils";
import { KurtosisPackageIndexerClient } from "./KurtosisPackageIndexerClient";

type KurtosisPackageIndexerClientContextState = {
Expand Down

This file was deleted.

Loading
Loading