feat(frontend): ✨ Add URL field for satellites in Strapi and… (#102)

* feat(frontend): ✨ Add URL field for satellites in Strapi and display satellites on map with URL or CAT number * fix(frontend): 🐛 Fix graphql query to the correct query
NTNU-SmallSatLab · Feb 22, 2024 · 9f1ffe6 · 9f1ffe6
1 parent aeeedeb
commit 9f1ffe6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/backend/src/api/satellite/content-types/satellite/schema.json b/backend/src/api/satellite/content-types/satellite/schema.json
@@ -21,7 +21,7 @@
       "target": "api::project.project",
       "mappedBy": "satellites"
     },
-    "satelliteName": {
+    "celestrakURL": {
       "type": "string"
     }
   }

diff --git a/backend/types/generated/contentTypes.d.ts b/backend/types/generated/contentTypes.d.ts
@@ -1017,7 +1017,7 @@ export interface ApiSatelliteSatellite extends Schema.CollectionType {
       'manyToMany',
       'api::project.project'
     >;
-    satelliteName: Attribute.String;
+    celestrakURL: Attribute.String;
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     publishedAt: Attribute.DateTime;

diff --git a/frontend/src/__generated__/gql.ts b/frontend/src/__generated__/gql.ts
diff --git a/frontend/src/__generated__/graphql.ts b/frontend/src/__generated__/graphql.ts
diff --git a/frontend/src/components/map/SatelliteFetcher.tsx b/frontend/src/components/map/SatelliteFetcher.tsx
@@ -19,8 +19,8 @@ const GET_ALL_SATELLITE_DATA = gql(`query Satellites {
     satellites {
       data {
         attributes {
+          celestrakURL
           catalogNumberNORAD
-          satelliteName
         }
       }
     }
@@ -43,16 +43,13 @@ export default async function SatelliteFetcher({
 
         const satelliteUrls = graphqlData?.data?.satellites?.data.map(
             (satEntity) => {
-                if (satEntity?.attributes?.catalogNumberNORAD) {
-                    return (
-                        "https://celestrak.org/NORAD/elements/gp.php?CATNR=" +
-                        satEntity?.attributes?.catalogNumberNORAD +
-                        "&FORMAT=TLE"
-                    );
+                const celestrakURL = satEntity?.attributes?.celestrakURL;
+                if (celestrakURL) {
+                    return celestrakURL;
                 }
                 return (
-                    "https://celestrak.org/NORAD/elements/gp.php?NAME=" +
-                    satEntity?.attributes?.satelliteName +
+                    "https://celestrak.org/NORAD/elements/gp.php?CATNR=" +
+                    satEntity?.attributes?.catalogNumberNORAD +
                     "&FORMAT=TLE"
                 );
             },