Merge pull request #77 from henilp105/main

fix: bugs, add: package maintainers should be visible to everyone , package data rendering bugs.
fortran-lang · Mar 25, 2024 · 702c7be · 702c7be
2 parents 140d612 + 48c4753
commit 702c7be
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 13 deletions.
diff --git a/.github/workflows/security_checks.yml b/.github/workflows/security_checks.yml
@@ -18,14 +18,18 @@ jobs:
 
       - uses: fortran-lang/setup-fpm@v5
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          fpm-version: 'v0.10.1'
+          github-token: ${{ secrets.GITHUB_TOKEN }}     
 
       - name: Setup Python
         uses: actions/setup-python@v5
 
       - name: Install python libraries
         run: pip3 install --user -r backend/requirements.txt
 
+      - name: temporary folder for fortran packages
+        run: cd backend/static && mkdir temp
+
       - name: load env file
         run: |
           echo "${{ secrets.ENV_FILE }}" > backend/.env

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,6 +7,18 @@ on:
     branches: ["main"]
   workflow_dispatch:
 
+env:
+    MONGO_DB_NAME: testregistry
+    MONGO_URI: mongodb://localhost:27017/
+    MONGO_USER_NAME: Admin
+    MONGO_PASSWORD: Admin
+    SALT: MYSALT
+    HOST: localhost
+    RESET_EMAIL: [email protected]
+    RESET_PASSWORD: reset
+    SUDO_PASSWORD: fortran
+    IS_CI: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -25,10 +37,6 @@ jobs:
 
       - name: Install python libraries
         run: pip3 install --user -r backend/requirements.txt
-
-      - name: load env file
-        run: |
-          echo "${{ secrets.TEST_ENV_FILE }}" > backend/.env
 
-      - name: Build the Docker image and run tests
+      - name: run tests
         run: cd backend && python -m unittest discover -s tests
diff --git a/backend/validate.py b/backend/validate.py
@@ -64,7 +64,7 @@ def process_package(packagename: str) -> Tuple[bool, Union[dict, None], str]:
     extract_command = f'tar -xzf static/temp/{packagename}.tar.gz -C static/temp/{packagename}/'
     run_command(extract_command)
 
-    generate_model = "fpm build --dump=fpm_model.json" # TODO: interim bug fix, disable after fpm v0.10.2
+    generate_model = f"cd static/temp/{packagename} && fpm build --dump=fpm_model.json" # TODO: interim bug fix, disable after fpm v0.10.2
     run_command(generate_model)
 
     # Read fpm.toml
@@ -139,9 +139,15 @@ def validate() -> None:
                             update_data[key] = result[1][key]
 
                 dependencies = list()
-                dependencies += [(dependency_info['namespace'],dependency_name) for dependency_name, dependency_info in result[1].get('dependencies', {}).items()]
+                try:
+                    dependencies += [(dependency_info['namespace'],dependency_name) for dependency_name, dependency_info in result[1].get('dependencies', {}).items()]
+                except:
+                    pass
                 for section in ['test', 'example', 'executable']:
-                    dependencies += collect_dependencies(section, result[1])
+                    try:
+                        dependencies += collect_dependencies(section, result[1])
+                    except:
+                        pass
 
                 update_data['dependencies'] = list(set(dependencies))
 

diff --git a/frontend/src/components/packageItem.js b/frontend/src/components/packageItem.js
@@ -63,7 +63,7 @@ const PackageItem = ({ packageEntity }) => {
         </Col>
         <Col md={1} style={{ flex: 1, textAlign: "right" }}>
           <label style={{ fontSize: "16px" }}>
-            Last released {formatDate(packageEntity.updatedAt)}
+            Last released {formatDate(packageEntity.updated_at)}
           </label>
         </Col>
       </Row>

diff --git a/frontend/src/pages/package.js b/frontend/src/pages/package.js
@@ -232,7 +232,7 @@ const ViewPackageMaintainersButton = ({
 
   return (
     <React.Fragment>
-      {isVerified && (
+      {
         <p
           className="border border-success"
           style={{
@@ -246,7 +246,7 @@ const ViewPackageMaintainersButton = ({
         >
           View Package Maintainers
         </p>
-      )}
+      }
     </React.Fragment>
   );
 };
@@ -255,7 +255,7 @@ const sideBar = (data, setShowReportForm) => {
   return (
     <MDBCol size="3">
       <p style={{ fontSize: 16, textAlign: "left" }}>Install (add to fpm.toml)</p>
-      <p style={{ fontSize: 14, textAlign: "left" }}><code>{data.name} = {"{"}{"'namespace'"}: {"'"}{data.namespace}{"'}"}</code> </p>
+      <p style={{ fontSize: 14, textAlign: "left" }}><code>{data.name} = {"{"}{"'namespace'"}={"'"}{data.namespace}{"'}"}</code> </p>
       <hr></hr>
       <p style={{ fontSize: 16, textAlign: "left" }}>Repository</p>
       <Container> {data.repository}</Container>