public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

POC/Provisioning: Use cards layout to show more status info (#98155)

Browse Source
This commit is contained in:
Ryan McKinley
2024-12-18 12:37:45 +03:00
committed by GitHub
parent b322f65243
commit f0dc718a67
5 changed files with 110 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.betterer.results
+23 -17
View File
@@ -5330,8 +5330,7 @@ exports[`better eslint`] = {
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "42"]
],
"public/app/features/provisioning/DeleteRepositoryButton.tsx:5381": [
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "1"]
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "0"]
],
"public/app/features/provisioning/EditRepositoryPage.tsx:5381": [
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"],
@@ -5360,8 +5359,11 @@ exports[`better eslint`] = {
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "1"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "2"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "3"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "4"]
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "3"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "4"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "5"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "6"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "7"]
],
"public/app/features/provisioning/RepositorySelect.tsx:5381": [
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "0"]
@@ -5372,26 +5374,30 @@ exports[`better eslint`] = {
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "2"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "3"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "4"],
[0, 0, 0, "Do not use any type assertions.", "5"],
[0, 0, 0, "Do not use any type assertions.", "6"],
[0, 0, 0, "Unexpected any. Specify a different type.", "7"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "8"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "9"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "5"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "6"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "7"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "8"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "9"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "10"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "11"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "12"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "13"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "14"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "15"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "16"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "17"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "18"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "19"]
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "12"],
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "13"]
],
"public/app/features/provisioning/SyncRepository.tsx:5381": [
[0, 0, 0, "No untranslated strings. Wrap text with <Trans />", "0"],
[0, 0, 0, "No untranslated strings in text props. Wrap text with <Trans /> or use t()", "1"]
],
"public/app/features/provisioning/api/endpoints.ts:5381": [
[0, 0, 0, "Unexpected any. Specify a different type.", "0"],
[0, 0, 0, "Unexpected any. Specify a different type.", "1"],
[0, 0, 0, "Unexpected any. Specify a different type.", "2"],
[0, 0, 0, "Unexpected any. Specify a different type.", "3"],
[0, 0, 0, "Unexpected any. Specify a different type.", "4"],
[0, 0, 0, "Unexpected any. Specify a different type.", "5"],
[0, 0, 0, "Unexpected any. Specify a different type.", "6"],
[0, 0, 0, "Unexpected any. Specify a different type.", "7"]
],
"public/app/features/provisioning/api/index.ts:5381": [
[0, 0, 0, "Do not use export all (\`export * from ...\`)", "0"]
],
pkg/registry/apis/provisioning/repository_controller.go
+2 -2
View File
@@ -232,12 +232,12 @@ func (rc *RepositoryController) sync(key string) error {
if cachedRepo.Status.Initialized {
status, err = repo.OnUpdate(ctx, logger)
if err != nil {
return fmt.Errorf("on create repository: %w", err)
rc.logger.Error("OnUpdate", "error", err)
}
} else {
status, err = repo.OnCreate(ctx, logger)
if err != nil {
return fmt.Errorf("on create repository: %w", err)
rc.logger.Error("OnCreate", "error", err)
}
}
pkg/tests/apis/provisioning/testdata/github-example.yaml
Vendored
-1
View File
@@ -19,4 +19,3 @@ spec:
generateDashboardPreviews: true
pullRequestLinter: true
token: "github_pat_dummy"
webhookSecret: "dummyWebhookSecret"
public/app/features/provisioning/DeleteRepositoryButton.tsx
+5 -6
View File
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
import { AppEvents } from '@grafana/data';
import { getAppEvents } from '@grafana/runtime';
import { Button, ConfirmModal } from '@grafana/ui';
import { Button, ConfirmModal, IconButton } from '@grafana/ui';
import { useDeleteRepositoryMutation } from './api';
@@ -26,14 +26,13 @@ export function DeleteRepositoryButton({ name }: { name: string }) {
return (
<>
<Button
variant="destructive"
<IconButton
name="trash-alt"
tooltip="Delete this repository"
onClick={() => {
setShowModal(true);
}}
>
Delete
</Button>
/>
<ConfirmModal
isOpen={showModal}
title={'Delete repository config'}
public/app/features/provisioning/RepositoryListPage.tsx
+80 -30
View File
@@ -1,7 +1,20 @@
import { css } from '@emotion/css';
import { useState } from 'react';
import { ReactNode, useState } from 'react';
import { Alert, Card, EmptySearchResult, EmptyState, FilterInput, LinkButton, Stack, TextLink } from '@grafana/ui';
import {
Alert,
Button,
Card,
EmptySearchResult,
EmptyState,
FilterInput,
Icon,
IconButton,
IconName,
LinkButton,
Stack,
TextLink,
} from '@grafana/ui';
import { Page } from 'app/core/components/Page/Page';
import { DeleteRepositoryButton } from './DeleteRepositoryButton';
@@ -51,36 +64,73 @@ function RepositoryListPageContent({ items }: { items?: Repository[] }) {
{!!filteredItems.length ? (
filteredItems.map((item) => {
const name = item.metadata?.name ?? '';
const healthy = Boolean(item.status?.health.healthy)
const healthy = Boolean(item.status?.health.healthy);
let icon: IconName = 'database'; // based on type
let meta: ReactNode[] = [
// TODO... add counts? and sync info
];
switch (item.spec?.type) {
case 'github':
icon = 'github';
const spec = item.spec.github;
let url = `https://github.com/${spec?.owner}/${spec?.repository}/`;
if (spec?.branch) {
url += `tree/` + spec?.branch;
}
meta.push(<a href={url}>{url}</a>);
break;
case 'local':
meta.push(item.spec.local?.path);
break;
}
return (
<Card key={item.metadata?.name} className={css({ alignItems: 'center' })}>
<Stack direction={'column'}>
<Card.Heading>
<TextLink href={`${PROVISIONING_URL}/${name}`}>{item.spec?.title}</TextLink>
</Card.Heading>
<Card.Meta>{item.spec?.type}</Card.Meta>
</Stack>
<Stack>
{healthy ? <>
<LinkButton variant="secondary" href={`${PROVISIONING_URL}/${name}/edit`}>
Edit
<Card key={item.metadata?.name}>
<Card.Figure>
<Icon name={icon} width={40} height={40} />
</Card.Figure>
<Card.Heading>{item.spec?.title}</Card.Heading>
<Card.Description>
{item.spec?.description}
{item.status ? (
<>
{!healthy && (
<Alert
title="Repository is unhealthy"
children={item.status?.health?.message?.map((v) => (
<div>
{v}
<br />
<br />
</div>
))}
></Alert>
)}
</>
) : (
<div>
<Alert severity="warning" title="repository initializing" />
</div>
)}
</Card.Description>
<Card.Meta>{meta}</Card.Meta>
<Card.Actions>
<LinkButton href={`${PROVISIONING_URL}/${name}`} variant="secondary">
Manage
</LinkButton>
{item.spec?.folder && (
<LinkButton href={`/dashboards/f/${item.spec?.folder}/`} variant="secondary">
View
</LinkButton>
<SyncRepository repository={item} />
<DeleteRepositoryButton name={name} />
</> : <>
<Alert title='Repository is unhealthy'>
<>
{item.status?.health.message && item.status.health.message.map(v => <div>{v}<br/><br/></div>)}
<div>
<LinkButton variant="secondary" href={`${PROVISIONING_URL}/${name}/edit`}>
Edit
</LinkButton>
<DeleteRepositoryButton name={name} />
</div>
</>
</Alert>
</>}
</Stack>
)}
{healthy && <SyncRepository repository={item} />}
</Card.Actions>
<Card.SecondaryActions>
{/* <IconButton key="comment-alt" name="comment-alt" tooltip="Tooltip content" />
<IconButton key="copy" name="copy" tooltip="Tooltip content" /> */}
<DeleteRepositoryButton name={name} />
</Card.SecondaryActions>
</Card>
);
})