Skip to content

fix(loading): Adds loading on refetch #415

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 2 commits into from
Dec 27, 2023
Merged

fix(loading): Adds loading on refetch #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
911d0f0
fix(loading): Adds loading on refetch
cmp5987 Dec 27, 2023
5ba6876
fix(build): Ran build
cmp5987 Dec 27, 2023
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
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.ab02b817.css",
"main.js": "/static/js/main.5dcae6fa.js",
"main.js": "/static/js/main.09054de2.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 @@ -158,7 +158,7 @@
"static/media/eldrich.png": "/static/media/eldrich.a80c74e8249d2461e174.png",
"index.html": "/index.html",
"main.ab02b817.css.map": "/static/css/main.ab02b817.css.map",
"main.5dcae6fa.js.map": "/static/js/main.5dcae6fa.js.map",
"main.09054de2.js.map": "/static/js/main.09054de2.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 @@ -315,6 +315,6 @@
},
"entrypoints": [
"static/css/main.ab02b817.css",
"static/js/main.5dcae6fa.js"
"static/js/main.09054de2.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>Tavern - Red Team Engagement Platform</title><script defer="defer" src="/static/js/main.5dcae6fa.js"></script><link href="/static/css/main.ab02b817.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>Tavern - Red Team Engagement Platform</title><script defer="defer" src="/static/js/main.09054de2.js"></script><link href="/static/css/main.ab02b817.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
6 changes: 3 additions & 3 deletions ...rnal/www/build/static/js/main.5dcae6fa.js → ...rnal/www/build/static/js/main.09054de2.js
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tavern/internal/www/src/pages/tasks/Tasks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ const Tasks = () => {
<div className="border-b border-gray-200 pb-5 sm:flex sm:items-center sm:justify-between">
<TaskPageHeader />
</div>
<FilterBar setSearch={setSearch} setBeacons={setBeacons} setGroups={setGroups} setServices={setServices} setHosts={setHosts} setPlatforms={setPlatforms} />
{loading ? (
<EmptyState type={EmptyStateType.loading} label="Loading quest tasks..." />
) : error ? (
<EmptyState type={EmptyStateType.error} label="Error loading tasks..." />
) : (
<div>
<FilterBar setSearch={setSearch} setBeacons={setBeacons} setGroups={setGroups} setServices={setServices} setHosts={setHosts} setPlatforms={setPlatforms} />
{data?.tasks?.length > 0 ? (
<div className="py-4 bg-white rounded-lg shadow-lg mt-2">
<TaskTable tasks={tableData} onToggle={handleClick} />
Expand Down
4 changes: 2 additions & 2 deletions tavern/internal/www/src/pages/tasks/useTasks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useQuery } from "@apollo/client";
import { NetworkStatus, useQuery } from "@apollo/client";
import { useCallback, useEffect, useState } from "react";
import { GET_TASK_QUERY } from "../../utils/queries";

Expand Down Expand Up @@ -50,7 +50,7 @@ export const useTasks = (defaultQuery?: TASK_PAGE_TYPE, id?: string) => {
},[defaultQuery, id]);

// get tasks
const { loading, error, data, refetch } = useQuery(GET_TASK_QUERY, {variables: constructDefaultQuery("")});
const { loading, error, data, refetch} = useQuery(GET_TASK_QUERY, {variables: constructDefaultQuery(""), notifyOnNetworkStatusChange: true});

const updateTaskList = useCallback(() => {
let fq = constructDefaultQuery(search) as any;
Expand Down