Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions tavern/internal/www/build/asset-manifest.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tavern/internal/www/build/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ const BeaconTable = ({ beacons }: { beacons: Array<BeaconEdge> }) => {
header: 'Beacon',
accessorFn: (row: BeaconEdge) => row?.node?.name,
footer: props => props.column.id,
enableSorting: true,
enableSorting: false,
},
{
id: "principal",
header: "Principal",
accessorFn: (row: BeaconEdge) => row?.node?.principal,
footer: props => props.column.id,
enableSorting: true,
enableSorting: false,
maxSize: 100,
cell: (cellData: any) => {
const principal = cellData.getValue();
Expand Down
4 changes: 4 additions & 0 deletions tavern/internal/www/src/pages/host-list/useHosts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ const getDefaultHostQuery = (pagination: boolean, afterCursor?: Cursor, beforeCu
...filterInfo && filterInfo.hasBeaconWith.hasHostWith,
...(filterInfo && filterInfo.hasBeaconWith.nameIn) && {"hasBeaconsWith": {"nameIn": filterInfo.hasBeaconWith.nameIn}}
},
"orderBy": [{
"field": "LAST_SEEN_AT",
"direction": "DESC"
}]
} as any;

if(pagination){
Expand Down
13 changes: 5 additions & 8 deletions tavern/internal/www/src/pages/tasks/EditablePageHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@ import { useParams } from "react-router-dom";
import { GET_QUEST_QUERY } from "../../utils/queries";
import { useQuery } from "@apollo/client";
import { CreateQuestDropdown } from "../../components/create-quest-dropdown";
import { QuestQueryTopLevel, TaskQueryResponse } from "../../utils/interfacesQuery";
import { QuestQueryTopLevel, } from "../../utils/interfacesQuery";

interface EditablePageHeaderProps {
tasks?: TaskQueryResponse;
}

export const EditablePageHeader: FC<EditablePageHeaderProps> = ({ tasks }) => {
export const EditablePageHeader: FC = () => {
const { questId } = useParams();

const { data } = useQuery<QuestQueryTopLevel>(GET_QUEST_QUERY, {
Expand All @@ -22,6 +18,7 @@ export const EditablePageHeader: FC<EditablePageHeaderProps> = ({ tasks }) => {
},
skip: !questId
});
console.log(data);

const questData = data?.quests?.edges?.[0]?.node;

Expand All @@ -40,13 +37,13 @@ export const EditablePageHeader: FC<EditablePageHeaderProps> = ({ tasks }) => {
<div className="flex flex-col gap-4 w-full">
<div className="flex flex-row justify-between w-full items-center">
<Breadcrumbs pages={BreadcrumbsList} />
{questData && tasks && (
{questData && questData.tasks.edges && (
<CreateQuestDropdown
showLabel={true}
name={questData.name}
originalParms={questData.parameters || ""}
tome={questData.tome}
tasks={tasks}
tasks={questData.tasks}
/>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion tavern/internal/www/src/pages/tasks/Tasks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const Tasks = () => {

return (
<PageWrapper currNavItem={PageNavItem.quests}>
<EditablePageHeader tasks={data?.tasks} />
<EditablePageHeader />
<div className="flex flex-row justify-between items-end px-4 py-2 border-b border-gray-200 pb-5">
<h3 className="text-xl font-semibold leading-6 text-gray-900">{data?.tasks?.edges[0]?.node?.quest?.name || questId}</h3>
<div className="flex flex-row justify-end">
Expand Down
1 change: 1 addition & 0 deletions tavern/internal/www/src/utils/interfacesQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ export interface QuestNode {
creator: UserNode;
tome: TomeNode;
parameters: string | null;
tasks: TaskQueryResponse;
lastUpdatedTask?: LastUpdatedTaskConnection;
tasksTotal?: TaskCountOnly;
tasksOutput?: TaskCountOnly;
Expand Down
10 changes: 10 additions & 0 deletions tavern/internal/www/src/utils/queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,16 @@ export const GET_QUEST_QUERY = gql`
}
}
}
tasks{
edges{
node{
id
beacon {
id
}
}
}
}
tasksTotal:tasks(where: $whereTotalTask){
totalCount
}
Expand Down
Loading