Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
12 changes: 11 additions & 1 deletion pkg/app/web/src/__fixtures__/dummy-application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,17 @@ export const dummyApplication: Application = {
createdAt: 0,
disabled: false,
envId: dummyEnv.id,
gitPath: { configPath: "", configFilename: "", path: "dir/dir1", repoId: "repo-1", url: "" },
gitPath: {
configPath: "",
configFilename: "",
path: "dir/dir1",
url: "",
repo: {
id: "repo-1",
branch: "master",
remote: "xxx",
},
},
kind: ApplicationKind.KUBERNETES,
name: "DemoApp",
pipedId: dummyPiped.id,
Expand Down
12 changes: 11 additions & 1 deletion pkg/app/web/src/__fixtures__/dummy-deployment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,17 @@ export const dummyDeployment: Deployment = {
createdAt: 1,
summary: "description",
envId: dummyEnv.id,
gitPath: { configPath: "", configFilename: "", path: "", repoId: "", url: "" },
gitPath: {
configPath: "",
configFilename: "",
path: "",
url: "",
repo: {
id: "repo-1",
branch: "master",
remote: "xxx",
},
},
kind: ApplicationKind.KUBERNETES,
metadataMap: [],
};
7 changes: 4 additions & 3 deletions pkg/app/web/src/__fixtures__/dummy-piped.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Piped } from "../modules/pipeds";
import { Piped, PipedModel } from "../modules/pipeds";

export const dummyPiped: Piped = {
cloudProvidersList: [],
Expand All @@ -8,9 +8,10 @@ export const dummyPiped: Piped = {
id: "piped-1",
name: "demo piped",
projectId: "project-1",
repositoryIdsList: [],
repositoriesList: [],
startedAt: 0,
updatedAt: 0,
version: "v0.1",
status: Piped_ONLINE,
status: PipedModel.ConnectionStatus.ONLINE,
keyHash: "12345",
};
3 changes: 2 additions & 1 deletion pkg/app/web/src/components/application-detail.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import { Provider } from "react-redux";
import { ApplicationSyncStatus } from "../../../../../bazel-bin/pkg/app/web/model/application_pb";
import { ApplicationSyncStatus } from "pipe/pkg/app/web/model/application_pb";
import { createStore } from "../../.storybook/redux-decorator";
import { dummyApplication } from "../__fixtures__/dummy-application";
import { dummyApplicationLiveState } from "../__fixtures__/dummy-application-live-state";
Expand All @@ -17,6 +17,7 @@ const dummyStore: Partial<AppState> = {
syncing: {},
disabling: {},
adding: false,
loading: false,
},
environments: {
entities: {
Expand Down
4 changes: 3 additions & 1 deletion pkg/app/web/src/components/application-detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@ export const ApplicationDetail: FC<Props> = memo(function ApplicationDetail({

<LabeledText
label="Git Path"
value={`${app.gitPath.repo !== undefined ? app.gitPath.repo.id : ""} - ${app.gitPath.path}${app.gitPath.configFilename}`}
value={`${
app.gitPath.repo !== undefined ? app.gitPath.repo.id : ""
} - ${app.gitPath.path}${app.gitPath.configFilename}`}
/>
</div>

Expand Down
2 changes: 2 additions & 0 deletions pkg/app/web/src/components/login-form.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import React from "react";
import { LoginForm } from "./login-form";
import { createDecoratorRedux } from "../../.storybook/redux-decorator";

export default {
title: "LoginForm",
component: LoginForm,
decorators: [createDecoratorRedux({})],
};

export const overview: React.FC = () => <LoginForm />;
7 changes: 6 additions & 1 deletion pkg/app/web/src/components/pipeline.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ const fakeDeployment: Deployment = {
projectId: "debug-project",
kind: 0,
gitPath: {
repoId: "pipe-debug",
configPath: "",
repo: {
id: "pipe-debug",
branch: "master",
remote: "xxx",
},
path: "k8s",
configFilename: "",
url: "",
Expand Down
1 change: 1 addition & 0 deletions pkg/app/web/src/modules/pipeds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,4 @@ export const pipedsSlice = createSlice({
});

export const { clearRegisteredPipedInfo } = pipedsSlice.actions;
export { Piped as PipedModel } from "pipe/pkg/app/web/model/piped_pb";