Internal documentation - authorized access only
@@ -74,7 +90,8 @@ export default {
files: null,
error: null,
file: '',
- fileType: ''
+ fileType: '',
+ splitFiles: [],
}
},
watch: {
@@ -129,6 +146,9 @@ export default {
})
}
},
+ displayFileFormat() {
+ const arr = [];
+ },
showModal () {
this.$refs.deleteModal.show()
},
diff --git a/docker-compose.yml b/docker-compose.yml
index 504254213..22e81abe3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -132,7 +132,9 @@ services:
#############################################################################################
backend:
platform: linux/x86_64
- image: artifacts.developer.gov.bc.ca/g26e-backend-docker-local/gwells-backend:1.0
+ build:
+ context: ./openshift/docker/backend
+ dockerfile: Dockerfile.dev
hostname: backend
environment:
APP_CONTEXT_ROOT: gwells
diff --git a/openshift/docker/backend/Dockerfile.dev b/openshift/docker/backend/Dockerfile.dev
new file mode 100644
index 000000000..8f5763820
--- /dev/null
+++ b/openshift/docker/backend/Dockerfile.dev
@@ -0,0 +1,6 @@
+FROM artifacts.developer.gov.bc.ca/g26e-backend-docker-local/gwells-backend:1.0 AS base
+
+FROM base
+WORKDIR /app
+
+COPY . .
From 7a29b2a928851f15f550623f1bf620837cd63e1a Mon Sep 17 00:00:00 2001
From: LocalNewsTV <62873746+LocalNewsTV@users.noreply.github.com>
Date: Thu, 2 Nov 2023 13:40:48 -0700
Subject: [PATCH 14/28] add longform labels to table
---
app/backend/gwells/documents.py | 1 +
.../src/wells/components/Documents.vue | 45 ++++++++++++-------
2 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/app/backend/gwells/documents.py b/app/backend/gwells/documents.py
index 520a30566..f6c26de5c 100644
--- a/app/backend/gwells/documents.py
+++ b/app/backend/gwells/documents.py
@@ -127,6 +127,7 @@ def create_url_list(self, objects, host, bucket_name, private=False):
"well_number": self.extract_well_number(document.object_name),
"date_of_action": self.extract_date_of_action(document.object_name),
"well_label": self.extract_well_label(document.object_name),
+ "private": private
}, objects)
)
return urls
diff --git a/app/frontend/src/wells/components/Documents.vue b/app/frontend/src/wells/components/Documents.vue
index d5d6eaba9..ca887e3a4 100644
--- a/app/frontend/src/wells/components/Documents.vue
+++ b/app/frontend/src/wells/components/Documents.vue
@@ -33,21 +33,25 @@
No additional documentation available for this well.
-
-
- {{ data.item.date_of_action !== -1 ? new Date(data.item.date_of_action).toLocaleDateString() : "Date Unknown" }}
-
-
- {{ data.item.name.split("_")[1].split(".")[0] }}
-
-
- {{ data.item.name }}
-
+
+
+ {{ getLongFormLabel(data.item.well_label) }}
+
+
+ {{ data.item.date_of_action !== -1 ? new Date(data.item.date_of_action).toLocaleDateString() : "Date Unknown" }}
+
+
+ {{ data.item.name }}
+
+
+ Private Document
+ Public Document
+
Internal documentation - authorized access only
@@ -70,7 +74,7 @@
v-on:ok="deleteFile"
ref="deleteModal" >
Are you sure you would like to delete this file?
-
{{file}}
+
{{ file }}
@@ -78,6 +82,7 @@
-
From 368f6be6ebd2515646344becf2bf7ad6ec6015a6 Mon Sep 17 00:00:00 2001
From: David <62899351+davidclaveau@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:47:05 -0700
Subject: [PATCH 17/28] fix to doc upload, allow deletion from edit
---
.../components/SubmissionForm/Documents.vue | 41 +++++++++++++------
1 file changed, 29 insertions(+), 12 deletions(-)
diff --git a/app/frontend/src/submissions/components/SubmissionForm/Documents.vue b/app/frontend/src/submissions/components/SubmissionForm/Documents.vue
index d736cf37e..3c934da3c 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/Documents.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/Documents.vue
@@ -25,7 +25,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
-
@@ -166,7 +166,7 @@ import { mapGetters, mapState, mapMutations } from 'vuex'
import { omit } from 'lodash'
import inputBindingsMixin from '@/common/inputBindingsMixin.js'
-// import ApiService from '@/common/services/ApiService.js'
+import ApiService from '@/common/services/ApiService.js'
import BackToTopLink from '@/common/components/BackToTopLink.vue'
import { WELL_TAGS } from '@/common/constants.js'
@@ -245,22 +245,30 @@ export default {
}
},
computedAttachments () {
- return [...this.attachmentsData]
+ return JSON.stringify(this.attachmentsData);
},
},
watch: {
computedAttachments: {
deep: true,
handler: function (newAttachments, oldAttachments) {
- if (newAttachments[0].file) {
- newAttachments.forEach((newAttachment, index) => {
+ let jsonNewAttachments = JSON.parse(newAttachments),
+ jsonOldAttachments = JSON.parse(oldAttachments);
+
+ // We have at least one new attachment
+ if (jsonNewAttachments[0].file) {
+ jsonNewAttachments.forEach((newAttachment, index) => {
+
+ // Add the new attachment
const newFile = newAttachment.file;
if (newAttachment.file_name) {
const uploadName = newAttachment.file_name.replace(/^WTN\s\d+_/,'');
- const modifiedFile = new File([newFile], uploadName, { type: newFile.type });
- this.files = [modifiedFile];
- this.privateDocument = false;
+ const newFileAdded = new File([newFile], uploadName, { type: newFile.type });
+ this.files[index] = newFileAdded;
}
+
+ // TODO: add prive doc logic
+ this.privateDocument = false;
});
}
},
@@ -281,8 +289,17 @@ export default {
'setPrivate',
'removeFile'
]),
- handleFileDelete() {
- alert('Delete Action!');
+ handleFileDelete(value, e) {
+ e.preventDefault()
+ let tag = this.form.well && isNaN(this.form.well) ? this.form.well.well_tag_number : this.form.well
+ let encodedFileName = encodeURIComponent(value)
+
+ //TODO: add private file deletion/logic
+ ApiService.deleteFile(`wells/${tag}/delete_document?filename=${encodedFileName}&private=false}`)
+ .then(() => {
+ console.log('File deleted')
+ this.$emit('fetchFiles')
+ })
},
setFileName(index) {
try {
@@ -359,7 +376,7 @@ export default {
attachmentIsEmpty (attachment) {
const fieldsToTest = omit(attachment, 'length_required')
return Object.values(fieldsToTest).every((x) => !x)
- }
+ },
}
}
From 12a185706d5250acbec5a12f5f454e31c6bda4a6 Mon Sep 17 00:00:00 2001
From: LocalNewsTV <62873746+LocalNewsTV@users.noreply.github.com>
Date: Fri, 3 Nov 2023 08:49:19 -0700
Subject: [PATCH 18/28] code cleanup, change header names for clarity, fix
public list bug
---
app/backend/gwells/documents.py | 2 +-
.../components/SubmissionForm/Documents.vue | 10 +++++-----
app/frontend/src/wells/components/Documents.vue | 12 +++++-------
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/app/backend/gwells/documents.py b/app/backend/gwells/documents.py
index f6c26de5c..d5f68ab1f 100644
--- a/app/backend/gwells/documents.py
+++ b/app/backend/gwells/documents.py
@@ -127,7 +127,7 @@ def create_url_list(self, objects, host, bucket_name, private=False):
"well_number": self.extract_well_number(document.object_name),
"date_of_action": self.extract_date_of_action(document.object_name),
"well_label": self.extract_well_label(document.object_name),
- "private": private
+ "document_status": private
}, objects)
)
return urls
diff --git a/app/frontend/src/submissions/components/SubmissionForm/Documents.vue b/app/frontend/src/submissions/components/SubmissionForm/Documents.vue
index 3c934da3c..c3a6ae8ed 100644
--- a/app/frontend/src/submissions/components/SubmissionForm/Documents.vue
+++ b/app/frontend/src/submissions/components/SubmissionForm/Documents.vue
@@ -27,9 +27,9 @@ Licensed under the Apache License, Version 2.0 (the "License");
{{ callLongFormLabel(data.item.well_label) }}
@@ -37,11 +37,11 @@ Licensed under the Apache License, Version 2.0 (the "License");
{{ data.item.date_of_action !== -1 ? new Date(data.item.date_of_action).toLocaleDateString() : "Date Unknown" }}
-
+
{{ data.item.name }}
-
- Private Document
+
+ Private Document
Public Document
diff --git a/app/frontend/src/wells/components/Documents.vue b/app/frontend/src/wells/components/Documents.vue
index 3e81977c7..143dde763 100644
--- a/app/frontend/src/wells/components/Documents.vue
+++ b/app/frontend/src/wells/components/Documents.vue
@@ -27,9 +27,9 @@