diff --git a/plugins/github-release-manager/README.md b/plugins/github-release-manager/README.md index 43c842bc26..2a99912576 100644 --- a/plugins/github-release-manager/README.md +++ b/plugins/github-release-manager/README.md @@ -10,7 +10,7 @@ What `GRM` does is manage your **[releases](https://docs.github.com/en/github/ad `GRM` is built with industry standards in mind and the flow is as follows: -![](./src/cards/info/flow.png) +![](./src/features/Info/flow.png) > **GitHub**: The source control system where releases reside in a practical sense. Read more about [GitHub releases](https://docs.github.com/en/github/administering-a-repository/managing-releases-in-a-repository). (Note that this plugin works just as well with GitHub Enterprise.) > diff --git a/plugins/github-release-manager/src/GitHubReleaseManager.tsx b/plugins/github-release-manager/src/GitHubReleaseManager.tsx index ff77e8bbe4..348d4a0578 100644 --- a/plugins/github-release-manager/src/GitHubReleaseManager.tsx +++ b/plugins/github-release-manager/src/GitHubReleaseManager.tsx @@ -25,14 +25,14 @@ import { ComponentConfigPatch, ComponentConfigPromoteRc, } from './types/types'; -import { Cards } from './cards/Cards'; +import { Features } from './features/Features'; import { CenteredCircularProgress } from './components/CenteredCircularProgress'; import { githubReleaseManagerApiRef } from './api/serviceApiRef'; import { InfoCardPlus } from './components/InfoCardPlus'; import { isProjectValid } from './helpers/isProjectValid'; import { PluginApiClientContext } from './contexts/PluginApiClientContext'; import { ProjectContext, Project } from './contexts/ProjectContext'; -import { RepoDetailsForm } from './cards/RepoDetailsForm/RepoDetailsForm'; +import { RepoDetailsForm } from './features/RepoDetailsForm/RepoDetailsForm'; import { useQueryHandler } from './hooks/useQueryHandler'; import { useStyles } from './styles/styles'; @@ -90,7 +90,9 @@ export function GitHubReleaseManager(props: GitHubReleaseManagerProps) { - {isProjectValid(project) && } + {isProjectValid(project) && ( + + )} diff --git a/plugins/github-release-manager/src/components/InfoCardPlus.test.tsx b/plugins/github-release-manager/src/components/InfoCardPlus.test.tsx index efd30b67da..01ed7aa4e8 100644 --- a/plugins/github-release-manager/src/components/InfoCardPlus.test.tsx +++ b/plugins/github-release-manager/src/components/InfoCardPlus.test.tsx @@ -24,6 +24,6 @@ describe('InfoCardPlus', () => { it('render InfoCardPlus', () => { const { getByTestId } = render(); - expect(getByTestId(TEST_IDS.info.infoCardPlus)).toBeInTheDocument(); + expect(getByTestId(TEST_IDS.info.infoFeaturePlus)).toBeInTheDocument(); }); }); diff --git a/plugins/github-release-manager/src/components/InfoCardPlus.tsx b/plugins/github-release-manager/src/components/InfoCardPlus.tsx index 38e3c5f388..fe2da57402 100644 --- a/plugins/github-release-manager/src/components/InfoCardPlus.tsx +++ b/plugins/github-release-manager/src/components/InfoCardPlus.tsx @@ -21,7 +21,7 @@ import { makeStyles } from '@material-ui/core'; import { TEST_IDS } from '../test-helpers/test-ids'; const useStyles = makeStyles(() => ({ - card: { + feature: { marginBottom: '3em', }, })); @@ -32,9 +32,9 @@ export const InfoCardPlus = ({ children }: { children?: React.ReactNode }) => { return (
- {children} + {children}
); }; diff --git a/plugins/github-release-manager/src/cards/CreateRc/CreateRc.test.tsx b/plugins/github-release-manager/src/features/CreateRc/CreateRc.test.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/CreateRc/CreateRc.test.tsx rename to plugins/github-release-manager/src/features/CreateRc/CreateRc.test.tsx diff --git a/plugins/github-release-manager/src/cards/CreateRc/CreateRc.tsx b/plugins/github-release-manager/src/features/CreateRc/CreateRc.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/CreateRc/CreateRc.tsx rename to plugins/github-release-manager/src/features/CreateRc/CreateRc.tsx diff --git a/plugins/github-release-manager/src/cards/CreateRc/hooks/useCreateRc.test.tsx b/plugins/github-release-manager/src/features/CreateRc/hooks/useCreateRc.test.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/CreateRc/hooks/useCreateRc.test.tsx rename to plugins/github-release-manager/src/features/CreateRc/hooks/useCreateRc.test.tsx diff --git a/plugins/github-release-manager/src/cards/CreateRc/hooks/useCreateRc.ts b/plugins/github-release-manager/src/features/CreateRc/hooks/useCreateRc.ts similarity index 100% rename from plugins/github-release-manager/src/cards/CreateRc/hooks/useCreateRc.ts rename to plugins/github-release-manager/src/features/CreateRc/hooks/useCreateRc.ts diff --git a/plugins/github-release-manager/src/cards/Cards.test.tsx b/plugins/github-release-manager/src/features/Features.test.tsx similarity index 84% rename from plugins/github-release-manager/src/cards/Cards.test.tsx rename to plugins/github-release-manager/src/features/Features.test.tsx index 8546c09cef..fd81b276cf 100644 --- a/plugins/github-release-manager/src/cards/Cards.test.tsx +++ b/plugins/github-release-manager/src/features/Features.test.tsx @@ -31,12 +31,12 @@ jest.mock('../contexts/ProjectContext', () => ({ }), })); -import { Cards } from './Cards'; +import { Features } from './Features'; -describe('Cards', () => { - it('should omit cards omitted via configuration', async () => { +describe('Features', () => { + it('should omit features omitted via configuration', async () => { const { getByTestId } = render( - { : A GitHub release intended for end users

+ `); }); diff --git a/plugins/github-release-manager/src/cards/Cards.tsx b/plugins/github-release-manager/src/features/Features.tsx similarity index 99% rename from plugins/github-release-manager/src/cards/Cards.tsx rename to plugins/github-release-manager/src/features/Features.tsx index e47181ba4a..673c9f5696 100644 --- a/plugins/github-release-manager/src/cards/Cards.tsx +++ b/plugins/github-release-manager/src/features/Features.tsx @@ -31,7 +31,7 @@ import { useProjectContext } from '../contexts/ProjectContext'; import { useVersioningStrategyMatchesRepoTags } from '../hooks/useVersioningStrategyMatchesRepoTags'; import { validateTagName } from '../helpers/tagParts/validateTagName'; -export function Cards({ +export function Features({ components, }: { components: GitHubReleaseManagerProps['components']; diff --git a/plugins/github-release-manager/src/cards/Info/Info.test.tsx b/plugins/github-release-manager/src/features/Info/Info.test.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/Info/Info.test.tsx rename to plugins/github-release-manager/src/features/Info/Info.test.tsx diff --git a/plugins/github-release-manager/src/cards/Info/Info.tsx b/plugins/github-release-manager/src/features/Info/Info.tsx similarity index 88% rename from plugins/github-release-manager/src/cards/Info/Info.tsx rename to plugins/github-release-manager/src/features/Info/Info.tsx index 72a61a38e6..ff431930d8 100644 --- a/plugins/github-release-manager/src/cards/Info/Info.tsx +++ b/plugins/github-release-manager/src/features/Info/Info.tsx @@ -14,19 +14,20 @@ * limitations under the License. */ -import React from 'react'; -import { Link, Typography } from '@material-ui/core'; +import React, { useState } from 'react'; +import { Link, Typography, Button } from '@material-ui/core'; -import { Differ } from '../../components/Differ'; -import { InfoCardPlus } from '../../components/InfoCardPlus'; -import { TEST_IDS } from '../../test-helpers/test-ids'; -import { useProjectContext } from '../../contexts/ProjectContext'; -import { useStyles } from '../../styles/styles'; -import flowImage from './flow.png'; import { GetBranchResult, GetLatestReleaseResult, } from '../../api/PluginApiClient'; +import { Differ } from '../../components/Differ'; +import { InfoCardPlus } from '../../components/InfoCardPlus'; +import { Stats } from '../../components/Stats/Stats'; +import { TEST_IDS } from '../../test-helpers/test-ids'; +import { useProjectContext } from '../../contexts/ProjectContext'; +import { useStyles } from '../../styles/styles'; +import flowImage from './flow.png'; interface InfoCardProps { releaseBranch: GetBranchResult | null; @@ -36,6 +37,7 @@ interface InfoCardProps { export const Info = ({ releaseBranch, latestRelease }: InfoCardProps) => { const { project } = useProjectContext(); const classes = useStyles(); + const [showStats, setShowStats] = useState(false); return ( @@ -63,6 +65,15 @@ export const Info = ({ releaseBranch, latestRelease }: InfoCardProps) => { Release Version: A GitHub release intended for end users + + + {showStats && }
diff --git a/plugins/github-release-manager/src/cards/Info/flow.png b/plugins/github-release-manager/src/features/Info/flow.png similarity index 100% rename from plugins/github-release-manager/src/cards/Info/flow.png rename to plugins/github-release-manager/src/features/Info/flow.png diff --git a/plugins/github-release-manager/src/cards/Patch/Patch.test.tsx b/plugins/github-release-manager/src/features/Patch/Patch.test.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/Patch/Patch.test.tsx rename to plugins/github-release-manager/src/features/Patch/Patch.test.tsx diff --git a/plugins/github-release-manager/src/cards/Patch/Patch.tsx b/plugins/github-release-manager/src/features/Patch/Patch.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/Patch/Patch.tsx rename to plugins/github-release-manager/src/features/Patch/Patch.tsx diff --git a/plugins/github-release-manager/src/cards/Patch/PatchBody.test.tsx b/plugins/github-release-manager/src/features/Patch/PatchBody.test.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/Patch/PatchBody.test.tsx rename to plugins/github-release-manager/src/features/Patch/PatchBody.test.tsx diff --git a/plugins/github-release-manager/src/cards/Patch/PatchBody.tsx b/plugins/github-release-manager/src/features/Patch/PatchBody.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/Patch/PatchBody.tsx rename to plugins/github-release-manager/src/features/Patch/PatchBody.tsx diff --git a/plugins/github-release-manager/src/cards/Patch/hooks/usePatch.test.ts b/plugins/github-release-manager/src/features/Patch/hooks/usePatch.test.ts similarity index 100% rename from plugins/github-release-manager/src/cards/Patch/hooks/usePatch.test.ts rename to plugins/github-release-manager/src/features/Patch/hooks/usePatch.test.ts diff --git a/plugins/github-release-manager/src/cards/Patch/hooks/usePatch.ts b/plugins/github-release-manager/src/features/Patch/hooks/usePatch.ts similarity index 100% rename from plugins/github-release-manager/src/cards/Patch/hooks/usePatch.ts rename to plugins/github-release-manager/src/features/Patch/hooks/usePatch.ts diff --git a/plugins/github-release-manager/src/cards/PromoteRc/PromoteRc.test.tsx b/plugins/github-release-manager/src/features/PromoteRc/PromoteRc.test.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/PromoteRc/PromoteRc.test.tsx rename to plugins/github-release-manager/src/features/PromoteRc/PromoteRc.test.tsx diff --git a/plugins/github-release-manager/src/cards/PromoteRc/PromoteRc.tsx b/plugins/github-release-manager/src/features/PromoteRc/PromoteRc.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/PromoteRc/PromoteRc.tsx rename to plugins/github-release-manager/src/features/PromoteRc/PromoteRc.tsx diff --git a/plugins/github-release-manager/src/cards/PromoteRc/PromoteRcBody.test.tsx b/plugins/github-release-manager/src/features/PromoteRc/PromoteRcBody.test.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/PromoteRc/PromoteRcBody.test.tsx rename to plugins/github-release-manager/src/features/PromoteRc/PromoteRcBody.test.tsx diff --git a/plugins/github-release-manager/src/cards/PromoteRc/PromoteRcBody.tsx b/plugins/github-release-manager/src/features/PromoteRc/PromoteRcBody.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/PromoteRc/PromoteRcBody.tsx rename to plugins/github-release-manager/src/features/PromoteRc/PromoteRcBody.tsx diff --git a/plugins/github-release-manager/src/cards/PromoteRc/hooks/usePromoteRc.test.ts b/plugins/github-release-manager/src/features/PromoteRc/hooks/usePromoteRc.test.ts similarity index 100% rename from plugins/github-release-manager/src/cards/PromoteRc/hooks/usePromoteRc.test.ts rename to plugins/github-release-manager/src/features/PromoteRc/hooks/usePromoteRc.test.ts diff --git a/plugins/github-release-manager/src/cards/PromoteRc/hooks/usePromoteRc.ts b/plugins/github-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts similarity index 100% rename from plugins/github-release-manager/src/cards/PromoteRc/hooks/usePromoteRc.ts rename to plugins/github-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts diff --git a/plugins/github-release-manager/src/cards/RepoDetailsForm/Owner.test.tsx b/plugins/github-release-manager/src/features/RepoDetailsForm/Owner.test.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/RepoDetailsForm/Owner.test.tsx rename to plugins/github-release-manager/src/features/RepoDetailsForm/Owner.test.tsx diff --git a/plugins/github-release-manager/src/cards/RepoDetailsForm/Owner.tsx b/plugins/github-release-manager/src/features/RepoDetailsForm/Owner.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/RepoDetailsForm/Owner.tsx rename to plugins/github-release-manager/src/features/RepoDetailsForm/Owner.tsx diff --git a/plugins/github-release-manager/src/cards/RepoDetailsForm/Repo.test.tsx b/plugins/github-release-manager/src/features/RepoDetailsForm/Repo.test.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/RepoDetailsForm/Repo.test.tsx rename to plugins/github-release-manager/src/features/RepoDetailsForm/Repo.test.tsx diff --git a/plugins/github-release-manager/src/cards/RepoDetailsForm/Repo.tsx b/plugins/github-release-manager/src/features/RepoDetailsForm/Repo.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/RepoDetailsForm/Repo.tsx rename to plugins/github-release-manager/src/features/RepoDetailsForm/Repo.tsx diff --git a/plugins/github-release-manager/src/cards/RepoDetailsForm/RepoDetailsForm.tsx b/plugins/github-release-manager/src/features/RepoDetailsForm/RepoDetailsForm.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/RepoDetailsForm/RepoDetailsForm.tsx rename to plugins/github-release-manager/src/features/RepoDetailsForm/RepoDetailsForm.tsx diff --git a/plugins/github-release-manager/src/cards/RepoDetailsForm/VersioningStrategy.test.tsx b/plugins/github-release-manager/src/features/RepoDetailsForm/VersioningStrategy.test.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/RepoDetailsForm/VersioningStrategy.test.tsx rename to plugins/github-release-manager/src/features/RepoDetailsForm/VersioningStrategy.test.tsx diff --git a/plugins/github-release-manager/src/cards/RepoDetailsForm/VersioningStrategy.tsx b/plugins/github-release-manager/src/features/RepoDetailsForm/VersioningStrategy.tsx similarity index 100% rename from plugins/github-release-manager/src/cards/RepoDetailsForm/VersioningStrategy.tsx rename to plugins/github-release-manager/src/features/RepoDetailsForm/VersioningStrategy.tsx diff --git a/plugins/github-release-manager/src/cards/RepoDetailsForm/styles.ts b/plugins/github-release-manager/src/features/RepoDetailsForm/styles.ts similarity index 100% rename from plugins/github-release-manager/src/cards/RepoDetailsForm/styles.ts rename to plugins/github-release-manager/src/features/RepoDetailsForm/styles.ts diff --git a/plugins/github-release-manager/src/test-helpers/test-ids.test.ts b/plugins/github-release-manager/src/test-helpers/test-ids.test.ts index 5adcebc3d9..199a7a5745 100644 --- a/plugins/github-release-manager/src/test-helpers/test-ids.test.ts +++ b/plugins/github-release-manager/src/test-helpers/test-ids.test.ts @@ -67,7 +67,7 @@ describe('test-ids', () => { }, "info": Object { "info": "grm--info", - "infoCardPlus": "grm--info-card-plus", + "infoFeaturePlus": "grm--info-feature-plus", }, "patch": Object { "body": "grm--patch-body", diff --git a/plugins/github-release-manager/src/test-helpers/test-ids.ts b/plugins/github-release-manager/src/test-helpers/test-ids.ts index 1beb6aec10..a5b38e93a1 100644 --- a/plugins/github-release-manager/src/test-helpers/test-ids.ts +++ b/plugins/github-release-manager/src/test-helpers/test-ids.ts @@ -17,7 +17,7 @@ export const TEST_IDS = { info: { info: 'grm--info', - infoCardPlus: 'grm--info-card-plus', + infoFeaturePlus: 'grm--info-feature-plus', }, createRc: { cta: 'grm--create-rc--cta',