bugfix - nearbeach-1028 Organisation Information page load has error

nearbeach · Jun 30, 2023 · e54fe05 · e54fe05
1 parent f83da1b
commit e54fe05
Show file tree

Hide file tree

Showing 46 changed files with 1,995 additions and 183 deletions.
diff --git a/NearBeach/static/NearBeach/5553.min.js b/NearBeach/static/NearBeach/5553.min.js
diff --git a/NearBeach/static/NearBeach/5553.min.js.gz b/NearBeach/static/NearBeach/5553.min.js.gz
diff --git a/NearBeach/static/NearBeach/NearBeach.min.js b/NearBeach/static/NearBeach/NearBeach.min.js
diff --git a/NearBeach/static/NearBeach/NearBeach.min.js.gz b/NearBeach/static/NearBeach/NearBeach.min.js.gz
diff --git a/NearBeach/static/NearBeach/organisation-modules.min.js b/NearBeach/static/NearBeach/organisation-modules.min.js
diff --git a/NearBeach/static/NearBeach/organisation-modules.min.js.gz b/NearBeach/static/NearBeach/organisation-modules.min.js.gz
diff --git a/NearBeach/static/NearBeach/parent-modules.min.js b/NearBeach/static/NearBeach/parent-modules.min.js
diff --git a/NearBeach/static/NearBeach/parent-modules.min.js.gz b/NearBeach/static/NearBeach/parent-modules.min.js.gz
diff --git a/NearBeach/static/NearBeach/src_js_components_dates_BetweenDates_vue.min.js b/NearBeach/static/NearBeach/src_js_components_dates_BetweenDates_vue.min.js
diff --git a/NearBeach/static/NearBeach/src_js_components_dates_BetweenDates_vue.min.js.gz b/NearBeach/static/NearBeach/src_js_components_dates_BetweenDates_vue.min.js.gz
diff --git a/NearBeach/static/NearBeach/src_js_components_kanban_KanbanPropertyOrder_vue.min.js b/NearBeach/static/NearBeach/src_js_components_kanban_KanbanPropertyOrder_vue.min.js
diff --git a/NearBeach/static/NearBeach/src_js_components_kanban_KanbanPropertyOrder_vue.min.js.gz b/NearBeach/static/NearBeach/src_js_components_kanban_KanbanPropertyOrder_vue.min.js.gz
diff --git a/...modules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-3f9d7a.min.js b/...modules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-3f9d7a.min.js
diff --git a/...ules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-3f9d7a.min.js.gz b/...ules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-3f9d7a.min.js.gz
diff --git a/...modules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-da3157.min.js b/...modules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-da3157.min.js
diff --git a/...ules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-da3157.min.js.gz b/...ules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-da3157.min.js.gz
diff --git a/...modules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-e8ebca.min.js b/...modules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-e8ebca.min.js
diff --git a/...ules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-e8ebca.min.js.gz b/...ules_sub_modules_CustomersListModule_vue-src_js_components_modules_sub_m-e8ebca.min.js.gz
diff --git a/...modules_sub_modules_DocumentsModule_vue-src_js_components_modules_sub_modul-ce2f2b.min.js b/...modules_sub_modules_DocumentsModule_vue-src_js_components_modules_sub_modul-ce2f2b.min.js
diff --git a/...ules_sub_modules_DocumentsModule_vue-src_js_components_modules_sub_modul-ce2f2b.min.js.gz b/...ules_sub_modules_DocumentsModule_vue-src_js_components_modules_sub_modul-ce2f2b.min.js.gz
diff --git a/...ch/static/NearBeach/src_js_components_modules_sub_modules_GroupsAndUsersModule_vue.min.js b/...ch/static/NearBeach/src_js_components_modules_sub_modules_GroupsAndUsersModule_vue.min.js
diff --git a/...static/NearBeach/src_js_components_modules_sub_modules_GroupsAndUsersModule_vue.min.js.gz b/...static/NearBeach/src_js_components_modules_sub_modules_GroupsAndUsersModule_vue.min.js.gz
diff --git a/NearBeach/static/NearBeach/src_js_components_modules_wizards_AddUserWizard_vue.min.js b/NearBeach/static/NearBeach/src_js_components_modules_wizards_AddUserWizard_vue.min.js
diff --git a/NearBeach/static/NearBeach/src_js_components_modules_wizards_AddUserWizard_vue.min.js.gz b/NearBeach/static/NearBeach/src_js_components_modules_wizards_AddUserWizard_vue.min.js.gz
diff --git a/...organisations_GetStakeholders_vue-src_js_components_permissions_GroupPermis-d2eb78.min.js b/...organisations_GetStakeholders_vue-src_js_components_permissions_GroupPermis-d2eb78.min.js
diff --git a/...anisations_GetStakeholders_vue-src_js_components_permissions_GroupPermis-d2eb78.min.js.gz b/...anisations_GetStakeholders_vue-src_js_components_permissions_GroupPermis-d2eb78.min.js.gz
diff --git a/...request_for_change_tabs_RfcBackoutPlan_vue-src_js_components_request_for_ch-fe6a49.min.js b/...request_for_change_tabs_RfcBackoutPlan_vue-src_js_components_request_for_ch-fe6a49.min.js
diff --git a/...uest_for_change_tabs_RfcBackoutPlan_vue-src_js_components_request_for_ch-fe6a49.min.js.gz b/...uest_for_change_tabs_RfcBackoutPlan_vue-src_js_components_request_for_ch-fe6a49.min.js.gz
diff --git a/NearBeach/static/NearBeach/vendors-node_modules_luxon_src_luxon_js.min.js b/NearBeach/static/NearBeach/vendors-node_modules_luxon_src_luxon_js.min.js
diff --git a/NearBeach/static/NearBeach/vendors-node_modules_luxon_src_luxon_js.min.js.gz b/NearBeach/static/NearBeach/vendors-node_modules_luxon_src_luxon_js.min.js.gz
diff --git a/...es_naive-ui_es__internal_icon_src_Icon_js-node_modules_naive-ui_es__interna-40781b.min.js b/...es_naive-ui_es__internal_icon_src_Icon_js-node_modules_naive-ui_es__interna-40781b.min.js
diff --git a/...naive-ui_es__internal_icon_src_Icon_js-node_modules_naive-ui_es__interna-40781b.min.js.gz b/...naive-ui_es__internal_icon_src_Icon_js-node_modules_naive-ui_es__interna-40781b.min.js.gz
diff --git a/...es_naive-ui_es__internal_icons_Eye_js-node_modules_naive-ui_es_button_src_B-c0aade.min.js b/...es_naive-ui_es__internal_icons_Eye_js-node_modules_naive-ui_es_button_src_B-c0aade.min.js
diff --git a/...naive-ui_es__internal_icons_Eye_js-node_modules_naive-ui_es_button_src_B-c0aade.min.js.gz b/...naive-ui_es__internal_icons_Eye_js-node_modules_naive-ui_es_button_src_B-c0aade.min.js.gz
diff --git a/...ch/static/NearBeach/vendors-node_modules_naive-ui_es_date-picker_src_DatePicker_js.min.js b/...ch/static/NearBeach/vendors-node_modules_naive-ui_es_date-picker_src_DatePicker_js.min.js
diff --git a/...static/NearBeach/vendors-node_modules_naive-ui_es_date-picker_src_DatePicker_js.min.js.gz b/...static/NearBeach/vendors-node_modules_naive-ui_es_date-picker_src_DatePicker_js.min.js.gz
diff --git a/NearBeach/static/NearBeach/vendors-node_modules_naive-ui_es_select_src_Select_js.min.js b/NearBeach/static/NearBeach/vendors-node_modules_naive-ui_es_select_src_Select_js.min.js
diff --git a/NearBeach/static/NearBeach/vendors-node_modules_naive-ui_es_select_src_Select_js.min.js.gz b/NearBeach/static/NearBeach/vendors-node_modules_naive-ui_es_select_src_Select_js.min.js.gz
diff --git a/NearBeach/static/NearBeach/vendors-node_modules_naive-ui_es_upload_src_Upload_js.min.js b/NearBeach/static/NearBeach/vendors-node_modules_naive-ui_es_upload_src_Upload_js.min.js
diff --git a/NearBeach/static/NearBeach/vendors-node_modules_naive-ui_es_upload_src_Upload_js.min.js.gz b/NearBeach/static/NearBeach/vendors-node_modules_naive-ui_es_upload_src_Upload_js.min.js.gz
diff --git a/...tic/NearBeach/vendors-node_modules_tinymce_tinymce-vue_lib_es2015_main_ts_index_js.min.js b/...tic/NearBeach/vendors-node_modules_tinymce_tinymce-vue_lib_es2015_main_ts_index_js.min.js
diff --git a/.../NearBeach/vendors-node_modules_tinymce_tinymce-vue_lib_es2015_main_ts_index_js.min.js.gz b/.../NearBeach/vendors-node_modules_tinymce_tinymce-vue_lib_es2015_main_ts_index_js.min.js.gz
diff --git a/src/js/components/modules/ParentModules.vue b/src/js/components/modules/ParentModules.vue
@@ -292,10 +292,7 @@
 					role="tabpanel"
 					aria-labelledby="contact-tab"
 				>
-					<misc-module
-						v-bind:location-id="locationId"
-						v-bind:destination="destination"
-					></misc-module>
+					<list-tags-module></list-tags-module>
 				</div>
 				<div
 					class="tab-pane fade"
@@ -318,8 +315,8 @@
 	import DocumentsModule from "./sub_modules/DocumentsModule.vue";
 	import ObjectLinks from "./sub_modules/ObjectLinks.vue";
 	import CustomersModule from "./sub_modules/CustomersModule.vue";
+	import ListTagsModule from "./sub_modules/ListTagsModule.vue";
 	import BugsModule from "./sub_modules/BugsModule.vue";
-	import MiscModule from "./sub_modules/MiscModule.vue";
 	import NotesModule from "./sub_modules/NotesModule.vue";
 
 	export default {
@@ -329,7 +326,7 @@
 			CustomersModule,
 			DocumentsModule,
 			GroupsAndUsersModule,
-			MiscModule,
+			ListTagsModule,
 			NotesModule,
 			ObjectLinks,
 			RequirementItemLinksModule,

diff --git a/src/js/components/modules/sub_modules/AssociatedObjects.vue b/src/js/components/modules/sub_modules/AssociatedObjects.vue
@@ -181,15 +181,15 @@
 		mixins: [iconMixin],
 		data() {
 			return {
-				destination: "getDestination",
-				locationId: "getLocationId",
 				projectResults: [],
 				requirementResults: [],
 				taskResults: [],
 			};
 		},
 		computed: {
 			...mapGetters({
+				destination: "getDestination",
+				locationId: "getLocationId",
 				rootUrl: "getRootUrl",
 			}),
 		},
@@ -221,6 +221,7 @@
 		mounted() {
 			//Wait 200ms
 			setTimeout(() => {
+				console.log("Destination: ", this.destination);
 				this.getAssociatedObjectResults();
 			}, 200);
 		},

diff --git a/src/js/components/modules/sub_modules/MiscModule.vue b/src/js/components/modules/sub_modules/MiscModule.vue
@@ -1,9 +1,6 @@
 <template>
 	<div>
-		<list-tags-module
-			v-bind:destination="destination"
-			v-bind:location-id="locationId"
-		></list-tags-module>
+		<list-tags-module></list-tags-module>
 	</div>
 </template>
 
@@ -16,23 +13,10 @@
 		components: {
 			ListTagsModule,
 		},
-		props: {
-			destination: {
-				type: String,
-				default: "",
-			},
-			locationId: {
-				type: Number,
-				default: 0,
-			},
-		},
+		props: {},
 		mixins: [],
 		computed: {},
-		data() {
-			return {
-				noteHistoryResults: [],
-			};
-		},
+		data() {},
 		methods: {},
 		mounted() {},
 	};

diff --git a/src/js/components/organisations/OrganisationModules.vue b/src/js/components/organisations/OrganisationModules.vue
@@ -159,8 +159,6 @@
 					aria-labelledby="profile-tab"
 				>
 					<associated-objects
-						v-bind:destination="destination"
-						v-bind:location-id="locationId"
 					></associated-objects>
 				</div>
 				<div
@@ -169,10 +167,7 @@
 					role="tabpanel"
 					aria-labelledby="profile-tab"
 				>
-					<misc-module
-						v-bind:destination="destination"
-						v-bind:location-id="locationId"
-					></misc-module>
+					<list-tags-module></list-tags-module>
 				</div>
 				<div
 					class="tab-pane fade"
@@ -200,9 +195,9 @@
 	import { Modal } from "bootstrap";
 	import { Icon } from "@iconify/vue";
 	import CustomersListModule from "../modules/sub_modules/CustomersListModule.vue";
+	import ListTagsModule from "../modules/sub_modules/ListTagsModule.vue";
 	import NewCustomerModal from "../customers/NewCustomerModal.vue";
 	import NotesModule from "../modules/sub_modules/NotesModule.vue";
-	import MiscModule from "../modules/sub_modules/MiscModule.vue";
 	import AssociatedObjects from "../modules/sub_modules/AssociatedObjects.vue";
 	import DocumentsModule from "../modules/sub_modules/DocumentsModule.vue";
 
@@ -219,7 +214,7 @@
 			CustomersListModule,
 			DocumentsModule,
 			Icon,
-			MiscModule,
+			ListTagsModule,
 			NewCustomerModal,
 			NotesModule,
 		},
@@ -284,6 +279,13 @@
 				type: "updateUserLevel",
 				userLevel: this.userLevel,
 			});
+
+			//Send the destination and location to VUEX
+			this.$store.commit({
+				type: "updateDestination",
+				destination: this.destination,
+				locationId: this.locationId,
+			})
 		},
 	};
 </script>