Skip to content

Commit

Permalink
Merge 'origin/development' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Huseyinnurbaki committed May 3, 2021
2 parents 08b878b + 7045332 commit 5a4a2e5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ node_modules
*.tgz
dist-types
dist
*.json-prepack
*.json-prepack

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Work In Progress

# gitlab

Welcome to the gitlab plugin!
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hhaluk/backstage-plugin-gitlab",
"version": "0.0.2-beta",
"version": "0.0.3-beta",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
Expand Down
12 changes: 4 additions & 8 deletions src/components/PipelinesTable/PipelinesTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const DenseTable = ({ pipelines }: DenseTableProps) => {
{ title: 'Commit Message', field: 'message' },
];

const data = pipelines.map(pipeline => {
const data = pipelines?.map(pipeline => {
return {
avatar: (
<img
Expand All @@ -58,13 +58,13 @@ export const DenseTable = ({ pipelines }: DenseTableProps) => {
status: pipeline.status,
id: pipeline.id,
message: pipeline.commit?.title,
finished_at: pipeline?.finished_at,
finished_at: pipeline.finished_at,
};
});

return (
<Table
title="Tıkla Gelsin Client Pipelines"
title="Pipelines"
options={{ search: false, paging: false }}
columns={columns}
data={data}
Expand All @@ -73,13 +73,9 @@ export const DenseTable = ({ pipelines }: DenseTableProps) => {
};

export const PipelinesTable = (props: any) => {
console.log("PipelinesTableProps", props);



if (props?.loading) {
return <Progress />;
} else if (props.error) {
} else if (props?.error) {
return <Alert severity="error">{props?.error?.message}</Alert>;
}

Expand Down

0 comments on commit 5a4a2e5

Please sign in to comment.