Skip to content
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

BITAMKER-3568: Correctly display job information for jobs with spiders marked as deleted #220

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

BITAMKER-3568: Correctly display job information for jobs with spiders marked as deleted #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 1 deletion estela-api/api/serializers/job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@ class Meta:
)

def get_spider(self, instance):
return {"sid": instance.spider.sid, "name": instance.spider.name}
return {
"sid": instance.spider.sid,
"name": instance.spider.name,
"deleted": instance.spider.deleted
}


class SpiderJobCreateSerializer(serializers.ModelSerializer):
Expand Down
39 changes: 25 additions & 14 deletions estela-web/src/pages/JobDetailPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ interface JobDetailPageState {
spiders: Spider[];
loadedSpiders: boolean;
spiderName: string;
isDeleted: boolean;
newSpiderId: string;
newDataExpireDays: number;
newDataStatus: string;
Expand Down Expand Up @@ -148,6 +149,12 @@ interface MetadataField {
type: string;
}

interface SpiderField {
sid: number;
name: string;
deleted: boolean;
}

class ItemsMetadata extends Component<ItemsMetadataProps> {
item = this.props.item;
metadata: MetadataField[] = [];
Expand Down Expand Up @@ -250,6 +257,7 @@ export class JobDetailPage extends Component<RouteComponentProps<RouteParams>, J
spiders: [],
loadedSpiders: false,
spiderName: "",
isDeleted: false,
newSpiderId: "",
newDataExpireDays: 1,
newDataStatus: "PENDING",
Expand Down Expand Up @@ -293,6 +301,8 @@ export class JobDetailPage extends Component<RouteComponentProps<RouteParams>, J
const tags = response.tags || [];
const lifespan = parseDuration(response.lifespan);
this.setState({
spiderName: (response.spider as unknown as SpiderField).name,
isDeleted: (response.spider as unknown as SpiderField).deleted,
name: response.name,
lifespan: lifespan,
totalResponseBytes: response.totalResponseBytes,
Expand All @@ -307,6 +317,8 @@ export class JobDetailPage extends Component<RouteComponentProps<RouteParams>, J
dataStatus: response.dataStatus,
dataExpiryDays: response.dataExpiryDays == null ? 1 : response.dataExpiryDays,
});
const _spiderId = (response.spider as unknown as SpiderField).sid;
history.replace(`/projects/${this.projectId}/spiders/${_spiderId}/jobs/${this.jobId}`);
},
(error: unknown) => {
error;
Expand All @@ -325,12 +337,8 @@ export class JobDetailPage extends Component<RouteComponentProps<RouteParams>, J
if (results.results.length == 0 || results.results == undefined) {
this.setState({ spiders: [], loadedSpiders: true });
} else {
const spiderName = results.results.find(
(spider: Spider) => String(spider?.sid) === this.spiderId,
)?.name;
this.setState({
spiders: [...results.results],
spiderName: spiderName || "",
newSpiderId: String(results.results[0].sid),
loadedSpiders: true,
});
Expand All @@ -354,12 +362,8 @@ export class JobDetailPage extends Component<RouteComponentProps<RouteParams>, J
if (results.results.length == 0 || results.results == undefined) {
this.setState({ spiders: [], loadedSpiders: true });
} else {
const spiderName = results.results.find(
(spider: Spider) => String(spider?.sid) === this.spiderId,
)?.name;
this.setState({
spiders: [...results.results],
spiderName: spiderName || "",
newSpiderId: String(results.results[0].sid),
loadedSpiders: true,
});
Expand Down Expand Up @@ -657,6 +661,7 @@ export class JobDetailPage extends Component<RouteComponentProps<RouteParams>, J
dataStatus,
dataExpiryDays,
spiderName,
isDeleted,
totalResponseBytes,
items,
status,
Expand Down Expand Up @@ -727,12 +732,18 @@ export class JobDetailPage extends Component<RouteComponentProps<RouteParams>, J
<Text className="font-bold">Spider</Text>
</Col>
<Col>
<Link
to={`/projects/${this.projectId}/spiders/${this.spiderId}`}
className="text-estela-blue-medium px-2"
>
{spiderName}
</Link>
{isDeleted ? (
<Text className="px-2">
{spiderName} <Tag color="volcano">DELETED</Tag>
</Text>
) : (
<Link
to={`/projects/${this.projectId}/spiders/${this.spiderId}`}
className="text-estela-blue-medium px-2"
>
{spiderName}
</Link>
)}
</Col>
</Row>
<Row className="grid grid-cols-3 bg-estela-blue-low py-1 px-2 rounded-lg">
Expand Down