Skip to content

Cp expand tome details #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmp5987 merged 3 commits into from
Feb 26, 2024
Merged

Cp expand tome details #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46fb146
fix(tome): Add additional tome data
cmp5987 Feb 26, 2024
a874f4c
fix(build): Rebuild UI
cmp5987 Feb 26, 2024
d74b0fd
Merge branch 'main' into cp-expand-tome-details
cmp5987 Feb 26, 2024
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: 6 additions & 6 deletions tavern/internal/www/build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.f4e69bbe.css",
"main.js": "/static/js/main.b5beb464.js",
"main.css": "/static/css/main.6e32d9b6.css",
"main.js": "/static/js/main.23751e9e.js",
"react-syntax-highlighter/refractor-core-import.js": "/static/js/react-syntax-highlighter/refractor-core-import.d0cd1e85.chunk.js",
"react-syntax-highlighter_languages_refractor_abap.js": "/static/js/react-syntax-highlighter_languages_refractor_abap.a2bf84e3.chunk.js",
"react-syntax-highlighter_languages_refractor_actionscript.js": "/static/js/react-syntax-highlighter_languages_refractor_actionscript.fff5a604.chunk.js",
Expand Down Expand Up @@ -157,8 +157,8 @@
"static/js/787.4af0fb89.chunk.js": "/static/js/787.4af0fb89.chunk.js",
"static/media/eldrich.png": "/static/media/eldrich.a80c74e8249d2461e174.png",
"index.html": "/index.html",
"main.f4e69bbe.css.map": "/static/css/main.f4e69bbe.css.map",
"main.b5beb464.js.map": "/static/js/main.b5beb464.js.map",
"main.6e32d9b6.css.map": "/static/css/main.6e32d9b6.css.map",
"main.23751e9e.js.map": "/static/js/main.23751e9e.js.map",
"refractor-core-import.d0cd1e85.chunk.js.map": "/static/js/react-syntax-highlighter/refractor-core-import.d0cd1e85.chunk.js.map",
"react-syntax-highlighter_languages_refractor_abap.a2bf84e3.chunk.js.map": "/static/js/react-syntax-highlighter_languages_refractor_abap.a2bf84e3.chunk.js.map",
"react-syntax-highlighter_languages_refractor_actionscript.fff5a604.chunk.js.map": "/static/js/react-syntax-highlighter_languages_refractor_actionscript.fff5a604.chunk.js.map",
Expand Down Expand Up @@ -314,7 +314,7 @@
"787.4af0fb89.chunk.js.map": "/static/js/787.4af0fb89.chunk.js.map"
},
"entrypoints": [
"static/css/main.f4e69bbe.css",
"static/js/main.b5beb464.js"
"static/css/main.6e32d9b6.css",
"static/js/main.23751e9e.js"
]
}
2 changes: 1 addition & 1 deletion tavern/internal/www/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="manifest" href="/site.webmanifest"><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Realm - Red Team Engagement Platform</title><script defer="defer" src="/static/js/main.b5beb464.js"></script><link href="/static/css/main.f4e69bbe.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="manifest" href="/site.webmanifest"><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Realm - Red Team Engagement Platform</title><script defer="defer" src="/static/js/main.23751e9e.js"></script><link href="/static/css/main.6e32d9b6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
4 changes: 2 additions & 2 deletions ...al/www/build/static/css/main.f4e69bbe.css → ...al/www/build/static/css/main.6e32d9b6.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ww/build/static/css/main.f4e69bbe.css.map → ...ww/build/static/css/main.6e32d9b6.css.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ...rnal/www/build/static/js/main.b5beb464.js → ...rnal/www/build/static/js/main.23751e9e.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...ld/static/js/main.b5beb464.js.LICENSE.txt → ...ld/static/js/main.23751e9e.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../www/build/static/js/main.b5beb464.js.map → .../www/build/static/js/main.23751e9e.js.map
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions tavern/internal/www/src/components/TomeAccordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ const TomeAccordion = (props: Props) => {
<div className='flex flex-row gap-2 w-full items-center'>
<Box as="div" flex='1' textAlign='left' className='flex flex-col w-full gap-1'>
<div
className={`items-center font-medium text-gray-900`}
className={`items-center font-semibold text-gray-900`}
>
{tome.name}
</div>
<div
className={`flex flex-col gap- w-full text-sm text-gray-600 gap-2`}
className={`flex flex-col w-full text-sm text-gray-600`}
>
<p>{tome.description}</p>
{params && params.length > 0 &&
Expand All @@ -33,6 +33,7 @@ const TomeAccordion = (props: Props) => {
})}
</div>
}
{tome.tactic && tome.tactic !== "UNSPECIFIED" && <div>Tactic: <span className="lowercase">{tome?.tactic}</span></div>}
</div>
</Box>
<div className='text-sm items-center'>
Expand Down
63 changes: 0 additions & 63 deletions tavern/internal/www/src/pages/create-quest/components/FinalizeTome.tsx
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions tavern/internal/www/src/pages/create-quest/components/TomeRadioGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ const TomeRadioGroup = (
<Box as="div" flex='1' textAlign='left' className='flex flex-col w-full gap-1'>
<RadioGroup.Label
as="div"
className={`items-center font-medium text-gray-900`}
className={`flex flex-row gap-2 items-center`}
>
{tome.name}
<h4 className=' text-gray-900 font-semibold'>{tome.name}</h4>
</RadioGroup.Label>
<RadioGroup.Description
as="div"
Expand All @@ -96,6 +96,7 @@ const TomeRadioGroup = (
})}
</div>
}
{tome.tactic && tome.tactic !== "UNSPECIFIED" && <div>Tactic: <span className="lowercase">{tome?.tactic}</span></div>}
</RadioGroup.Description>
</Box>
{checked &&
Expand Down
2 changes: 2 additions & 0 deletions tavern/internal/www/src/pages/create-quest/components/TomeStepWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ const GET_TOMES = gql`
paramDefs
description
eldritch
tactic
supportModel
}
}
`;
Expand Down
1 change: 1 addition & 0 deletions tavern/internal/www/src/pages/create-quest/hooks/useSubmitQuest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export const useSubmitQuest = () => {
id
name
paramDefs
tactic
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tavern/internal/www/src/pages/tomes/Tomes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const Tomes = () => {
<h3 className="text-xl font-semibold leading-6 text-gray-900">Tomes</h3>
<div className="max-w-2xl text-sm">
<span>A tome is a prebuilt bundle, which includes execution instructions and files. Tomes are how beacon actions are defined. </span>
<a className="external-link" target="_blank" href="https://docs.realm.pub/user-guide/golem#creating-and-testing-tomes">Learn more</a>
<a className="external-link" target="_blank" rel="noreferrer" href="https://docs.realm.pub/user-guide/golem#creating-and-testing-tomes">Learn more</a>
<span> about how to write, test, and import tome repositories.</span>
</div>

Expand Down
2 changes: 1 addition & 1 deletion tavern/internal/www/src/pages/tomes/components/ImportRepositoryModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FC, useState } from "react";
import { FormSteps } from "../../../components/form-steps";
import Modal from "../../../components/tavern-base-ui/Modal";
import { RepositoryRow, RepositoryType, Tome } from "../../../utils/consts";
import { RepositoryType, Tome } from "../../../utils/consts";
import StepAddDeploymentKey from "./StepAddDeploymentKey";
import StepCreateRepository from "./StepCreateRepository";

Expand Down
6 changes: 3 additions & 3 deletions tavern/internal/www/src/pages/tomes/components/RepositoryTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Badge, Button, Image, Tooltip, useToast } from "@chakra-ui/react";
import { Badge, Button, Image, Tooltip } from "@chakra-ui/react";
import { ArrowPathIcon, ChevronDownIcon, ChevronRightIcon, ClipboardDocumentIcon } from "@heroicons/react/24/outline";
import { ColumnDef, Row } from "@tanstack/react-table";
import { formatDistance } from "date-fns";
Expand Down Expand Up @@ -55,7 +55,7 @@ const RepositoryTable = ({ repositories }: {
<div className="flex flex-row gap-2 items-center" >
{row.getIsExpanded() ? <div><ChevronDownIcon className="w-4 h-4" /></div> : <div><ChevronRightIcon className="w-4 h-4" /></div>}
<div className="flex flex-row gap-2 flex-wrap">
{hasLink ? <a href={url} target="_blank" className="external-link">{url}</a> : url}
{hasLink ? <a href={url} target="_blank" rel="noreferrer" className="external-link">{url}</a> : url}
{row?.original?.node?.repoType === "FIRST_PARTY" &&
(
<div><Badge colorScheme="purple" px='2'>First Party</Badge></div>
Expand All @@ -64,7 +64,7 @@ const RepositoryTable = ({ repositories }: {
</div>
) : (
<div className="flex flex-row gap-2 flex-wrap">
{hasLink ? <a href={url} target="_blank" className="external-link">{url}</a> : url}
{hasLink ? <a href={url} target="_blank" rel="noreferrer" className="external-link">{url}</a> : url}
{row?.original?.node?.repoType === "FIRST_PARTY" &&
(
<div><Badge colorScheme="purple" px='2'>First Party</Badge></div>
Expand Down
6 changes: 3 additions & 3 deletions tavern/internal/www/src/pages/tomes/components/StepAddDeploymentKey.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ const StepAddDeploymentKey: FC<StepAddDeploymentKeyProps> = ({ setCurrStep, newR
To import tomes, you need to give Realm access to your git repository. Copy the public key below into your repositories deployment keys, often found in admin settings.
</p>
<ul className="text-sm list-disc px-4 py-2">
<li>Setup for <a className="external-link" target="_blank" href="https://docs.github.com/en/authentication/connecting-to-github-with-ssh/managing-deploy-keys#set-up-deploy-keys">Github</a></li>
<li>Setup for <a className="external-link" target="_blank" href="https://docs.gitlab.com/ee/user/project/deploy_keys/#create-a-project-deploy-key">Gitlab</a></li>
<li>Setup for <a className="external-link" target="_blank" href="https://bitbucket.org/blog/deployment-keys">Bitbucket</a></li>
<li>Setup for <a className="external-link" rel="noreferrer" target="_blank" href="https://docs.github.com/en/authentication/connecting-to-github-with-ssh/managing-deploy-keys#set-up-deploy-keys">Github</a></li>
<li>Setup for <a className="external-link" rel="noreferrer" target="_blank" href="https://docs.gitlab.com/ee/user/project/deploy_keys/#create-a-project-deploy-key">Gitlab</a></li>
<li>Setup for <a className="external-link" rel="noreferrer" target="_blank" href="https://bitbucket.org/blog/deployment-keys">Bitbucket</a></li>
</ul>
</div>
{error !== "" && (
Expand Down
4 changes: 2 additions & 2 deletions tavern/internal/www/src/pages/tomes/components/StepCreateRepository.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const StepCreateRepository: FC<StepCreateRepositoryProps> = ({ setCurrStep, setN
<div>
<h3 className="font-bold text-lg">Link repository</h3>
<p className="text-sm">
Provide a valid ssh path to a remote repository that contains tomes. <a className="external-link" target="_blank" href="https://docs.realm.pub/user-guide/golem#creating-and-testing-tomes">Learn more</a> about how to structure a tome repository.
Provide a valid ssh path to a remote repository that contains tomes. <a className="external-link" rel="noreferrer" target="_blank" href="https://docs.realm.pub/user-guide/golem#creating-and-testing-tomes">Learn more</a> about how to structure a tome repository.
</p>
</div>
{error !== "" && (
Expand All @@ -34,7 +34,7 @@ const StepCreateRepository: FC<StepCreateRepositoryProps> = ({ setCurrStep, setN
<FormTextField
htmlFor="url"
label="Repository ssh path"
placeholder="ssh://github.com/repo_name"
placeholder="git@github.com:org_name/repo_name.git"
value={formik?.values?.url || ""}
onChange={(event) => formik.setFieldValue('url', event?.target?.value)}
/>
Expand Down
2 changes: 1 addition & 1 deletion tavern/internal/www/src/pages/tomes/hooks/useRepositoryView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const useRepositoryView = () => {
firstPartyRepo
);
}
},[firstPartyTome]);
},[firstPartyTome, firstParty]);

useEffect(()=>{
const repos = [] as Array<RepositoryRow>;
Expand Down
3 changes: 3 additions & 0 deletions tavern/internal/www/src/utils/consts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ export type Tome = {
id: string;
name: string;
paramDefs: string;
tactic: string;
supportModel: string;

}
export type TomeParams = {
name: string;
Expand Down
3 changes: 3 additions & 0 deletions tavern/internal/www/src/utils/queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export const GET_TOMES_QUERY = gql`
tactic
eldritch
supportModel
description
uploader{
id
name
Expand Down Expand Up @@ -107,6 +108,7 @@ export const GET_QUEST_QUERY = gql`
eldritch
tactic
paramDefs
supportModel
}
creator {
id
Expand Down Expand Up @@ -154,6 +156,7 @@ export const GET_TASK_QUERY = gql`
eldritch
tactic
paramDefs
supportModel
}
parameters
}
Expand Down