From de0e30de57e560e7ddce910f0532f6f9ce26e92a Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Fri, 25 Feb 2022 07:44:28 -0700
Subject: [PATCH] Fix version creation, remove obsolete download counters, dep
 fix (#357)

---
 pages/_type/_id.vue          | 20 +++++---------------
 pages/_type/_id/version.vue  | 26 +++++++++++++++++---------
 pages/_type/_id/versions.vue |  6 ------
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/pages/_type/_id.vue b/pages/_type/_id.vue
index bca758ab6..b29459cd3 100644
--- a/pages/_type/_id.vue
+++ b/pages/_type/_id.vue
@@ -332,12 +332,6 @@
               :href="findPrimary(version).url"
               class="download"
               :title="`Download ${version.name}`"
-              @click.prevent="
-                downloadFile(
-                  findPrimary(version).hashes.sha1,
-                  findPrimary(version).url
-                )
-              "
             >
               <DownloadIcon aria-hidden="true" />
             </a>
@@ -419,7 +413,7 @@
           </div>
           <div class="info">
             <div class="key">Project ID</div>
-            <div class="value">
+            <div class="value lowercase">
               {{ project.id }}
             </div>
           </div>
@@ -679,14 +673,6 @@ export default {
 
       return file
     },
-    async downloadFile(hash, url) {
-      await this.$axios.get(`version_file/${hash}/download`)
-
-      const elem = document.createElement('a')
-      elem.download = hash
-      elem.href = url
-      elem.click()
-    },
     async clearMessage() {
       this.$nuxt.$loading.start()
 
@@ -987,6 +973,10 @@ export default {
     .value {
       width: 50%;
       text-transform: capitalize;
+
+      &.lowercase {
+        text-transform: none;
+      }
     }
     .uppercase {
       text-transform: uppercase;
diff --git a/pages/_type/_id/version.vue b/pages/_type/_id/version.vue
index 452a4dd96..a50d5a7bd 100644
--- a/pages/_type/_id/version.vue
+++ b/pages/_type/_id/version.vue
@@ -86,9 +86,6 @@
           :href="primaryFile.url"
           class="action iconified-button brand-button-colors"
           :title="`Download ${primaryFile.filename}`"
-          @click.prevent="
-            $parent.downloadFile(primaryFile.hashes.sha1, primaryFile.url)
-          "
         >
           <DownloadIcon aria-hidden="true" />
           Download
@@ -353,6 +350,9 @@
                   Version {{ dependency.version.version_number }} is
                   {{ dependency.dependency_type }}
                 </p>
+                <p v-else>
+                  {{ dependency.dependency_type }}
+                </p>
               </nuxt-link>
               <div class="bottom">
                 <button
@@ -417,10 +417,10 @@
             Primary
           </div>
           <a
+            :href="file.url"
             class="action iconified-button"
             :title="`Download ${file.filename}`"
             tabindex="0"
-            @click.prevent="$parent.downloadFile(file.hashes.sha1, file.url)"
           >
             <DownloadIcon aria-hidden="true" />
             Download
@@ -822,12 +822,16 @@ export default {
           })
         ).data
 
-        this.$emit('update:project', this.versions.concat([data]))
+        const newProject = JSON.parse(JSON.stringify(this.project))
+        newProject.versions = newProject.versions.concat([data])
+
+        await this.$emit('update:project', newProject)
+        await this.$emit('update:versions', this.versions.concat([data]))
 
         await this.$router.push(
           `/${this.project.project_type}/${
-            this.project.slug ? this.project.slug : data.project_id
-          }/version/${encodeURIComponent(data.version_number)}`
+            this.project.slug ? this.project.slug : this.project.project_id
+          }/version/${encodeURIComponent(this.version.version_number)}`
         )
       } catch (err) {
         this.$notify({
@@ -942,12 +946,16 @@ section {
 .dependencies {
   display: flex;
   flex-wrap: wrap;
+  column-gap: 2rem;
+  row-gap: 1rem;
 
   .dependency {
     align-items: center;
     display: flex;
-    flex-basis: 33.333333%;
-    margin-bottom: 0.5rem;
+
+    @media screen and (min-width: 800px) {
+      flex-basis: 30%;
+    }
 
     .icon {
       width: 3rem;
diff --git a/pages/_type/_id/versions.vue b/pages/_type/_id/versions.vue
index e242b7387..7f18c3ed4 100644
--- a/pages/_type/_id/versions.vue
+++ b/pages/_type/_id/versions.vue
@@ -24,12 +24,6 @@
               :href="$parent.findPrimary(version).url"
               class="download-button"
               :title="`Download ${version.name}`"
-              @click.prevent="
-                $parent.downloadFile(
-                  $parent.findPrimary(version).hashes.sha1,
-                  $parent.findPrimary(version).url
-                )
-              "
             >
               <DownloadIcon aria-hidden="true" />
             </a>