Skip to content
Open
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
14 changes: 7 additions & 7 deletions client/app/components/DocInfoCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
:on-success="props.refresh">
<div class="flex items-center gap-2">
<BaseBadge
:label="rfcToBe.disposition"
:label="rfcToBe.dispositionName ?? rfcToBe.disposition"
:color="dispositionColor(rfcToBe.disposition)" />
<template
v-if="
Expand Down Expand Up @@ -173,10 +173,10 @@
:draft-name="rfcToBe.name ?? ''"
:on-success="props.refresh">
<span class="flex-1">
{{ rfcToBe.stream }}
{{ rfcToBe.streamName ?? rfcToBe.stream }}
<span
v-if="rfcToBe.publicationStream && rfcToBe.publicationStream !== rfcToBe.stream">
(published as {{ rfcToBe.publicationStream }})
(published as {{ rfcToBe.publicationStreamName ?? rfcToBe.publicationStream }})
</span>
</span>
</PatchRfcToBeField>
Expand All @@ -202,7 +202,7 @@
}"
:draft-name="rfcToBe.name ?? ''"
:on-success="props.refresh">
{{ rfcToBe.submittedFormat }}
{{ rfcToBe.submittedFormatName ?? rfcToBe.submittedFormat }}
</PatchRfcToBeField>
</DescriptionListDetails>
</DescriptionListItem>
Expand All @@ -218,7 +218,7 @@
}"
:draft-name="rfcToBe.name ?? ''"
:on-success="props.refresh">
{{ rfcToBe.boilerplate }}
{{ rfcToBe.boilerplateName ?? rfcToBe.boilerplate }}
</PatchRfcToBeField>
</DescriptionListDetails>
</DescriptionListItem>
Expand All @@ -234,12 +234,12 @@
}"
:draft-name="rfcToBe.name ?? ''"
:on-success="props.refresh">
{{ rfcToBe.stdLevel }}
{{ rfcToBe.stdLevelName ?? rfcToBe.stdLevel }}
<span
v-if="
rfcToBe.publicationStdLevel && rfcToBe.publicationStdLevel !== rfcToBe.stdLevel
">
(published as {{ rfcToBe.publicationStdLevel }})
(published as {{ rfcToBe.publicationStdLevelName ?? rfcToBe.publicationStdLevel }})
</span>
<span
v-if="
Expand Down
2 changes: 1 addition & 1 deletion client/app/components/DocumentDependencies.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const columns: Column[] = [
{
key: 'relationship',
label: 'Relationship',
field: 'relationship' satisfies keyof RpcRelatedDocument,
field: 'relationshipName' satisfies keyof RpcRelatedDocument,
classes: 'text-sm font-medium'
},
{
Expand Down
2 changes: 1 addition & 1 deletion client/app/components/DocumentsSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<span
class="font-normal ml-1 text-gray-500 dark:text-gray-400"
v-if="searchResult.disposition">
({{ searchResult.disposition }})
({{ searchResult.dispositionName ?? searchResult.disposition }})
</span>
</ComboboxItem>
</ComboboxViewport>
Expand Down
2 changes: 1 addition & 1 deletion client/app/components/HeaderNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
v-if="doc.disposition"
:class="dispositionClass(doc.disposition)"
class="ml-auto shrink-0 rounded-full px-2 py-0.5 text-xs font-medium"
>{{ doc.disposition }}</span
>{{ doc.dispositionName ?? doc.disposition }}</span
>
</button>
</li>
Expand Down
33 changes: 33 additions & 0 deletions purple_api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5483,6 +5483,15 @@ components:
stream:
type: string
description: Current stream
stream_name:
type: string
readOnly: true
std_level_name:
type: string
readOnly: true
disposition_name:
type: string
readOnly: true
group:
type: string
description: Acronym of datatracker group where this document originated,
Expand Down Expand Up @@ -5976,6 +5985,9 @@ components:
readOnly: true
disposition:
type: string
disposition_name:
type: string
readOnly: true
external_deadline:
type: string
format: date-time
Expand All @@ -5994,6 +6006,9 @@ components:
readOnly: true
submitted_format:
type: string
submitted_format_name:
type: string
readOnly: true
pages:
type: integer
maximum: 2147483647
Expand All @@ -6007,20 +6022,35 @@ components:
boilerplate:
type: string
description: TLP IPR boilerplate option
boilerplate_name:
type: string
readOnly: true
std_level:
type: string
description: Current StdLevel
std_level_name:
type: string
readOnly: true
publication_std_level:
type: string
nullable: true
description: StdLevel at publication (blank until published)
publication_std_level_name:
type: string
readOnly: true
stream:
type: string
description: Current stream
stream_name:
type: string
readOnly: true
publication_stream:
type: string
nullable: true
description: Stream at publication (blank until published)
publication_stream_name:
type: string
readOnly: true
authors:
type: array
items:
Expand Down Expand Up @@ -6318,6 +6348,9 @@ components:
readOnly: true
relationship:
type: string
relationship_name:
type: string
readOnly: true
draft_name:
type: string
readOnly: true
Expand Down
44 changes: 44 additions & 0 deletions rpc/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,27 @@ class RfcToBeSerializer(serializers.ModelSerializer):
source="additionalemail_set", many=True, read_only=True
)
blocking_reasons = RfcToBeBlockingReasonSerializer(many=True, read_only=True)
disposition_name = serializers.SlugRelatedField(
source="disposition", slug_field="name", read_only=True
)
stream_name = serializers.SlugRelatedField(
source="stream", slug_field="name", read_only=True
)
publication_stream_name = serializers.SlugRelatedField(
source="publication_stream", slug_field="name", read_only=True
)
std_level_name = serializers.SlugRelatedField(
source="std_level", slug_field="name", read_only=True
)
publication_std_level_name = serializers.SlugRelatedField(
source="publication_std_level", slug_field="name", read_only=True
)
boilerplate_name = serializers.SlugRelatedField(
source="boilerplate", slug_field="name", read_only=True
)
submitted_format_name = serializers.SlugRelatedField(
source="submitted_format", slug_field="name", read_only=True
)
pub_owner = serializers.SerializerMethodField()

@extend_schema_field(serializers.CharField(allow_null=True))
Expand All @@ -925,18 +946,25 @@ class Meta:
"group",
"draft",
"disposition",
"disposition_name",
"external_deadline",
"internal_goal",
"labels",
"cluster",
"submitted_format",
"submitted_format_name",
"pages",
"keywords",
"boilerplate",
"boilerplate_name",
"std_level",
"std_level_name",
"publication_std_level",
"publication_std_level_name",
"stream",
"stream_name",
"publication_stream",
"publication_stream_name",
"authors",
"shepherd",
"shepherd_id",
Expand Down Expand Up @@ -1377,12 +1405,16 @@ class RpcRelatedDocumentSerializer(serializers.ModelSerializer):
target_disposition = serializers.SerializerMethodField()
target_is_received = serializers.SerializerMethodField()
target_is_blocked = serializers.SerializerMethodField()
relationship_name = serializers.SlugRelatedField(
source="relationship", slug_field="name", read_only=True
)

class Meta:
model = RpcRelatedDocument
fields = [
"id",
"relationship",
"relationship_name",
"draft_name",
"target_draft_name",
"target_rfc_number",
Expand Down Expand Up @@ -2510,6 +2542,15 @@ class PublicQueueItemSerializer(QueueItemSerializer):
references = serializers.SerializerMethodField()
group_name = serializers.SerializerMethodField()
rev = serializers.CharField(source="draft.rev", read_only=True, allow_null=True)
stream_name = serializers.SlugRelatedField(
source="stream", slug_field="name", read_only=True
)
std_level_name = serializers.SlugRelatedField(
source="std_level", slug_field="name", read_only=True
)
disposition_name = serializers.SlugRelatedField(
source="disposition", slug_field="name", read_only=True
)

@extend_schema_field(RpcRelatedDocumentSerializer(many=True))
def get_references(self, obj):
Expand Down Expand Up @@ -2549,6 +2590,9 @@ class Meta:
"authors",
"approval_log_message",
"stream",
"stream_name",
"std_level_name",
"disposition_name",
"group",
"group_name",
"std_level",
Expand Down