chore: clean code.

This commit is contained in:
Ivan Li 2021-07-17 21:57:19 +08:00
parent 2efbad4fe5
commit 3644718b19
7 changed files with 114 additions and 134 deletions

View File

@ -39,7 +39,7 @@ export const AuthProvider: FC = ({ children }) => {
}}
>
{children}
{/* {accessToken ? null : <Login />} */}
{accessToken ? null : <Login />}
</Context.Provider>
);
};

View File

@ -45,7 +45,7 @@ export const Login: FC = () => {
ref={iframeRef}
className={classes.iframe}
title="Auth"
src="http://user.localhost/auth/login"
src="https://user.rpi.ivanli.cc/auth/login"
></iframe>
);
};

View File

@ -2,7 +2,7 @@ import { useApolloClient } from "@apollo/client";
import { createRouterComponent } from "@curi/react-dom";
import { createRouter, announce } from "@curi/router";
import { browser } from "@hickory/browser";
import { FC, ReactNode, useEffect, useMemo, useState } from "react";
import { FC, useEffect, useState } from "react";
import routes from "../../routes";
import { LinearProgress } from "@material-ui/core";

View File

@ -1,8 +1,11 @@
import { gql } from '@apollo/client';
export type Maybe<T> = T | null;
export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
export type Exact<T extends { [key: string]: unknown }> = {
[K in keyof T]: T[K];
};
export type MakeOptional<T, K extends keyof T> = Omit<T, K> &
{ [SubKey in K]?: Maybe<T[SubKey]> };
export type MakeMaybe<T, K extends keyof T> = Omit<T, K> &
{ [SubKey in K]: Maybe<T[SubKey]> };
/** All built-in and custom scalars, mapped to their actual values */
export type Scalars = {
ID: string;
@ -15,174 +18,165 @@ export type Scalars = {
};
export type Commit = {
__typename?: 'Commit';
hash: Scalars['String'];
date: Scalars['DateTime'];
message: Scalars['String'];
refs: Scalars['String'];
body: Scalars['String'];
author_name: Scalars['String'];
author_email: Scalars['String'];
__typename?: "Commit";
hash: Scalars["String"];
date: Scalars["DateTime"];
message: Scalars["String"];
refs: Scalars["String"];
body: Scalars["String"];
author_name: Scalars["String"];
author_email: Scalars["String"];
tasks: Array<PipelineTask>;
};
export type CreatePipelineInput = {
projectId: Scalars['String'];
branch: Scalars['String'];
name: Scalars['String'];
projectId: Scalars["String"];
branch: Scalars["String"];
name: Scalars["String"];
workUnitMetadata: WorkUnitMetadataInput;
};
export type CreatePipelineTaskInput = {
pipelineId: Scalars['String'];
commit: Scalars['String'];
pipelineId: Scalars["String"];
commit: Scalars["String"];
units: Array<PipelineUnits>;
};
export type CreateProjectInput = {
name: Scalars['String'];
comment: Scalars['String'];
sshUrl: Scalars['String'];
webUrl?: Maybe<Scalars['String']>;
webHookSecret?: Maybe<Scalars['String']>;
name: Scalars["String"];
comment: Scalars["String"];
sshUrl: Scalars["String"];
webUrl?: Maybe<Scalars["String"]>;
webHookSecret?: Maybe<Scalars["String"]>;
};
export type Hello = {
__typename?: 'Hello';
message: Scalars['String'];
__typename?: "Hello";
message: Scalars["String"];
};
export type LogFields = {
__typename?: 'LogFields';
hash: Scalars['String'];
date: Scalars['String'];
message: Scalars['String'];
refs: Scalars['String'];
body: Scalars['String'];
author_name: Scalars['String'];
author_email: Scalars['String'];
__typename?: "LogFields";
hash: Scalars["String"];
date: Scalars["String"];
message: Scalars["String"];
refs: Scalars["String"];
body: Scalars["String"];
author_name: Scalars["String"];
author_email: Scalars["String"];
tasks: Array<PipelineTask>;
};
export type Mutation = {
__typename?: 'Mutation';
__typename?: "Mutation";
createProject: Project;
updateProject: Project;
removeProject: Scalars['Float'];
removeProject: Scalars["Float"];
createPipeline: Pipeline;
updatePipeline: Pipeline;
deletePipeline: Scalars['Float'];
deletePipeline: Scalars["Float"];
createPipelineTask: PipelineTask;
stopPipelineTask: Scalars['Boolean'];
stopPipelineTask: Scalars["Boolean"];
};
export type MutationCreateProjectArgs = {
project: CreateProjectInput;
};
export type MutationUpdateProjectArgs = {
project: UpdateProjectInput;
};
export type MutationRemoveProjectArgs = {
id: Scalars['String'];
id: Scalars["String"];
};
export type MutationCreatePipelineArgs = {
pipeline: CreatePipelineInput;
};
export type MutationUpdatePipelineArgs = {
pipeline: UpdatePipelineInput;
};
export type MutationDeletePipelineArgs = {
id: Scalars['String'];
id: Scalars["String"];
};
export type MutationCreatePipelineTaskArgs = {
task: CreatePipelineTaskInput;
};
export type MutationStopPipelineTaskArgs = {
id: Scalars['String'];
id: Scalars["String"];
};
export type Pipeline = {
__typename?: 'Pipeline';
id: Scalars['ID'];
__typename?: "Pipeline";
id: Scalars["ID"];
project: Project;
projectId: Scalars['String'];
branch: Scalars['String'];
name: Scalars['String'];
projectId: Scalars["String"];
branch: Scalars["String"];
name: Scalars["String"];
workUnitMetadata: WorkUnitMetadata;
};
export type PipelineTask = {
__typename?: 'PipelineTask';
id: Scalars['ID'];
__typename?: "PipelineTask";
id: Scalars["ID"];
pipeline: Pipeline;
pipelineId: Scalars['String'];
commit: Scalars['String'];
pipelineId: Scalars["String"];
commit: Scalars["String"];
units: Array<PipelineUnits>;
logs: Array<PipelineTaskLogs>;
status: TaskStatuses;
startedAt?: Maybe<Scalars['DateTime']>;
endedAt?: Maybe<Scalars['DateTime']>;
runOn: Scalars['String'];
startedAt?: Maybe<Scalars["DateTime"]>;
endedAt?: Maybe<Scalars["DateTime"]>;
runOn: Scalars["String"];
};
export type PipelineTaskEvent = {
__typename?: 'PipelineTaskEvent';
taskId: Scalars['String'];
pipelineId: Scalars['String'];
projectId: Scalars['String'];
__typename?: "PipelineTaskEvent";
taskId: Scalars["String"];
pipelineId: Scalars["String"];
projectId: Scalars["String"];
unit?: Maybe<PipelineUnits>;
emittedAt: Scalars['DateTime'];
message: Scalars['String'];
messageType: Scalars['String'];
emittedAt: Scalars["DateTime"];
message: Scalars["String"];
messageType: Scalars["String"];
status: TaskStatuses;
};
export type PipelineTaskLogs = {
__typename?: 'PipelineTaskLogs';
__typename?: "PipelineTaskLogs";
unit: PipelineUnits;
status: TaskStatuses;
startedAt?: Maybe<Scalars['DateTime']>;
endedAt?: Maybe<Scalars['DateTime']>;
logs: Scalars['String'];
startedAt?: Maybe<Scalars["DateTime"]>;
endedAt?: Maybe<Scalars["DateTime"]>;
logs: Scalars["String"];
};
/** 流水线单元 */
export enum PipelineUnits {
Checkout = 'checkout',
InstallDependencies = 'installDependencies',
Test = 'test',
Deploy = 'deploy',
CleanUp = 'cleanUp'
Checkout = "checkout",
InstallDependencies = "installDependencies",
Test = "test",
Deploy = "deploy",
CleanUp = "cleanUp",
}
export type Project = {
__typename?: 'Project';
id: Scalars['ID'];
name: Scalars['String'];
comment: Scalars['String'];
sshUrl: Scalars['String'];
webUrl?: Maybe<Scalars['String']>;
webHookSecret?: Maybe<Scalars['String']>;
__typename?: "Project";
id: Scalars["ID"];
name: Scalars["String"];
comment: Scalars["String"];
sshUrl: Scalars["String"];
webUrl?: Maybe<Scalars["String"]>;
webHookSecret?: Maybe<Scalars["String"]>;
};
export type Query = {
__typename?: 'Query';
__typename?: "Query";
hello: Hello;
projects: Array<Project>;
project: Project;
@ -193,101 +187,92 @@ export type Query = {
pipelineTask: PipelineTask;
};
export type QueryProjectArgs = {
id: Scalars['String'];
id: Scalars["String"];
};
export type QueryPipelinesArgs = {
projectId?: Maybe<Scalars['String']>;
projectId?: Maybe<Scalars["String"]>;
};
export type QueryPipelineArgs = {
id: Scalars['String'];
id: Scalars["String"];
};
export type QueryCommitsArgs = {
pipelineId: Scalars['String'];
pipelineId: Scalars["String"];
};
export type QueryListPipelineTaskByPipelineIdArgs = {
pipelineId: Scalars['String'];
pipelineId: Scalars["String"];
};
export type QueryPipelineTaskArgs = {
id: Scalars['String'];
id: Scalars["String"];
};
export type Subscription = {
__typename?: 'Subscription';
syncCommits?: Maybe<Scalars['String']>;
__typename?: "Subscription";
syncCommits?: Maybe<Scalars["String"]>;
pipelineTaskEvent: PipelineTaskEvent;
pipelineTaskChanged: PipelineTask;
};
export type SubscriptionSyncCommitsArgs = {
appInstance?: Maybe<Scalars['String']>;
pipelineId: Scalars['String'];
appInstance?: Maybe<Scalars["String"]>;
pipelineId: Scalars["String"];
};
export type SubscriptionPipelineTaskEventArgs = {
taskId: Scalars['String'];
taskId: Scalars["String"];
};
export type SubscriptionPipelineTaskChangedArgs = {
id: Scalars['String'];
id: Scalars["String"];
};
/** 任务状态 */
export enum TaskStatuses {
Success = 'success',
Failed = 'failed',
Working = 'working',
Pending = 'pending'
Success = "success",
Failed = "failed",
Working = "working",
Pending = "pending",
}
export type UpdatePipelineInput = {
branch: Scalars['String'];
name: Scalars['String'];
branch: Scalars["String"];
name: Scalars["String"];
workUnitMetadata: WorkUnitMetadataInput;
id: Scalars['String'];
id: Scalars["String"];
};
export type UpdateProjectInput = {
name: Scalars['String'];
comment: Scalars['String'];
sshUrl: Scalars['String'];
webUrl?: Maybe<Scalars['String']>;
webHookSecret?: Maybe<Scalars['String']>;
id: Scalars['String'];
name: Scalars["String"];
comment: Scalars["String"];
sshUrl: Scalars["String"];
webUrl?: Maybe<Scalars["String"]>;
webHookSecret?: Maybe<Scalars["String"]>;
id: Scalars["String"];
};
export type WorkUnit = {
__typename?: 'WorkUnit';
__typename?: "WorkUnit";
type: PipelineUnits;
scripts: Array<Scalars['String']>;
scripts: Array<Scalars["String"]>;
};
export type WorkUnitInput = {
type: PipelineUnits;
scripts: Array<Scalars['String']>;
scripts: Array<Scalars["String"]>;
};
export type WorkUnitMetadata = {
__typename?: 'WorkUnitMetadata';
version: Scalars['Int'];
__typename?: "WorkUnitMetadata";
version: Scalars["Int"];
units: Array<WorkUnit>;
};
export type WorkUnitMetadataInput = {
version?: Maybe<Scalars['Int']>;
version?: Maybe<Scalars["Int"]>;
units: Array<WorkUnitInput>;
};

View File

@ -1,4 +1,4 @@
import React, { FC, useCallback, useRef, useState } from "react";
import React, { FC, useCallback, useState } from "react";
import clsx from "clsx";
import {
createStyles,
@ -10,7 +10,6 @@ import Drawer from "@material-ui/core/Drawer";
import AppBar from "@material-ui/core/AppBar";
import Toolbar from "@material-ui/core/Toolbar";
import CssBaseline from "@material-ui/core/CssBaseline";
import Typography from "@material-ui/core/Typography";
import Divider from "@material-ui/core/Divider";
import IconButton from "@material-ui/core/IconButton";
import MenuIcon from "@material-ui/icons/Menu";

View File

@ -11,8 +11,6 @@ import {
import { FC, MouseEventHandler, useMemo } from "react";
import { Pipeline, Project } from "../generated/graphql";
import { CallMerge, Edit } from "@material-ui/icons";
import { clone } from "ramda";
import { useEffect } from "react";
interface Props {
projectId: string;
@ -32,7 +30,7 @@ const PIPELINES = gql`
`;
export const PipelineList: FC<Props> = ({ projectId }) => {
const { data, loading } = useQuery<
const { data } = useQuery<
{ pipelines: Pipeline[]; project: Project },
{ projectId: string }
>(PIPELINES, {

View File

@ -1,7 +1,6 @@
import { ApolloClient, InMemoryCache } from "@apollo/client";
import { prepareRoutes } from "@curi/router";
import { omit } from "ramda";
import React from "react";
import { ProjectDetail, ProjectEditor, PROJECT } from "./projects";
import { COMMIT_LIST_QUERY } from "./commons/graphql/queries";
import { CommitList } from "./commits/commit-list";
@ -13,7 +12,6 @@ import {
Pipeline,
PipelineUnits,
Project,
WorkUnitInput,
} from "./generated/graphql";
import { PIPELINE } from "./pipelines";