+
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ Diagnostic Information
++ +
Core Configurations
+ + + +
+
+
+
+ Azure Storage
+
+ + Confirms these values have been set in your Django Settings file. Please ignore if you are + not utilsing Azure Storage +
+
+
+
+
+
+ | Configuration Field | +Is Filled In | +
| AZURE_STORAGE_CONNECTION_STRING | +{{ azureStorageConnectionString }} | +
| AZURE_STORAGE_CONTAINER_NAME | +{{ azureStorageContainerName }} | +
+ +
+
+
+
+ S3/R2/Minio Storage
+
+ + Confirms these values have been set in your Django Settings file. Please ignore if you are + not utilsing either S3, R2, or Minio storage solutions. +
+
+
+
+
+
+ | Configuration Field | +Is Filled In | +
| AWS_ACCESS_KEY_ID | +{{ awsAccessKeyId }} | +
| AWS_SECRET_ACCESS_KEY | +{{ awsSecretAccessKey }} | +
| AWS_S3_ENDPOINT_URL (for minio) | +{{ awsS3EndpointUrl }} | +
| AWS_STORAGE_BUCKET_NAME | +{{ awsStorageBucketName }} | +
+ +
+
+
+
+ Email
+
+ + Confirms these values have been set in your Django Settings file. +
+
+
+
+
+
+ | Configuration Field | +Values | +
| SMTP_EMAIL_HOST | +{{ smtpEmailHost }} | +
| SMTP_EMAIL_HOST_USER | +{{ smtpEmailHostUser }} | +
+ +
+
+
+
+ Allowed Hosts & CSRF Trusted URLS
+
+ + Confirms these values have been set in your Django Settings file. +
+
+
+
+
+
+ | Configuration Field | +Is Filled In | +
| ALLOWED_HOSTS | +
+ - {{ single }} + |
+
| CSRF_TRUSTED_URLS | +
+ - {{ single }} + |
+
+ +
+ +
+
+
+ Upload Document Test
+
+ + Please click on the "Upload Document" button. It will upload a small text file to the blob storage. If + there are any issues, they will print here. +
+
+
+
+
+
+
+ Upload Issues
+ {{ uploadIssues }} +
+
+ Currently sending data
+
+
+
+
+
\ No newline at end of file
diff --git a/src/js/components/groups/GroupInformation.vue b/src/js/components/groups/GroupInformation.vue
index b56156b22..5cf90212b 100644
--- a/src/js/components/groups/GroupInformation.vue
+++ b/src/js/components/groups/GroupInformation.vue
@@ -59,9 +59,7 @@
import { NSelect, NConfigProvider } from "naive-ui";
//Load mixins
-import errorModalMixin from "../../mixins/errorModalMixin";
import getThemeMixin from "../../mixins/getThemeMixin";
-import loadingModalMixin from "../../mixins/loadingModalMixin";
export default {
name: "GroupInformation",
@@ -98,7 +96,7 @@ export default {
parentGroupModel: this.groupResults[0].fields.parent_group,
}
},
- mixins: [errorModalMixin, getThemeMixin, loadingModalMixin],
+ mixins: [getThemeMixin],
methods: {
updateGroup() {
//Construct data to send
@@ -110,17 +108,34 @@ export default {
data_to_send.set("parent_group", this.parentGroupModel);
}
- //Show the loading mixin
- this.showLoadingModal("Group Information");
+ this.$store.dispatch("newToast", {
+ header: "Updated Group",
+ message: "Updated Group. Please wait.",
+ extra_classes: "bg-warning",
+ delay: 0,
+ unique_type: "update_group_leader",
+ });
//User axios to send data
this.axios.post(
`${this.rootUrl}group_information/${this.groupResults[0].pk}/save/`,
data_to_send
- ).then((response) => {
- this.closeLoadingModal();
+ ).then(() => {
+ this.$store.dispatch("newToast", {
+ header: "Updated Group",
+ message: "Successfully Update Group",
+ extra_classes: "bg-success",
+ delay: 0,
+ unique_type: "update_group_leader",
+ });
}).catch((error) => {
- this.showErrorModal(error, "group_information", "");
+ this.$store.dispatch("newToast", {
+ header: "Error Updating Group",
+ message: `We had an issue updating group. Error -> ${error}`,
+ extra_classes: "bg-danger",
+ delay: 0,
+ unique_type: "update_group_leader",
+ });
});
},
},
diff --git a/src/js/components/groups/NewGroup.vue b/src/js/components/groups/NewGroup.vue
index fc4ebfa8c..4dc391787 100644
--- a/src/js/components/groups/NewGroup.vue
+++ b/src/js/components/groups/NewGroup.vue
@@ -77,9 +77,7 @@ import {required} from "@vuelidate/validators";
import ValidationRendering from "../validation/ValidationRendering.vue";
// Mixins
-import errorModalMixin from "../../mixins/errorModalMixin";
import getThemeMixin from "../../mixins/getThemeMixin";
-import searchMixin from "../../mixins/searchMixin";
export default {
name: "NewGroup",
@@ -112,10 +110,11 @@ export default {
groupNameModel: "",
groupResultsFixList: [],
parentGroupModel: "",
+ searchTimeout: "",
uniqueGroupName: true,
};
},
- mixins: [errorModalMixin, getThemeMixin, searchMixin],
+ mixins: [getThemeMixin],
validations: {
groupNameModel: {
required,
@@ -126,11 +125,19 @@ export default {
// Tell user that we are searching for the group name
this.checkingGroupName = true;
- // Apply the search functional mixing
- this.searchTrigger({
- return_function: this.checkGroupName,
- searchTimeout: this.searchTimeout,
- });
+ //Clear timer if it already exists
+ if (this.searchTimeout !== "") {
+ //Stop the clock
+ clearTimeout(this.searchTimeout);
+ }
+
+ //Setup timer if there are 3 characters or more
+ if (this.searchModel.length >= 3) {
+ //Start the potential search
+ this.searchTimeout = setTimeout(() => {
+ this.checkGroupName();
+ }, 500);
+ }
},
},
methods: {
@@ -140,7 +147,13 @@ export default {
if (this.v$.$invalid || !this.uniqueGroupName) {
//The group name is not valid, or is not unique. Show error and return
- this.showValidationErrorModal();
+ this.$store.dispatch("newToast", {
+ header: "Please check all fields",
+ message: "Failed validation. Please check all fields are validated",
+ extra_classes: "bg-danger",
+ delay: 0,
+ unique_type: "update_user",
+ });
//Just return
return;
@@ -155,15 +168,19 @@ export default {
}
//Use Axios to send data
- this.axios
- .post(`${this.rootUrl}new_group/save/`, data_to_send)
- .then((response) => {
- //Go to that webpage
- window.location.href = response.data;
- })
- .catch((error) => {
- this.showErrorModal(error, "New Group", "");
+ this.axios.post(
+ `${this.rootUrl}new_group/save/`, data_to_send
+ ).then((response) => {
+ //Go to that webpage
+ window.location.href = response.data;
+ }).catch((error) => {
+ this.$store.dispatch("newToast", {
+ header: "Failed to Add New Group",
+ message: `Sorry, could not save new group. Error -> ${error}`,
+ extra_classes: "bg-danger",
+ delay: 0,
});
+ });
},
checkGroupName() {
//Send group name to backend to make sure it is not a duplicate
@@ -171,21 +188,23 @@ export default {
data_to_send.set("search", this.groupNameModel);
//User Axios to send data
- this.axios
- .post(
- `${this.rootUrl}group_information/check_group_name/`,
- data_to_send
- )
- .then((response) => {
- // Update the uniqueGroupName
- this.uniqueGroupName = response.data.length === 0;
-
- // Hide the checking group name
- this.checkingGroupName = false;
+ this.axios.post(
+ `${this.rootUrl}group_information/check_group_name/`,
+ data_to_send
+ ).then((response) => {
+ // Update the uniqueGroupName
+ this.uniqueGroupName = response.data.length === 0;
+
+ // Hide the checking group name
+ this.checkingGroupName = false;
+ }).catch((error) => {
+ this.$store.dispatch("newToast", {
+ header: "Failed to Check the Group Name",
+ message: `Sorry, could not check the group name. Error -> ${error}`,
+ extra_classes: "bg-danger",
+ delay: 0,
})
- .catch((error) => {
- this.showErrorModal(error, "New Group", "");
- });
+ });
},
},
mounted() {
diff --git a/src/js/components/kanban/ConfirmKanbanBoardClosure.vue b/src/js/components/kanban/ConfirmKanbanBoardClosure.vue
index f7f8e8dac..76f099efe 100644
--- a/src/js/components/kanban/ConfirmKanbanBoardClosure.vue
+++ b/src/js/components/kanban/ConfirmKanbanBoardClosure.vue
@@ -67,11 +67,16 @@ export default {
this.axios.post(
`${this.rootUrl}kanban_information/${this.locationId}/close_board/`
)
- .then((response) => {
+ .then(() => {
window.location.href = `${this.rootUrl}`;
})
.catch((error) => {
- // this.showErrorModal(error, this.destination);
+ this.$store.dispatch("newToast", {
+ header: "Error closing the kanban board",
+ message: `Sorry, we could not close the kanban board. Error -> ${error}`,
+ extra_classes: "bg-danger",
+ delay: 0,
+ });
});
},
closeModal() {
diff --git a/src/js/components/kanban/KanbanEditBoard.vue b/src/js/components/kanban/KanbanEditBoard.vue
index c1499e01c..f57a27350 100644
--- a/src/js/components/kanban/KanbanEditBoard.vue
+++ b/src/js/components/kanban/KanbanEditBoard.vue
@@ -84,7 +84,6 @@ import {required} from "@vuelidate/validators";
//Mixins
import getThemeMixin from "../../mixins/getThemeMixin";
-import searchMixin from "../../mixins/searchMixin";
export default {
name: "KanbanEditBoard",
@@ -139,7 +138,7 @@ export default {
default: 0,
},
},
- mixins: [getThemeMixin, searchMixin],
+ mixins: [getThemeMixin],
data() {
return {
canDragCards: false,
diff --git a/src/js/components/kanban/KanbanPropertyOrder.vue b/src/js/components/kanban/KanbanPropertyOrder.vue
index a2bd5ab81..0d8f263c7 100644
--- a/src/js/components/kanban/KanbanPropertyOrder.vue
+++ b/src/js/components/kanban/KanbanPropertyOrder.vue
@@ -469,11 +469,6 @@ export default {
this.singleItemId = "";
this.newPropertyItem = "";
}).catch((error) => {
- this.showErrorModal(
- error,
- "kanban board",
- this.kanbanBoardId
- );
this.$store.dispatch("newToast", {
header: "Can not add/edit",
message: `Sorry, but we are having issues editing or adding - Error -> ${error}`,
diff --git a/src/js/components/kanban/NewKanban.vue b/src/js/components/kanban/NewKanban.vue
index 0988598f6..37f625ff7 100644
--- a/src/js/components/kanban/NewKanban.vue
+++ b/src/js/components/kanban/NewKanban.vue
@@ -109,7 +109,6 @@ import {required} from "@vuelidate/validators";
import ValidationRendering from "../validation/ValidationRendering.vue";
//Mixins
-import errorModalMixin from "../../mixins/errorModalMixin";
import getThemeMixin from "../../mixins/getThemeMixin";
export default {
@@ -145,9 +144,7 @@ export default {
},
},
mixins: [
- errorModalMixin,
getThemeMixin,
- // searchMixin,
],
data() {
return {
@@ -250,7 +247,12 @@ export default {
!this.uniqueKanbanBoardName ||
this.checkingKanbanBoardName
) {
- this.showValidationErrorModal();
+ this.$store.dispatch("newToast", {
+ header: "Please check validation",
+ message: "Sorry, but can you please fix all validation issues.",
+ extra_classes: "bg-warning",
+ delay: 0,
+ });
//Just return - as we do not need to do the rest of this function
return;
@@ -278,14 +280,20 @@ export default {
});
//Use axios to send the data
- this.axios
- .post(`${this.rootUrl}new_kanban_save/`, data_to_send)
- .then((response) => {
- //Go to that webpage
- window.location.href = response.data;
- })
- .catch((error) => {
+ this.axios.post(
+ `${this.rootUrl}new_kanban_save/`,
+ data_to_send
+ ).then((response) => {
+ //Go to that webpage
+ window.location.href = response.data;
+ }).catch((error) => {
+ this.$store.dispatch("newToast", {
+ header: "Issue Creating new Kanban board",
+ message: `Issues creating new kanban board -> Error ${error}`,
+ extra_classes: "bg-warning",
+ delay: 0,
});
+ });
},
checkKanbanBoardName() {
//Send the Kanban board name to the backend - it will send back the results.
@@ -296,20 +304,23 @@ export default {
);
//Use axios to query the database
- this.axios
- .post(
- `${this.rootUrl}kanban_information/check_kanban_board_name/`,
- data_to_send
- )
- .then((response) => {
- //If the data came back empty - then the kanban board name is unique
- this.uniqueKanbanBoardName = response.data.length === 0;
+ this.axios.post(
+ `${this.rootUrl}kanban_information/check_kanban_board_name/`,
+ data_to_send
+ ).then((response) => {
+ //If the data came back empty - then the kanban board name is unique
+ this.uniqueKanbanBoardName = response.data.length === 0;
- //Checking kanban board name is finished
- this.checkingKanbanBoardName = false;
- })
- .catch((error) => {
+ //Checking kanban board name is finished
+ this.checkingKanbanBoardName = false;
+ }).catch((error) => {
+ this.$store.dispatch("newToast", {
+ header: "Issue checking Kanban board name",
+ message: `Issues checking kanban board name -> Error ${error}`,
+ extra_classes: "bg-warning",
+ delay: 0,
});
+ });
},
updateGroupModel(data) {
this.groupModel = data;
diff --git a/src/js/components/modules/sub_modules/BugsModule.vue b/src/js/components/modules/sub_modules/BugsModule.vue
index f5d1371ea..410e5b0bf 100644
--- a/src/js/components/modules/sub_modules/BugsModule.vue
+++ b/src/js/components/modules/sub_modules/BugsModule.vue
@@ -95,7 +95,6 @@ import {Icon} from "@iconify/vue";
import AddBugWizard from "../wizards/AddBugWizard.vue";
//Mixins
-import errorModalMixin from "../../../mixins/errorModalMixin";
import iconMixin from "../../../mixins/iconMixin";
//VueX
@@ -107,7 +106,7 @@ export default {
AddBugWizard,
Icon,
},
- mixins: [errorModalMixin, iconMixin],
+ mixins: [iconMixin],
data() {
return {
bugList: [],
@@ -165,7 +164,12 @@ export default {
this.bugList.push(row);
});
}).catch((error) => {
- this.showErrorModal(error, this.destination);
+ this.$store.dispatch("newToast", {
+ header: "Failed to get bug list",
+ message: `Failed to get bug list. Error -> ${error}`,
+ extra_classes: "bg-danger",
+ delay: 0,
+ });
});
},
removeBug(bug_id) {
diff --git a/src/js/components/modules/sub_modules/CustomersModule.vue b/src/js/components/modules/sub_modules/CustomersModule.vue
index b3ec4eaaf..584c17a64 100644
--- a/src/js/components/modules/sub_modules/CustomersModule.vue
+++ b/src/js/components/modules/sub_modules/CustomersModule.vue
@@ -51,7 +51,6 @@
\ No newline at end of file
diff --git a/src/js/components/object_status/ObjectStatusInformation.vue b/src/js/components/object_status/ObjectStatusInformation.vue
new file mode 100644
index 000000000..62685aa9f
--- /dev/null
+++ b/src/js/components/object_status/ObjectStatusInformation.vue
@@ -0,0 +1,279 @@
+
+
+ Test Download
+
+ + Please download the file and compare it's components with the UUID. They should match. +
+
+
+ Please click here to download the file.
+It's contents should match the UUID: {{ uuidVerification }}
+
+
+
+
+
+ +
+ {{ destination }} Status Editor
++ +
+
+
+ Editing Status
+
+ + Move the status' around to reorder them. Double click to edit text and settings. +
+
+ Status List
+
+ Please create at least one status
+
+
+
+
+
+
+
+
+
+
+ +
+
+ {{ element.status }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/js/components/object_status/ObjectStatusModal.vue b/src/js/components/object_status/ObjectStatusModal.vue
new file mode 100644
index 000000000..319ead313
--- /dev/null
+++ b/src/js/components/object_status/ObjectStatusModal.vue
@@ -0,0 +1,261 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/js/components/organisations/GetStakeholders.vue b/src/js/components/organisations/GetStakeholders.vue
index 67096c49f..1bfc3bdb6 100644
--- a/src/js/components/organisations/GetStakeholders.vue
+++ b/src/js/components/organisations/GetStakeholders.vue
@@ -48,9 +48,6 @@ import useVuelidate from "@vuelidate/core";
import {required} from "@vuelidate/validators";
import ValidationRendering from "../validation/ValidationRendering.vue";
-//Mixins
-import searchMixin from "../../mixins/searchMixin";
-
export default {
name: "GetStakeholders",
setup() {
@@ -60,7 +57,6 @@ export default {
NSelect,
ValidationRendering,
},
- mixins: [searchMixin],
props: {
isDirty: {
//Passes the value from the template above where the checking is done
@@ -87,12 +83,19 @@ export default {
},
methods: {
fetchOptions(search, loading) {
- this.searchTrigger({
- return_function: this.getOrganisationData,
- searchTimeout: this.searchTimeout,
- search: search,
- loading: loading,
- });
+ //Clear timer if it already exists
+ if (this.searchTimeout !== "") {
+ //Stop the clock
+ clearTimeout(this.searchTimeout);
+ }
+
+ //Setup timer if there are 3 characters or more
+ if (search.length >= 3) {
+ //Start the potential search
+ this.searchTimeout = setTimeout(() => {
+ this.getOrganisationData(search, loading);
+ }, 500);
+ }
},
getOrganisationData(search, loading) {
// Save the seach data in FormData
diff --git a/src/js/components/organisations/NewOrganisation.vue b/src/js/components/organisations/NewOrganisation.vue
index 22ed6256c..a723befb9 100644
--- a/src/js/components/organisations/NewOrganisation.vue
+++ b/src/js/components/organisations/NewOrganisation.vue
@@ -148,10 +148,6 @@ import useVuelidate from "@vuelidate/core";
import {email, maxLength, required, url} from "@vuelidate/validators";
import ValidationRendering from "../validation/ValidationRendering.vue";
-//Mixins
-import errorModalMixin from "../../mixins/errorModalMixin";
-import loadingModalMixin from "../../mixins/loadingModalMixin";
-
export default {
name: "NewOrganisation",
setup() {
@@ -167,7 +163,6 @@ export default {
default: "/",
},
},
- mixins: [errorModalMixin, loadingModalMixin],
data() {
return {
duplicateOrganisations: [],
@@ -196,31 +191,39 @@ export default {
this.v$.$touch();
if (this.v$.$invalid) {
- this.showValidationErrorModal();
+ this.$store.dispatch("newToast", {
+ header: "Please check validation",
+ message: "Sorry, but can you please fix all validation issues.",
+ extra_classes: "bg-warning",
+ delay: 0,
+ });
+
//Just return - as we do not need to do the rest of this function
return;
}
//Check the organisation's data to make sure there are no duplicates
//Use axios to contact the database
- this.axios
- .post(
- `${this.rootUrl}organisation_duplicates/`,
- this.dataToSend()
- )
- .then((response) => {
- //If the response data has nothing in it - we want to submit that data.
- if (response.data.length === 0) {
- //Submit that data
- this.uploadOrganisationData();
- }
+ this.axios.post(
+ `${this.rootUrl}organisation_duplicates/`,
+ this.dataToSend()
+ ).then((response) => {
+ //If the response data has nothing in it - we want to submit that data.
+ if (response.data.length === 0) {
+ //Submit that data
+ this.uploadOrganisationData();
+ }
- //Copy over the response data
- this.duplicateOrganisations = response.data;
- })
- .catch((error) => {
- this.showErrorModal(error, "organisation", "");
+ //Copy over the response data
+ this.duplicateOrganisations = response.data;
+ }).catch((error) => {
+ this.$store.dispatch("newToast", {
+ header: "Error adding organisation",
+ message: `Sorry, we could not add the organisation. Error -> ${error}`,
+ extra_classes: "bg-danger",
+ delay: 0,
});
+ });
},
dataToSend() {
const data_to_send = new FormData();
@@ -243,14 +246,20 @@ export default {
uploadOrganisationData() {
//Use Axios to send the data
//Get the data to send
- this.axios
- .post("save/", this.dataToSend())
- .then((response) => {
- //Go to the url sent back
- window.location.href = `${this.rootUrl}organisation_information/${response.data[0].pk}/`;
- })
- .catch((error) => {
+ this.axios.post(
+ "save/",
+ this.dataToSend()
+ ).then((response) => {
+ //Go to the url sent back
+ window.location.href = `${this.rootUrl}organisation_information/${response.data[0].pk}/`;
+ }).catch((error) => {
+ this.$store.dispatch("newToast", {
+ header: "Error uploading organisation data",
+ message: `Sorry, we could not upload the organisation data. Error -> ${error}`,
+ extra_classes: "bg-danger",
+ delay: 0,
});
+ });
},
},
validations: {
diff --git a/src/js/components/organisations/OrganisationInformation.vue b/src/js/components/organisations/OrganisationInformation.vue
index 7036b3dbe..f91e2a4b3 100644
--- a/src/js/components/organisations/OrganisationInformation.vue
+++ b/src/js/components/organisations/OrganisationInformation.vue
@@ -126,7 +126,6 @@ import {email, maxLength, required, url} from "@vuelidate/validators";
import ValidationRendering from "../validation/ValidationRendering.vue";
//Mixins
-import errorModalMixin from "../../mixins/errorModalMixin";
import getToken from "../../mixins/getTokenMixin";
export default {
@@ -147,7 +146,7 @@ export default {
},
},
},
- mixins: [errorModalMixin, getToken],
+ mixins: [getToken],
computed: {
...mapGetters({
rootUrl: "getRootUrl",
@@ -210,7 +209,12 @@ export default {
this.v$.$touch();
if (this.v$.$invalid) {
- this.showValidationErrorModal();
+ this.$store.dispatch("newToast", {
+ header: "Please check validation",
+ message: "Sorry, but can you please fix all validation issues.",
+ extra_classes: "bg-warning",
+ delay: 0,
+ });
//Just return - as we do not need to do the rest of this function
return;
diff --git a/src/js/components/permissions/NewPermissionSet.vue b/src/js/components/permissions/NewPermissionSet.vue
index f0a223311..ad69c7eeb 100644
--- a/src/js/components/permissions/NewPermissionSet.vue
+++ b/src/js/components/permissions/NewPermissionSet.vue
@@ -42,7 +42,6 @@
+
+ +
+ Object Status List
++ +
+
+
+ Object Status List
+
+
+ + Click on any of the objects to edit the status' for that particular object. +
+