Skip to content

Commit c9a147d

Browse files
authored
Merge pull request #84 from Resgrid/develop
Develop
2 parents 3ce1297 + 87b1c3b commit c9a147d

File tree

11 files changed

+18
-38
lines changed

11 files changed

+18
-38
lines changed

.github/workflows/react-native-cicd.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ jobs:
342342
if [ -z "$NOTES" ]; then
343343
NOTES="$PR_BODY"
344344
fi
345+
# Remove "Summary by CodeRabbit" line
346+
NOTES="$(printf '%s\n' "$NOTES" | grep -v "Summary by CodeRabbit")"
345347
else
346348
NOTES="$(git log -n 5 --pretty=format:'- %s')"
347349
fi
@@ -397,14 +399,9 @@ jobs:
397399
--arg actor "${{ github.actor }}" \
398400
--arg run_url "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
399401
'{
400-
version: $version,
401-
releaseDate: $date,
402-
releaseNotes: $notes,
403-
repository: $repo,
404-
commitSha: $commit,
405-
author: $actor,
406-
buildUrl: $run_url,
407-
platform: "android"
402+
"version": $version,
403+
"title": ("Release v" + $version),
404+
"content": $notes
408405
}')
409406
410407
# Send to Changerawr API

src/api/config/index.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import { type GetConfigResult } from '@/models/v4/configs/getConfigResult';
22
import { type GetSystemConfigResult } from '@/models/v4/configs/getSystemConfigResult';
33

4-
import { createCachedApiEndpoint } from '../common/cached-client';
4+
import { createApiEndpoint } from '../common';
55

6-
const getConfigApi = createCachedApiEndpoint('/Config/GetConfig', {
7-
ttl: 60 * 1000 * 1440, // Cache for 1 days
8-
enabled: false,
9-
});
6+
const getConfigApi = createApiEndpoint('/Config/GetConfig');
107

11-
const getSystemConfigApi = createCachedApiEndpoint('/Config/GetSystemConfig', {
12-
ttl: 60 * 1000 * 1440, // Cache for 1 days
13-
enabled: false,
14-
});
8+
const getSystemConfigApi = createApiEndpoint('/Config/GetSystemConfig');
159

1610
export const getConfig = async (key: string) => {
1711
const response = await getConfigApi.get<GetConfigResult>({

src/app/call/[id]/edit.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ export default function EditCall() {
641641
</SelectTrigger>
642642
<SelectPortal>
643643
<SelectBackdrop />
644-
<SelectContent>
644+
<SelectContent className="max-h-[60vh] pb-20">
645645
{callPriorities.map((priority) => (
646646
<SelectItem key={priority.Id} label={priority.Name} value={priority.Name} />
647647
))}
@@ -674,7 +674,7 @@ export default function EditCall() {
674674
</SelectTrigger>
675675
<SelectPortal>
676676
<SelectBackdrop />
677-
<SelectContent>
677+
<SelectContent className="max-h-[60vh] pb-20">
678678
{callTypes.map((type) => (
679679
<SelectItem key={type.Id} label={type.Name} value={type.Name} />
680680
))}

src/app/call/new/index.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,6 @@ export default function NewCall() {
217217
data.longitude = selectedLocation.longitude;
218218
}
219219

220-
// TODO: Implement the API call to create a new call
221-
console.log('Creating new call with data:', data);
222-
223220
const priority = callPriorities.find((p) => p.Name === data.priority);
224221
const type = callTypes.find((t) => t.Name === data.type);
225222

@@ -834,7 +831,7 @@ export default function NewCall() {
834831
</SelectTrigger>
835832
<SelectPortal>
836833
<SelectBackdrop />
837-
<SelectContent>
834+
<SelectContent className="max-h-[60vh] pb-20">
838835
{callPriorities.map((priority) => (
839836
<SelectItem key={priority.Id} label={priority.Name} value={priority.Name} />
840837
))}
@@ -867,7 +864,7 @@ export default function NewCall() {
867864
</SelectTrigger>
868865
<SelectPortal>
869866
<SelectBackdrop />
870-
<SelectContent>
867+
<SelectContent className="max-h-[60vh] pb-20">
871868
{callTypes.map((type) => (
872869
<SelectItem key={type.Id} label={type.Name} value={type.Name} />
873870
))}

src/components/audio-stream/audio-stream-bottom-sheet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export const AudioStreamBottomSheet = () => {
145145
</SelectTrigger>
146146
<SelectPortal>
147147
<SelectBackdrop />
148-
<SelectContent>
148+
<SelectContent className="max-h-[60vh] pb-20">
149149
<SelectDragIndicatorWrapper>
150150
<SelectDragIndicator />
151151
</SelectDragIndicatorWrapper>

src/components/calls/close-call-bottom-sheet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export const CloseCallBottomSheet: React.FC<CloseCallBottomSheetProps> = ({ isOp
195195
</SelectTrigger>
196196
<SelectPortal>
197197
<SelectBackdrop />
198-
<SelectContent>
198+
<SelectContent className="max-h-[60vh] pb-20">
199199
<SelectItem label={t('call_detail.close_call_types.closed')} value="1" />
200200
<SelectItem label={t('call_detail.close_call_types.cancelled')} value="2" />
201201
<SelectItem label={t('call_detail.close_call_types.unfounded')} value="3" />

src/components/messages/compose-message-sheet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ export const ComposeMessageSheet: React.FC = () => {
410410
</SelectTrigger>
411411
<SelectPortal>
412412
<SelectBackdrop />
413-
<SelectContent>
413+
<SelectContent className="max-h-[60vh] pb-20">
414414
<SelectDragIndicatorWrapper>
415415
<SelectDragIndicator />
416416
</SelectDragIndicatorWrapper>

src/components/roles/role-assignment-item.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const RoleAssignmentItem: React.FC<RoleAssignmentItemProps> = ({ role, as
3535
</SelectTrigger>
3636
<SelectPortal>
3737
<SelectBackdrop />
38-
<SelectContent>
38+
<SelectContent className="max-h-[60vh] pb-20">
3939
<SelectDragIndicatorWrapper>
4040
<SelectDragIndicator />
4141
</SelectDragIndicatorWrapper>

src/components/settings/language-item.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const LanguageItem = () => {
4343
</SelectTrigger>
4444
<SelectPortal>
4545
<SelectBackdrop />
46-
<SelectContent>
46+
<SelectContent className="max-h-[60vh] pb-20">
4747
<SelectDragIndicatorWrapper>
4848
<SelectDragIndicator />
4949
</SelectDragIndicatorWrapper>

src/components/settings/theme-item.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const ThemeItem = () => {
4343
</SelectTrigger>
4444
<SelectPortal>
4545
<SelectBackdrop />
46-
<SelectContent>
46+
<SelectContent className="max-h-[60vh] pb-20">
4747
<SelectDragIndicatorWrapper>
4848
<SelectDragIndicator />
4949
</SelectDragIndicatorWrapper>

0 commit comments

Comments
 (0)