Fix initial step validation not working + Add in Organization to Internal/External Cards and filing summary (#1687)

* Fix initial validation, devmode = false, devmode was enabled to bypass validation

* Add in organization to internal/external dashboard cards also on the filing summary page

* Move datatype factory into initialize, so we don't need a unit test wide mock that depends on import order

* remove comma replacement

* new descriptor types

* remove devmode and some clean up

* use new format, don't stub ProjectCard

* clean up

* use bcgov/arches-component-lab#v0.0.1a13-bcgov
use github:bcgov/bcgov-arches-common#ts/bugfix/general_fixes

* descriptors for contributor

* function manager give ability to reindex

* Point back at release/2.1.x of bcgov-arches-common

---------

Co-authored-by: brett <brett@qedsystems.ca>

Author: seeker25

bcap/functions/bcap_site_descriptors.py

@@ -43,7 +43,7 @@
 
 
 class BCAPSiteDescriptors(AbstractPrimaryDescriptorsFunction):
-    _datatype_factory = DataTypeFactory()
+    _datatype_factory = None
     # For Name part of descriptor
     graph_slug = "archaeological_site"
 
@@ -68,6 +68,7 @@ class BCAPSiteDescriptors(AbstractPrimaryDescriptorsFunction):
 
     # Initializes the static nodes and datatypes data
     def initialize(self):
+        BCAPSiteDescriptors._datatype_factory = DataTypeFactory()
         for alias in (
             BCAPSiteDescriptors._name_nodes
             + BCAPSiteDescriptors._sig_event_nodes

bcap/functions/contributor_descriptors.py

@@ -0,0 +1,68 @@
+from bcap.util.bcap_aliases import GraphSlugs
+from bcap.util.descriptors import DescriptorTypes
+from bcap.util.aliases.contributor import ContributorAliases as aliases
+from bcgov_arches_common.util.bc_primary_descriptors_function import (
+    BCPrimaryDescriptorsFunction,
+)
+from bcgov_arches_common.util.graph_lookup import GraphLookup
+
+details = {
+    "functionid": "60000000-0000-0000-0000-000000001007",
+    "name": "Contributor Descriptors",
+    "type": "primarydescriptors",
+    "modulename": "contributor_descriptors.py",
+    "description": "Function that provides the primary descriptors for BCAP Contributors",
+    "defaultconfig": {
+        "module": "bcap.functions.contributor_descriptors",
+        "class_name": "ContributorDescriptors",
+        "descriptor_types": {
+            DescriptorTypes.NAME: {},
+            DescriptorTypes.DESCRIPTION: {},
+            DescriptorTypes.MAP_POPUP: {},
+        },
+        "triggering_nodegroups": [],
+    },
+    "classname": "ContributorDescriptors",
+    "component": "views/components/functions/contributor-descriptors",
+}
+
+
+class ContributorDescriptorNodes:
+    NAME = [aliases.CONTRIBUTOR_NAME, aliases.FIRST_NAME]
+    CARD = [aliases.CONTRIBUTOR_TYPE, aliases.CONTRIBUTOR_ROLE]
+
+    # A descriptor with no nodes renders as "".
+    BY_DESCRIPTOR = {
+        DescriptorTypes.NAME: NAME,
+        DescriptorTypes.DESCRIPTION: CARD,
+        DescriptorTypes.MAP_POPUP: [],
+    }
+
+
+class ContributorDescriptors(BCPrimaryDescriptorsFunction):
+    # Arches builds a fresh instance per descriptor per resource, and a lookup
+    # re-reads its nodes on first use, so share one for the whole process.
+    _graph_lookup = GraphLookup(
+        GraphSlugs.CONTRIBUTOR,
+        ContributorDescriptorNodes.NAME + ContributorDescriptorNodes.CARD,
+    )
+
+    def get_primary_descriptor_from_nodes(
+        self, resource, config, context=None, descriptor=None
+    ):
+        node_aliases = ContributorDescriptorNodes.BY_DESCRIPTOR.get(descriptor, [])
+        values = [
+            self.format_value(
+                None,
+                self.get_value_from_node(
+                    self._graph_lookup.get_node(alias),
+                    self._graph_lookup.get_datatype(alias),
+                    resource,
+                    context=context,
+                ),
+                show_name=False,
+            )
+            for alias in node_aliases
+        ]
+
+        return ", ".join(filter(None, values))

bcap/functions/process_requirement_descriptors.py

@@ -47,7 +47,7 @@
 
 
 class ProcessRequirementDescriptors(AbstractPrimaryDescriptorsFunction):
-    _datatype_factory = DataTypeFactory()
+    _datatype_factory = None
     # For Name part of descriptor
     graph_slug = "process_requirement"
 
@@ -69,6 +69,7 @@ class ProcessRequirementDescriptors(AbstractPrimaryDescriptorsFunction):
 
     # Initializes the static nodes and datatypes data
     def initialize(self):
+        ProcessRequirementDescriptors._datatype_factory = DataTypeFactory()
         for alias in (
             ProcessRequirementDescriptors._name_nodes
             + ProcessRequirementDescriptors._popup_nodes

bcap/media/js/views/components/functions/contributor-descriptors.js

@@ -0,0 +1,34 @@
+import $ from 'jquery';
+import arches from 'arches';
+import ko from 'knockout';
+import FunctionViewModel from 'viewmodels/function-view-model';
+import contributorDescriptorsTemplate from 'templates/views/components/functions/contributor-descriptors.htm';
+
+// The descriptor nodes are hardcoded in ContributorDescriptorNodes, so the only
+// thing this panel offers is re-indexing.
+export default ko.components.register(
+    'views/components/functions/contributor-descriptors',
+    {
+        viewModel: function () {
+            FunctionViewModel.apply(this, arguments);
+            this.loading = ko.observable(false);
+
+            this.reindexdb = function () {
+                this.loading(true);
+                $.ajax({
+                    type: 'POST',
+                    url: arches.urls.reindex,
+                    context: this,
+                    data: JSON.stringify({ graphids: [this.graph.graphid] }),
+                    error: function () {
+                        console.error('Re-index request failed');
+                    },
+                    complete: function () {
+                        this.loading(false);
+                    },
+                });
+            };
+        },
+        template: contributorDescriptorsTemplate,
+    },
+);

bcap/pkg/graphs/resource_models/Contributor.json

@@ -472,23 +472,16 @@
             "functions_x_graphs": [
                 {
                     "config": {
+                        "class_name": "ContributorDescriptors",
                         "descriptor_types": {
-                            "description": {
-                                "nodegroup_id": "c4ec91a4-9dea-11ed-9a7b-5254004d77d3",
-                                "string_template": "<Contributor Type>, <Contributor Role>"
-                            },
-                            "map_popup": {
-                                "nodegroup_id": "",
-                                "string_template": ""
-                            },
-                            "name": {
-                                "nodegroup_id": "c4ec91a4-9dea-11ed-9a7b-5254004d77d3",
-                                "string_template": "<Contributor Name>, <First Name>"
-                            }
+                            "description": {},
+                            "map_popup": {},
+                            "name": {}
                         },
+                        "module": "bcap.functions.contributor_descriptors",
                         "triggering_nodegroups": []
                     },
-                    "function_id": "60000000-0000-0000-0000-000000000001",
+                    "function_id": "60000000-0000-0000-0000-000000001007",
                     "graph_id": "605b0bbc-8661-4cf2-b340-df743a8c5f89",
                     "id": "a62973b8-f0d8-4e1c-a47b-323dd4ad4bb2"
                 }

bcap/services/dashboard/base_dashboard_service.py

@@ -28,6 +28,7 @@ class BaseDashboardService(BaseGraphService):
         PA.FILING_TYPE,
         PA.INDUSTRIAL_SECTOR,
         PA.APPLICATION_PRIORITY_LEVEL,
+        PA.OWNING_ORGANIZATION,
         PA.RELATED_PERMIT,
         PA.MODULE_ID,
         PA.MODULE_NAME,
@@ -83,6 +84,7 @@ def display(alias):
             submission_type=display(self.PA.FILING_TYPE),
             industrial_sector=display(self.PA.INDUSTRIAL_SECTOR),
             priority_level=display(self.PA.APPLICATION_PRIORITY_LEVEL),
+            organization=display(self.PA.OWNING_ORGANIZATION),
             related_permit_id=self._resource_id(
                 self._node_value(aliased, self.PA.RELATED_PERMIT)
             ),

bcap/services/dashboard/dashboard_types.py

@@ -104,6 +104,11 @@ class InternalDashboardCard:
     industrial_sector: str = described(
         "Permit application's industrial sector (reference label).", ""
     )
+    organization: str = described(
+        "Name of the organization the application is filed under (its stamped "
+        "owning_organization); empty when it was filed under none.",
+        "",
+    )
     permit_id: str | None = described(
         "Resourceinstanceid of the related HCA Permit; its drill-in GUID.", None
     )
@@ -210,6 +215,11 @@ class ExternalDashboardCard:
     industrial_sector: str = described(
         "Permit application's industrial sector (reference label).", ""
     )
+    organization: str = described(
+        "Name of the organization the application is filed under (its stamped "
+        "owning_organization); empty when it was filed under none.",
+        "",
+    )
     permit_id: str | None = described(
         "Resourceinstanceid of the related HCA Permit; its drill-in GUID.", None
     )
@@ -269,6 +279,7 @@ class ApplicationCore:
     submission_type: str = ""
     industrial_sector: str = ""
     priority_level: str = ""
+    organization: str = ""
     related_permit_id: str | None = None
 
 

bcap/services/dashboard/external_dashboard_service.py

@@ -68,11 +68,7 @@ def _application_queryset(self):
                 GraphSlugs.PERMIT_APPLICATION,
                 nodes=self.nodes(
                     GraphSlugs.PERMIT_APPLICATION,
-                    self.CARD_NODES
-                    + [
-                        self.PA.APPLICATION_SUBMISSION_DATE,
-                        self.PA.OWNING_ORGANIZATION,
-                    ],
+                    self.CARD_NODES + [self.PA.APPLICATION_SUBMISSION_DATE],
                 ),
                 as_representation=True,
             )
@@ -114,6 +110,7 @@ def _application_card(self, permit, hca_permits, unread_messages=0):
             application_number=core.application_number,
             submission_type=core.submission_type,
             industrial_sector=core.industrial_sector,
+            organization=core.organization,
             permit_id=core.related_permit_id,
             permit_number=hca.number,
             urgency=0,
@@ -160,7 +157,12 @@ def _draft_parents(self, drafts):
         permits = self._tiles(
             GraphSlugs.PERMIT_APPLICATION,
             ids,
-            [self.PA.PROJECT_NAME, self.PA.APPLICATION_ID, self.PA.FILING_TYPE],
+            [
+                self.PA.PROJECT_NAME,
+                self.PA.APPLICATION_ID,
+                self.PA.FILING_TYPE,
+                self.PA.OWNING_ORGANIZATION,
+            ],
         )
         return {
             str(permit.pk): self._application_core(permit.aliased_data)
@@ -195,5 +197,6 @@ def field(alias):
                 self.PA.APPLICATION_ID, parent.application_number
             ),
             submission_type=identification(self.PA.FILING_TYPE, parent.submission_type),
+            organization=parent.organization,
             unread_messages=unread_messages,
         )

bcap/services/dashboard/internal_dashboard_service.py

@@ -375,6 +375,7 @@ def _card_to_json(self, permit, data: InternalDashboardData):
             application_number=core.application_number,
             submission_type=core.submission_type,
             industrial_sector=core.industrial_sector,
+            organization=core.organization,
             permit_id=core.related_permit_id,
             permit_number=hca.number,
             permit_holder=holder_names,

bcap/src/bcap/apps/Permit/Modules/WorkflowStepper.vue

@@ -81,7 +81,6 @@ const state = reactive({
     submitting: false,
     savingDraft: false,
     confirmingExit: false,
-    devMode: true,
     isDataLoaded: false,
     finalizedResourceData: null as PermitApplication | null,
 });
@@ -132,7 +131,6 @@ const currentStepIsValid = computed(
 );
 
 const stepIsValid = (step: number): boolean => {
-    if (state.devMode) return true;
     const el = stepEls.value[step - 1];
     let valid = true;
     if (typeof el?.isValid === 'function') valid = el.isValid();