[questions][fix] fix frontend

pull/530/head
Jeff Sieu 3 years ago
parent aa7de95d0e
commit b7cc2d8afe

@ -223,7 +223,7 @@ export default function ContributeQuestionForm({
createEncounterButtonText="Yes, this is my question"
questionId={question.id}
roles={roleCounts}
timestamp={question.seenAt}
timestamp={question.lastSeenAt}
type={question.type}
onReceivedSubmit={async (data) => {
await addEncounterAsync({

@ -210,7 +210,7 @@ export default function QuestionPage() {
questionId={question.id}
receivedCount={undefined}
roles={relabeledAggregatedEncounters?.roleCounts ?? {}}
timestamp={question.seenAt}
timestamp={question.lastSeenAt}
upvoteCount={question.numVotes}
onReceivedSubmit={async (data) => {
await addEncounterAsync({

@ -558,9 +558,7 @@ export default function QuestionsBrowsePage() {
questionId={question.id}
receivedCount={question.receivedCount}
roles={roleCounts}
timestamp={
question.aggregatedQuestionEncounters.latestSeenAt
}
timestamp={question.lastSeenAt}
type={question.type}
upvoteCount={question.numVotes}
/>

@ -220,7 +220,7 @@ export default function ListPage() {
questionId={question.id}
receivedCount={question.receivedCount}
roles={roleCounts}
timestamp={question.seenAt}
timestamp={question.lastSeenAt}
type={question.type}
onDelete={() => {
deleteQuestionEntry({ id: entryId });

@ -39,7 +39,7 @@ export const questionsQuestionRouter = createRouter()
{
id: input.sortOrder,
},
]
];
break;
case SortType.NEW:
sortCondition = [
@ -61,7 +61,7 @@ export const questionsQuestionRouter = createRouter()
},
];
break;
}
}
const questionsData = await ctx.prisma.questionsQuestion.findMany({
cursor: cursor ? { id: cursor } : undefined,
@ -309,9 +309,8 @@ export const questionsQuestionRouter = createRouter()
let relatedQuestionsId: Array<{ id: string }> = [];
if (input.content !== "") {
relatedQuestionsId = await ctx.prisma
.$queryRaw`
if (input.content !== '') {
relatedQuestionsId = await ctx.prisma.$queryRaw`
SELECT id FROM "QuestionsQuestion"
WHERE
ts_rank_cd(to_tsvector("content"), to_tsquery(${query}), 32) > 0.1
@ -319,8 +318,6 @@ export const questionsQuestionRouter = createRouter()
`;
}
const relatedQuestionsIdArray = relatedQuestionsId.map(
(current) => current.id,
);
@ -338,7 +335,7 @@ export const questionsQuestionRouter = createRouter()
{
id: input.sortOrder,
},
]
];
break;
case SortType.NEW:
sortCondition = [
@ -360,7 +357,7 @@ export const questionsQuestionRouter = createRouter()
},
];
break;
}
}
const questionsData = await ctx.prisma.questionsQuestion.findMany({
cursor: cursor ? { id: cursor } : undefined,
@ -391,9 +388,12 @@ export const questionsQuestionRouter = createRouter()
orderBy: sortCondition,
take: input.limit + 1,
where: {
id: input.content !== "" ? {
in: relatedQuestionsIdArray,
} : undefined,
id:
input.content !== ''
? {
in: relatedQuestionsIdArray,
}
: undefined,
...(input.questionTypes.length > 0
? {
questionType: {

@ -4,11 +4,11 @@ export type Question = {
aggregatedQuestionEncounters: AggregatedQuestionEncounter;
content: string;
id: string;
lastSeenAt: Date | null;
numAnswers: number;
numComments: number;
numVotes: number;
receivedCount: number;
lastSeenAt: Date | null;
type: QuestionsQuestionType;
updatedAt: Date;
user: string;

@ -61,11 +61,11 @@ export function createQuestionWithAggregateData(
),
content: data.content,
id: data.id,
lastSeenAt: data.lastSeenAt,
numAnswers: data._count.answers,
numComments: data._count.comments,
numVotes: votes,
receivedCount: data.encounters.length,
lastSeenAt: data.lastSeenAt,
type: data.questionType,
updatedAt: data.updatedAt,
user: data.user?.name ?? '',
@ -81,7 +81,6 @@ export function createAggregatedQuestionEncounter(
const roleCounts: Record<string, number> = {};
for (const encounter of encounters) {
if (encounter.company !== null) {
if (!(encounter.company.name in companyCounts)) {
companyCounts[encounter.company!.name] = 0;

Loading…
Cancel
Save