Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cf8dceb014 | ||
|
|
ac4b50293e | ||
|
|
802544e452 | ||
|
|
8205fee420 | ||
|
|
4869756957 |
No files matched your search
@@ -53,7 +53,6 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
|
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
|
||||||
JOB_STATUS: ${{ job.status }}
|
JOB_STATUS: ${{ job.status }}
|
||||||
DEPLOY_ENVIRONMENT: dev
|
|
||||||
run: |
|
run: |
|
||||||
if [ -z "$DISCORD_WEBHOOK_URL" ]; then
|
if [ -z "$DISCORD_WEBHOOK_URL" ]; then
|
||||||
echo "DISCORD_WEBHOOK_URL is not configured; skipping Discord notification."
|
echo "DISCORD_WEBHOOK_URL is not configured; skipping Discord notification."
|
||||||
@@ -61,14 +60,53 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$JOB_STATUS" = "success" ]; then
|
if [ "$JOB_STATUS" = "success" ]; then
|
||||||
STATUS_LABEL="SUCCESS"
|
STATUS_TITLE="Deploy succeeded"
|
||||||
|
COLOR=65280
|
||||||
else
|
else
|
||||||
STATUS_LABEL="FAILED"
|
STATUS_TITLE="Deploy failed"
|
||||||
|
COLOR=16711680
|
||||||
fi
|
fi
|
||||||
|
RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
|
||||||
|
AVATAR_URL="${{ vars.DISCORD_AVATAR_URL }}"
|
||||||
|
AVATAR_URL="${AVATAR_URL:-https://www.flockpal.app/FlockPal-Paint.png}"
|
||||||
|
COMMIT_MESSAGE="$(git -C /docker/FlockPal-dev log -1 --pretty=%s 2>/dev/null || printf '%s' '${{ github.sha }}')"
|
||||||
|
json_escape() {
|
||||||
|
printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g'
|
||||||
|
}
|
||||||
|
BRANCH="$(json_escape '${{ github.ref_name }}')"
|
||||||
|
MESSAGE="$(json_escape "$COMMIT_MESSAGE")"
|
||||||
|
AVATAR_URL="$(json_escape "$AVATAR_URL")"
|
||||||
|
|
||||||
|
cat > /tmp/discord-payload.json <<EOF
|
||||||
|
{
|
||||||
|
"username": "FlockPal Build",
|
||||||
|
"avatar_url": "${AVATAR_URL}",
|
||||||
|
"embeds": [
|
||||||
|
{
|
||||||
|
"title": "${STATUS_TITLE}",
|
||||||
|
"url": "${RUN_URL}",
|
||||||
|
"description": "FlockPal dev deploy",
|
||||||
|
"color": ${COLOR},
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"name": "Branch",
|
||||||
|
"value": "${BRANCH}",
|
||||||
|
"inline": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Message",
|
||||||
|
"value": "${MESSAGE}",
|
||||||
|
"inline": false
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
curl --fail --show-error --silent \
|
curl --fail --show-error --silent \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "{\"content\":\"[${STATUS_LABEL}] FlockPal ${DEPLOY_ENVIRONMENT} deploy completed with status: ${JOB_STATUS}\\nBranch: ${{ github.ref_name }}\\nCommit: ${{ github.sha }}\\nRun: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\"}" \
|
-d @/tmp/discord-payload.json \
|
||||||
"$DISCORD_WEBHOOK_URL" || echo "Discord notification failed."
|
"$DISCORD_WEBHOOK_URL" || echo "Discord notification failed."
|
||||||
|
|
||||||
deploy-prod:
|
deploy-prod:
|
||||||
@@ -121,7 +159,6 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
|
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
|
||||||
JOB_STATUS: ${{ job.status }}
|
JOB_STATUS: ${{ job.status }}
|
||||||
DEPLOY_ENVIRONMENT: production
|
|
||||||
run: |
|
run: |
|
||||||
if [ -z "$DISCORD_WEBHOOK_URL" ]; then
|
if [ -z "$DISCORD_WEBHOOK_URL" ]; then
|
||||||
echo "DISCORD_WEBHOOK_URL is not configured; skipping Discord notification."
|
echo "DISCORD_WEBHOOK_URL is not configured; skipping Discord notification."
|
||||||
@@ -129,12 +166,51 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$JOB_STATUS" = "success" ]; then
|
if [ "$JOB_STATUS" = "success" ]; then
|
||||||
STATUS_LABEL="SUCCESS"
|
STATUS_TITLE="Deploy succeeded"
|
||||||
|
COLOR=65280
|
||||||
else
|
else
|
||||||
STATUS_LABEL="FAILED"
|
STATUS_TITLE="Deploy failed"
|
||||||
|
COLOR=16711680
|
||||||
fi
|
fi
|
||||||
|
RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
|
||||||
|
AVATAR_URL="${{ vars.DISCORD_AVATAR_URL }}"
|
||||||
|
AVATAR_URL="${AVATAR_URL:-https://www.flockpal.app/FlockPal-Paint.png}"
|
||||||
|
COMMIT_MESSAGE="$(git -C /docker/FlockPal log -1 --pretty=%s 2>/dev/null || printf '%s' '${{ github.sha }}')"
|
||||||
|
json_escape() {
|
||||||
|
printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g'
|
||||||
|
}
|
||||||
|
BRANCH="$(json_escape '${{ github.ref_name }}')"
|
||||||
|
MESSAGE="$(json_escape "$COMMIT_MESSAGE")"
|
||||||
|
AVATAR_URL="$(json_escape "$AVATAR_URL")"
|
||||||
|
|
||||||
|
cat > /tmp/discord-payload.json <<EOF
|
||||||
|
{
|
||||||
|
"username": "FlockPal Build",
|
||||||
|
"avatar_url": "${AVATAR_URL}",
|
||||||
|
"embeds": [
|
||||||
|
{
|
||||||
|
"title": "${STATUS_TITLE}",
|
||||||
|
"url": "${RUN_URL}",
|
||||||
|
"description": "FlockPal production deploy",
|
||||||
|
"color": ${COLOR},
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"name": "Branch",
|
||||||
|
"value": "${BRANCH}",
|
||||||
|
"inline": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Message",
|
||||||
|
"value": "${MESSAGE}",
|
||||||
|
"inline": false
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
curl --fail --show-error --silent \
|
curl --fail --show-error --silent \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "{\"content\":\"[${STATUS_LABEL}] FlockPal ${DEPLOY_ENVIRONMENT} deploy completed with status: ${JOB_STATUS}\\nBranch: ${{ github.ref_name }}\\nCommit: ${{ github.sha }}\\nRun: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\"}" \
|
-d @/tmp/discord-payload.json \
|
||||||
"$DISCORD_WEBHOOK_URL" || echo "Discord notification failed."
|
"$DISCORD_WEBHOOK_URL" || echo "Discord notification failed."
|
||||||
+3
-5
@@ -657,7 +657,6 @@ const normalizeBird = (row: BirdRow) => ({
|
|||||||
publicProfileEnabled: row.public_profile_enabled ?? false,
|
publicProfileEnabled: row.public_profile_enabled ?? false,
|
||||||
memorializedAt: row.memorialized_at,
|
memorializedAt: row.memorialized_at,
|
||||||
memorializedOn: row.memorialized_on,
|
memorializedOn: row.memorialized_on,
|
||||||
memorialNote: row.memorial_note,
|
|
||||||
notifyOnMemorialDay: row.notify_on_memorial_day,
|
notifyOnMemorialDay: row.notify_on_memorial_day,
|
||||||
createdAt: row.created_at,
|
createdAt: row.created_at,
|
||||||
latestWeightGrams: row.latest_weight_grams ? Number(row.latest_weight_grams) : null,
|
latestWeightGrams: row.latest_weight_grams ? Number(row.latest_weight_grams) : null,
|
||||||
@@ -1712,9 +1711,7 @@ const buildBirdMilestoneReminderCopy = (reminder: BirdMilestoneReminderCandidate
|
|||||||
yearCount > 0
|
yearCount > 0
|
||||||
? `From our flock to yours, holding ${reminder.name}'s memory close on this ${formatOrdinal(yearCount)} memorial day.`
|
? `From our flock to yours, holding ${reminder.name}'s memory close on this ${formatOrdinal(yearCount)} memorial day.`
|
||||||
: `From our flock to yours, holding ${reminder.name}'s memory close today.`,
|
: `From our flock to yours, holding ${reminder.name}'s memory close today.`,
|
||||||
body: reminder.memorial_note
|
body: 'A quiet moment for the feathers, songs, routines, and happy memories that still stay with you.',
|
||||||
? reminder.memorial_note
|
|
||||||
: 'A quiet moment for the feathers, songs, routines, and happy memories that still stay with you.',
|
|
||||||
milestoneLabel: yearCount > 0 ? `${formatOrdinal(yearCount)} Memorial Day` : 'Memorial Day on file',
|
milestoneLabel: yearCount > 0 ? `${formatOrdinal(yearCount)} Memorial Day` : 'Memorial Day on file',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -3569,6 +3566,7 @@ app.post('/api/birds', requireAuth, requireWriteAccess, requireWorkspaceRole(['o
|
|||||||
toWorkspaceId: req.auth!.workspace.id,
|
toWorkspaceId: req.auth!.workspace.id,
|
||||||
locationLabel: bird!.location_label,
|
locationLabel: bird!.location_label,
|
||||||
locationDetails: bird!.location_details,
|
locationDetails: bird!.location_details,
|
||||||
|
eventDate: emptyToNull(parsed.data.locationDate),
|
||||||
createdByUserId: req.auth!.user.id,
|
createdByUserId: req.auth!.user.id,
|
||||||
});
|
});
|
||||||
res.status(201).json({ bird: normalizeBird(bird!) });
|
res.status(201).json({ bird: normalizeBird(bird!) });
|
||||||
@@ -3948,6 +3946,7 @@ app.put('/api/birds/:birdId', requireAuth, requireWriteAccess, requireWorkspaceR
|
|||||||
toWorkspaceId: req.auth!.workspace.id,
|
toWorkspaceId: req.auth!.workspace.id,
|
||||||
locationLabel: bird.location_label,
|
locationLabel: bird.location_label,
|
||||||
locationDetails: bird.location_details,
|
locationDetails: bird.location_details,
|
||||||
|
eventDate: emptyToNull(parsed.data.locationDate),
|
||||||
createdByUserId: req.auth!.user.id,
|
createdByUserId: req.auth!.user.id,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -4015,7 +4014,6 @@ app.post('/api/birds/:birdId/memorialize', requireAuth, requireWriteAccess, requ
|
|||||||
birdId: req.params.birdId,
|
birdId: req.params.birdId,
|
||||||
workspaceId: req.auth!.workspace.id,
|
workspaceId: req.auth!.workspace.id,
|
||||||
memorializedOn: parsed.data.memorializedOn,
|
memorializedOn: parsed.data.memorializedOn,
|
||||||
memorialNote: emptyToNull(parsed.data.memorialNote),
|
|
||||||
notifyOnMemorialDay: parsed.data.notifyOnMemorialDay ?? false,
|
notifyOnMemorialDay: parsed.data.notifyOnMemorialDay ?? false,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -235,7 +235,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
|||||||
public_profile_enabled BOOLEAN NOT NULL DEFAULT FALSE,
|
public_profile_enabled BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
memorialized_at TIMESTAMPTZ,
|
memorialized_at TIMESTAMPTZ,
|
||||||
memorialized_on DATE,
|
memorialized_on DATE,
|
||||||
memorial_note VARCHAR(1000),
|
|
||||||
notify_on_memorial_day BOOLEAN NOT NULL DEFAULT FALSE,
|
notify_on_memorial_day BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
|
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
);
|
);
|
||||||
@@ -265,7 +264,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
|||||||
ADD COLUMN IF NOT EXISTS public_profile_enabled BOOLEAN NOT NULL DEFAULT FALSE,
|
ADD COLUMN IF NOT EXISTS public_profile_enabled BOOLEAN NOT NULL DEFAULT FALSE,
|
||||||
ADD COLUMN IF NOT EXISTS memorialized_at TIMESTAMPTZ,
|
ADD COLUMN IF NOT EXISTS memorialized_at TIMESTAMPTZ,
|
||||||
ADD COLUMN IF NOT EXISTS memorialized_on DATE,
|
ADD COLUMN IF NOT EXISTS memorialized_on DATE,
|
||||||
ADD COLUMN IF NOT EXISTS memorial_note VARCHAR(1000),
|
|
||||||
ADD COLUMN IF NOT EXISTS notify_on_memorial_day BOOLEAN NOT NULL DEFAULT FALSE;
|
ADD COLUMN IF NOT EXISTS notify_on_memorial_day BOOLEAN NOT NULL DEFAULT FALSE;
|
||||||
|
|
||||||
ALTER TABLE birds
|
ALTER TABLE birds
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ export const birdResponse = z.object({
|
|||||||
photoDataUrl: text.describe('Photo URL or legacy data URL. Storage-backed URLs expire; refresh the bird list to obtain a new URL.'),
|
photoDataUrl: text.describe('Photo URL or legacy data URL. Storage-backed URLs expire; refresh the bird list to obtain a new URL.'),
|
||||||
photoObjectKey: text, photoContentType: text, photoUpdatedAt: timestamp.nullable(),
|
photoObjectKey: text, photoContentType: text, photoUpdatedAt: timestamp.nullable(),
|
||||||
notifyOnDob: z.boolean(), notifyOnGotchaDay: z.boolean(), publicProfileCode: text, publicProfileEnabled: z.boolean(),
|
notifyOnDob: z.boolean(), notifyOnGotchaDay: z.boolean(), publicProfileCode: text, publicProfileEnabled: z.boolean(),
|
||||||
memorializedAt: timestamp.nullable(), memorializedOn: date.nullable(), memorialNote: text,
|
memorializedAt: timestamp.nullable(), memorializedOn: date.nullable(),
|
||||||
notifyOnMemorialDay: z.boolean(), createdAt: timestamp,
|
notifyOnMemorialDay: z.boolean(), createdAt: timestamp,
|
||||||
latestWeightGrams: z.number().nullable(), latestRecordedOn: date.nullable(),
|
latestWeightGrams: z.number().nullable(), latestRecordedOn: date.nullable(),
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ const birdSelectFields = `
|
|||||||
birds.public_profile_enabled,
|
birds.public_profile_enabled,
|
||||||
birds.memorialized_at,
|
birds.memorialized_at,
|
||||||
birds.memorialized_on::text,
|
birds.memorialized_on::text,
|
||||||
birds.memorial_note,
|
|
||||||
birds.notify_on_memorial_day,
|
birds.notify_on_memorial_day,
|
||||||
birds.created_at,
|
birds.created_at,
|
||||||
latest.weight_grams AS latest_weight_grams,
|
latest.weight_grams AS latest_weight_grams,
|
||||||
@@ -544,7 +543,7 @@ export const createBird = async ({
|
|||||||
const result = await db.query<BirdRow>(
|
const result = await db.query<BirdRow>(
|
||||||
`INSERT INTO birds (id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth, gotcha_day, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled)
|
`INSERT INTO birds (id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth, gotcha_day, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled)
|
||||||
VALUES (COALESCE($1::uuid, gen_random_uuid()), $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26)
|
VALUES (COALESCE($1::uuid, gen_random_uuid()), $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26)
|
||||||
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at, NULL::text AS latest_weight_grams, NULL::text AS latest_recorded_on`,
|
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, notify_on_memorial_day, created_at, NULL::text AS latest_weight_grams, NULL::text AS latest_recorded_on`,
|
||||||
[
|
[
|
||||||
birdId ?? null,
|
birdId ?? null,
|
||||||
workspaceId,
|
workspaceId,
|
||||||
@@ -662,7 +661,7 @@ export const updateBird = async ({
|
|||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
AND workspace_id = $26
|
AND workspace_id = $26
|
||||||
AND memorialized_at IS NULL
|
AND memorialized_at IS NULL
|
||||||
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, notify_on_memorial_day, created_at,
|
||||||
(
|
(
|
||||||
SELECT weight_grams::text
|
SELECT weight_grams::text
|
||||||
FROM weight_records
|
FROM weight_records
|
||||||
@@ -714,25 +713,22 @@ export const memorializeBird = async ({
|
|||||||
birdId,
|
birdId,
|
||||||
workspaceId,
|
workspaceId,
|
||||||
memorializedOn,
|
memorializedOn,
|
||||||
memorialNote,
|
|
||||||
notifyOnMemorialDay,
|
notifyOnMemorialDay,
|
||||||
}: {
|
}: {
|
||||||
birdId: string;
|
birdId: string;
|
||||||
workspaceId: number;
|
workspaceId: number;
|
||||||
memorializedOn: string;
|
memorializedOn: string;
|
||||||
memorialNote: string | null;
|
|
||||||
notifyOnMemorialDay: boolean;
|
notifyOnMemorialDay: boolean;
|
||||||
}) => {
|
}) => {
|
||||||
const result = await db.query<BirdRow>(
|
const result = await db.query<BirdRow>(
|
||||||
`UPDATE birds
|
`UPDATE birds
|
||||||
SET memorialized_at = CURRENT_TIMESTAMP,
|
SET memorialized_at = CURRENT_TIMESTAMP,
|
||||||
memorialized_on = $3,
|
memorialized_on = $3,
|
||||||
memorial_note = $4,
|
notify_on_memorial_day = $4
|
||||||
notify_on_memorial_day = $5
|
|
||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
AND workspace_id = $2
|
AND workspace_id = $2
|
||||||
AND memorialized_at IS NULL
|
AND memorialized_at IS NULL
|
||||||
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, notify_on_memorial_day, created_at,
|
||||||
(
|
(
|
||||||
SELECT weight_grams::text
|
SELECT weight_grams::text
|
||||||
FROM weight_records
|
FROM weight_records
|
||||||
@@ -747,7 +743,7 @@ export const memorializeBird = async ({
|
|||||||
ORDER BY recorded_on DESC
|
ORDER BY recorded_on DESC
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
) AS latest_recorded_on`,
|
) AS latest_recorded_on`,
|
||||||
[birdId, workspaceId, memorializedOn, memorialNote, notifyOnMemorialDay],
|
[birdId, workspaceId, memorializedOn, notifyOnMemorialDay],
|
||||||
);
|
);
|
||||||
|
|
||||||
return result.rows[0] ?? null;
|
return result.rows[0] ?? null;
|
||||||
@@ -768,7 +764,7 @@ export const updateMemorialReminderPreference = async ({
|
|||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
AND workspace_id = $2
|
AND workspace_id = $2
|
||||||
AND memorialized_at IS NOT NULL
|
AND memorialized_at IS NOT NULL
|
||||||
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, notify_on_memorial_day, created_at,
|
||||||
(
|
(
|
||||||
SELECT weight_grams::text
|
SELECT weight_grams::text
|
||||||
FROM weight_records
|
FROM weight_records
|
||||||
@@ -796,7 +792,7 @@ export const transferBirdToWorkspace = async (birdId: string, sourceWorkspaceId:
|
|||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
AND workspace_id = $2
|
AND workspace_id = $2
|
||||||
AND memorialized_at IS NULL
|
AND memorialized_at IS NULL
|
||||||
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, notify_on_memorial_day, created_at,
|
||||||
(
|
(
|
||||||
SELECT weight_grams::text
|
SELECT weight_grams::text
|
||||||
FROM weight_records
|
FROM weight_records
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ export const locationSearchSchema = z.object({
|
|||||||
});
|
});
|
||||||
|
|
||||||
export const birdSchema = z.object({
|
export const birdSchema = z.object({
|
||||||
|
locationDate: dateStringSchema.optional().or(z.literal('')),
|
||||||
name: z.string().trim().min(1).max(120),
|
name: z.string().trim().min(1).max(120),
|
||||||
tagId: z.string().trim().max(80).optional().or(z.literal('')),
|
tagId: z.string().trim().max(80).optional().or(z.literal('')),
|
||||||
species: z.string().trim().min(1).max(120),
|
species: z.string().trim().min(1).max(120),
|
||||||
@@ -129,7 +130,6 @@ export const birdSchema = z.object({
|
|||||||
|
|
||||||
export const memorializeBirdSchema = z.object({
|
export const memorializeBirdSchema = z.object({
|
||||||
memorializedOn: dateStringSchema,
|
memorializedOn: dateStringSchema,
|
||||||
memorialNote: z.string().trim().max(1000).optional().or(z.literal('')),
|
|
||||||
notifyOnMemorialDay: z.boolean().optional(),
|
notifyOnMemorialDay: z.boolean().optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -121,7 +121,6 @@ export type BirdRow = {
|
|||||||
public_profile_enabled: boolean;
|
public_profile_enabled: boolean;
|
||||||
memorialized_at: string | null;
|
memorialized_at: string | null;
|
||||||
memorialized_on: string | null;
|
memorialized_on: string | null;
|
||||||
memorial_note: string | null;
|
|
||||||
notify_on_memorial_day: boolean;
|
notify_on_memorial_day: boolean;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
latest_weight_grams: string | null;
|
latest_weight_grams: string | null;
|
||||||
|
|||||||
+35
-33
@@ -65,7 +65,6 @@ type Bird = {
|
|||||||
publicProfileEnabled: boolean;
|
publicProfileEnabled: boolean;
|
||||||
memorializedAt: string | null;
|
memorializedAt: string | null;
|
||||||
memorializedOn: string | null;
|
memorializedOn: string | null;
|
||||||
memorialNote: string | null;
|
|
||||||
notifyOnMemorialDay: boolean;
|
notifyOnMemorialDay: boolean;
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
latestWeightGrams: number | null;
|
latestWeightGrams: number | null;
|
||||||
@@ -272,6 +271,7 @@ type FlockNoteFormState = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
type BirdFormState = {
|
type BirdFormState = {
|
||||||
|
locationDate: string;
|
||||||
name: string;
|
name: string;
|
||||||
tagId: string;
|
tagId: string;
|
||||||
species: string;
|
species: string;
|
||||||
@@ -335,7 +335,6 @@ type PublicBirdProfile = {
|
|||||||
|
|
||||||
type MemorializeBirdFormState = {
|
type MemorializeBirdFormState = {
|
||||||
memorializedOn: string;
|
memorializedOn: string;
|
||||||
memorialNote: string;
|
|
||||||
notifyOnMemorialDay: boolean;
|
notifyOnMemorialDay: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -814,6 +813,7 @@ const VerifiedLocationSearchField = ({
|
|||||||
};
|
};
|
||||||
|
|
||||||
const emptyBirdForm: BirdFormState = {
|
const emptyBirdForm: BirdFormState = {
|
||||||
|
locationDate: '',
|
||||||
name: '',
|
name: '',
|
||||||
tagId: '',
|
tagId: '',
|
||||||
species: '',
|
species: '',
|
||||||
@@ -856,7 +856,6 @@ const emptyVeterinaryInfoForm: VeterinaryInfoFormState = {
|
|||||||
|
|
||||||
const emptyMemorializeBirdForm = (): MemorializeBirdFormState => ({
|
const emptyMemorializeBirdForm = (): MemorializeBirdFormState => ({
|
||||||
memorializedOn: new Date().toISOString().slice(0, 10),
|
memorializedOn: new Date().toISOString().slice(0, 10),
|
||||||
memorialNote: '',
|
|
||||||
notifyOnMemorialDay: false,
|
notifyOnMemorialDay: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -969,6 +968,7 @@ const ProviderIcon = ({ providerKey }: { providerKey: AuthProvider['providerKey'
|
|||||||
const sortBirdsByName = (nextBirds: Bird[]) => [...nextBirds].sort((left, right) => left.name.localeCompare(right.name));
|
const sortBirdsByName = (nextBirds: Bird[]) => [...nextBirds].sort((left, right) => left.name.localeCompare(right.name));
|
||||||
|
|
||||||
const toBirdForm = (bird: Bird): BirdFormState => ({
|
const toBirdForm = (bird: Bird): BirdFormState => ({
|
||||||
|
locationDate: '',
|
||||||
name: bird.name,
|
name: bird.name,
|
||||||
tagId: bird.tagId ?? '',
|
tagId: bird.tagId ?? '',
|
||||||
species: bird.species,
|
species: bird.species,
|
||||||
@@ -3991,7 +3991,7 @@ function App() {
|
|||||||
const response = await apiFetch(isEditing ? `/birds/${editingBirdId}` : '/birds', authToken, {
|
const response = await apiFetch(isEditing ? `/birds/${editingBirdId}` : '/birds', authToken, {
|
||||||
method,
|
method,
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify({ ...birdForm, hatchDay: birdForm.dateOfBirth, locationLabel }),
|
body: JSON.stringify({ ...birdForm, hatchDay: birdForm.dateOfBirth, locationLabel, locationDate: birdForm.locationDate || getLocalDateString() }),
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
@@ -6589,27 +6589,6 @@ function App() {
|
|||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
</label>
|
</label>
|
||||||
<div className="settings-inline-header wide-field">
|
|
||||||
<p className="eyebrow">Location</p>
|
|
||||||
<h3>Mappable location</h3>
|
|
||||||
</div>
|
|
||||||
<VerifiedLocationSearchField
|
|
||||||
label="Location"
|
|
||||||
location={birdForm.locationDetails}
|
|
||||||
fallbackLabel={birdForm.locationLabel}
|
|
||||||
searchState={birdLocationSearch}
|
|
||||||
onSearchStateChange={setBirdLocationSearch}
|
|
||||||
onSearch={() => searchVerifiedLocations(birdLocationSearch, setBirdLocationSearch)}
|
|
||||||
onSelect={(location) => {
|
|
||||||
const locationLabel = formatVerifiedLocationLabel(location);
|
|
||||||
setBirdForm({ ...birdForm, locationDetails: location, locationLabel });
|
|
||||||
setBirdLocationSearch({ ...emptyLocationSearchState, query: locationLabel });
|
|
||||||
}}
|
|
||||||
onClear={() => {
|
|
||||||
setBirdForm({ ...birdForm, locationDetails: emptyVerifiedLocationDetails, locationLabel: '' });
|
|
||||||
setBirdLocationSearch(emptyLocationSearchState);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<div className="segmented-field wide-field">
|
<div className="segmented-field wide-field">
|
||||||
<span>Gender</span>
|
<span>Gender</span>
|
||||||
<div className="segmented-control" role="radiogroup" aria-label="Bird gender">
|
<div className="segmented-control" role="radiogroup" aria-label="Bird gender">
|
||||||
@@ -6748,6 +6727,37 @@ function App() {
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</label>
|
</label>
|
||||||
|
<div className="settings-inline-header wide-field">
|
||||||
|
<p className="eyebrow">Location</p>
|
||||||
|
<h3>Mappable location</h3>
|
||||||
|
</div>
|
||||||
|
<VerifiedLocationSearchField
|
||||||
|
label="Location"
|
||||||
|
location={birdForm.locationDetails}
|
||||||
|
fallbackLabel={birdForm.locationLabel}
|
||||||
|
searchState={birdLocationSearch}
|
||||||
|
onSearchStateChange={setBirdLocationSearch}
|
||||||
|
onSearch={() => searchVerifiedLocations(birdLocationSearch, setBirdLocationSearch)}
|
||||||
|
onSelect={(location) => {
|
||||||
|
const locationLabel = formatVerifiedLocationLabel(location);
|
||||||
|
setBirdForm({ ...birdForm, locationDetails: location, locationLabel });
|
||||||
|
setBirdLocationSearch({ ...emptyLocationSearchState, query: locationLabel });
|
||||||
|
}}
|
||||||
|
onClear={() => {
|
||||||
|
setBirdForm({ ...birdForm, locationDetails: emptyVerifiedLocationDetails, locationLabel: '' });
|
||||||
|
setBirdLocationSearch(emptyLocationSearchState);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<label>
|
||||||
|
Location date
|
||||||
|
<input
|
||||||
|
type="date"
|
||||||
|
value={birdForm.locationDate || getLocalDateString()}
|
||||||
|
onChange={(event) => setBirdForm({ ...birdForm, locationDate: event.target.value })}
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
<span className="muted">Date this location took effect. Used when adding a bird or changing its location.</span>
|
||||||
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
<section className="settings-nested-card">
|
<section className="settings-nested-card">
|
||||||
@@ -6996,14 +7006,6 @@ function App() {
|
|||||||
required
|
required
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<label className="wide-field">
|
|
||||||
Memorial note
|
|
||||||
<textarea
|
|
||||||
rows={3}
|
|
||||||
value={memorializeBirdForm.memorialNote}
|
|
||||||
onChange={(event) => setMemorializeBirdForm({ ...memorializeBirdForm, memorialNote: event.target.value })}
|
|
||||||
/>
|
|
||||||
</label>
|
|
||||||
<div className="button-row care-form-actions">
|
<div className="button-row care-form-actions">
|
||||||
<button className="danger-button" type="submit" disabled={memorializingBird || activeMembership?.role !== 'owner'}>
|
<button className="danger-button" type="submit" disabled={memorializingBird || activeMembership?.role !== 'owner'}>
|
||||||
{memorializingBird ? 'Memorializing...' : `Memorialize ${selectedBird.name}`}
|
{memorializingBird ? 'Memorializing...' : `Memorialize ${selectedBird.name}`}
|
||||||
|
|||||||
Reference in new issue
Block a user