Merge branch 'main' into feature/73-add-flights-page

adding flights page
removing unused dependencies
2025-03-23 11:47:45 -05:00 · 2025-03-23 11:44:51 -05:00 · 2025-03-23 11:26:34 -05:00 · 2025-03-23 11:19:39 -05:00 · 2025-03-23 11:06:35 -05:00 · 2025-03-23 10:28:04 -05:00
3 changed files with 4 additions and 4 deletions
--- a/api/package.json
+++ b/api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "api",
-  "version": "1.3.1",
+  "version": "1.3.0",
  "description": "",
  "author": "",
  "private": true,
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
  "name": "app",
  "private": true,
-  "version": "1.3.1",
+  "version": "1.3.0",
  "type": "module",
  "scripts": {
    "dev": "vite",
--- a/app/src/components/logTracks/LogTracks.tsx
+++ b/app/src/components/logTracks/LogTracks.tsx
@@ -56,7 +56,7 @@ const LogTracks = ({ isDrawerOpen, mode, onOpenClose, selectedRowKey }: LogTrack
      const uploadResponse: AxiosResponse = await httpClient.post(`api/logs/log/${selectedRowKey}/track`, formData, formDataConfig);
      const uploadUrl = uploadResponse.data.url;
      const log = await getLog();
-      const tracks: string[] = log.tracks ? JSON.parse(log.tracks!) : [];
+      const tracks: string[] = JSON.parse(log.tracks!);
      tracks.push(uploadUrl)
      log.tracks = JSON.stringify(tracks);
@@ -171,7 +171,7 @@ const LogTracks = ({ isDrawerOpen, mode, onOpenClose, selectedRowKey }: LogTrack
                onClick={onCancel}
                size="small"
              >
-                Close
+                {mode.toString() !== FormMode.VIEW ? 'Cancel' : 'Close'}
              </Button>
              {mode.toString() !== FormMode.VIEW && (
                <Button
Author	SHA1	Message	Date
noahspannbauer	122c123ab8	Merge branch 'main' into feature/73-add-flights-page	2025-03-23 11:47:45 -05:00
Noah Spannbauer	b74e419646	adding flights page	2025-03-23 11:44:51 -05:00
Noah Spannbauer	3b2dbcf3aa	removing unused dependencies	2025-03-23 11:26:34 -05:00
Noah Spannbauer	11fe779c4d	adding flights page	2025-03-23 11:19:39 -05:00
Noah Spannbauer	f51c4f2e1a	adding flights page	2025-03-23 11:06:35 -05:00
Noah Spannbauer	eb1bfb53c5	adding flights page	2025-03-23 10:28:04 -05:00
Noah Spannbauer	88b7f77809	adding flights page	2025-03-23 10:23:30 -05:00