@truedat/dd 8.6.7 → 8.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/src/components/BucketView.js +2 -2
- package/src/components/CatalogCustomViewCards.js +1 -1
- package/src/components/DictionaryRoutes.js +3 -3
- package/src/components/FilteredNav.js +3 -3
- package/src/components/Grant.js +4 -4
- package/src/components/GrantApprovalRule.js +1 -1
- package/src/components/GrantApprovalRuleConditions.js +1 -1
- package/src/components/GrantApprovalRuleDeleteButton.js +1 -1
- package/src/components/GrantApprovalRuleEdit.js +1 -1
- package/src/components/GrantApprovalRuleForm.js +6 -6
- package/src/components/GrantApprovalRules.js +1 -1
- package/src/components/GrantFilters.js +1 -1
- package/src/components/GrantFiltersLoader.js +1 -1
- package/src/components/GrantRemovalDirectButton.js +1 -1
- package/src/components/GrantRemovalWorkflow.js +2 -2
- package/src/components/GrantRemovalWorkflowDropdown.js +1 -1
- package/src/components/GrantRequest.js +3 -3
- package/src/components/GrantRequestApprovalForm.js +2 -2
- package/src/components/GrantRequestApprovalResults.js +1 -1
- package/src/components/GrantRequestBulkActions.js +2 -2
- package/src/components/GrantRequestBulkRoleSelector.js +1 -1
- package/src/components/GrantRequestCartResult.js +13 -3
- package/src/components/GrantRequestSummary.js +1 -1
- package/src/components/GrantRequests.js +2 -2
- package/src/components/GrantRequestsSearchResults.js +7 -7
- package/src/components/GrantRoutes.js +3 -9
- package/src/components/Grants.js +14 -4
- package/src/components/GrantsDownloadButton.js +1 -1
- package/src/components/GrantsLabelResults.js +2 -5
- package/src/components/GrantsLoader.js +2 -2
- package/src/components/GrantsTable.js +3 -8
- package/src/components/GraphLoader.js +1 -1
- package/src/components/LineageContextMenu.js +1 -1
- package/src/components/LineageDownloadButton.js +2 -2
- package/src/components/LineageEventsTable.js +1 -1
- package/src/components/LineageGraph.js +7 -6
- package/src/components/LineageGroup.js +2 -7
- package/src/components/LinkLabelsSelector.js +1 -1
- package/src/components/MyGrantRequests.js +1 -1
- package/src/components/ProfileGroup.js +2 -2
- package/src/components/ReferenceDatasetActions.js +1 -1
- package/src/components/ReferenceDatasetCreate.js +1 -1
- package/src/components/ReferenceDatasetDetail.js +1 -1
- package/src/components/ReferenceDatasetFieldSelector.js +5 -5
- package/src/components/ReferenceDatasetForm.js +3 -3
- package/src/components/ReferenceDatasetSelectorInputField.js +3 -3
- package/src/components/ReferenceDatasetsTable.js +1 -1
- package/src/components/StructureChildrenRelations.js +1 -1
- package/src/components/StructureConfidentialButton.js +1 -1
- package/src/components/StructureCrumbs.js +3 -3
- package/src/components/StructureDeleteButton.js +1 -1
- package/src/components/StructureFields.js +3 -3
- package/src/components/StructureFieldsDropdown.js +10 -10
- package/src/components/StructureGrantCart.js +3 -3
- package/src/components/StructureGrantCartCheckout.js +9 -4
- package/src/components/StructureGrantCartInformation.js +2 -7
- package/src/components/StructureGrantListButton.js +5 -5
- package/src/components/StructureGrantRequestAddCart.js +1 -1
- package/src/components/StructureGrantSummaryButton.js +2 -2
- package/src/components/StructureGrants.js +2 -2
- package/src/components/StructureItem.js +4 -4
- package/src/components/StructureItemRoot.js +1 -1
- package/src/components/StructureLoader.js +1 -2
- package/src/components/StructureMetadata.js +23 -17
- package/src/components/StructureNav.js +1 -1
- package/src/components/StructureNavClassified.js +1 -1
- package/src/components/StructureNoteActions.js +1 -1
- package/src/components/StructureNotes.js +3 -3
- package/src/components/StructureNotesEdit.js +4 -4
- package/src/components/StructureProfileButton.js +1 -1
- package/src/components/StructureProperties.js +1 -1
- package/src/components/StructureSelector.js +3 -3
- package/src/components/StructureSelectorInputFieldJoin.js +2 -2
- package/src/components/StructureStructureForm.js +2 -2
- package/src/components/StructureStructureLinks.js +5 -5
- package/src/components/StructureTabPane.js +5 -5
- package/src/components/StructureTabPaneRoutes.js +92 -80
- package/src/components/StructureTabRoutes.js +30 -8
- package/src/components/StructureTabs.js +17 -16
- package/src/components/StructureTagForm.js +2 -2
- package/src/components/StructureTags.js +1 -1
- package/src/components/StructureTypeForm.js +3 -3
- package/src/components/StructureTypeLoader.js +1 -1
- package/src/components/StructureTypesLoader.js +1 -1
- package/src/components/StructureTypesRoutes.js +1 -1
- package/src/components/StructureVersions.js +17 -16
- package/src/components/StructureView.js +1 -1
- package/src/components/StructuresBulkUpdate.js +4 -4
- package/src/components/StructuresDomainsUploadOption.js +1 -1
- package/src/components/StructuresDownloadOption.js +1 -1
- package/src/components/StructuresGrantRequestView.js +1 -1
- package/src/components/StructuresLoader.js +1 -1
- package/src/components/StructuresRoutes.js +2 -2
- package/src/components/StructuresTable.js +4 -4
- package/src/components/StructuresUpdateOption.js +3 -3
- package/src/components/StructuresUploadEventsTable.js +9 -9
- package/src/components/StructuresUploadOption.js +14 -14
- package/src/components/StructuresView.js +1 -1
- package/src/components/SystemCards.js +7 -7
- package/src/components/SystemForm.js +2 -2
- package/src/components/SystemLoader.js +1 -1
- package/src/components/SystemStructures.js +2 -2
- package/src/components/SystemView.js +3 -3
- package/src/components/Task.js +6 -6
- package/src/components/Tasks.js +1 -1
- package/src/components/ValueConditionStructure.js +2 -2
- package/src/components/__tests__/BucketView.spec.js +2 -2
- package/src/components/__tests__/CatalogCustomViewCards.spec.js +1 -1
- package/src/components/__tests__/CatalogViewConfigForm.spec.js +2 -2
- package/src/components/__tests__/CatalogViewConfigs.spec.js +2 -2
- package/src/components/__tests__/DictionaryRoutes.spec.js +7 -3
- package/src/components/__tests__/EditDomainForm.spec.js +3 -3
- package/src/components/__tests__/FilteredNav.spec.js +4 -4
- package/src/components/__tests__/Grant.spec.js +4 -4
- package/src/components/__tests__/GrantApprovalRuleConditions.spec.js +6 -6
- package/src/components/__tests__/GrantApprovalRuleDeleteButton.spec.js +2 -2
- package/src/components/__tests__/GrantApprovalRuleForm.spec.js +9 -7
- package/src/components/__tests__/GrantApprovalRules.spec.js +3 -3
- package/src/components/__tests__/GrantRemoval.spec.js +4 -4
- package/src/components/__tests__/GrantRemovalDirectButton.spec.js +8 -8
- package/src/components/__tests__/GrantRemovalWorkflow.spec.js +8 -8
- package/src/components/__tests__/GrantRequest.spec.js +1 -1
- package/src/components/__tests__/GrantRequestApprovalForm.spec.js +6 -6
- package/src/components/__tests__/GrantRequestApprovalPopup.spec.js +1 -1
- package/src/components/__tests__/GrantRequestBulkActions.spec.js +8 -8
- package/src/components/__tests__/GrantRequestBulkApprovalForm.spec.js +2 -2
- package/src/components/__tests__/GrantRequestBulkRoleSelector.spec.js +2 -2
- package/src/components/__tests__/GrantRequestCartResult.spec.js +13 -3
- package/src/components/__tests__/GrantRequestHeader.spec.js +2 -2
- package/src/components/__tests__/GrantRequestRow.spec.js +4 -4
- package/src/components/__tests__/GrantRequestSummary.spec.js +1 -1
- package/src/components/__tests__/GrantRequests.spec.js +2 -2
- package/src/components/__tests__/GrantRequestsLabelResults.spec.js +3 -3
- package/src/components/__tests__/GrantRequestsSearchResults.spec.js +2 -2
- package/src/components/__tests__/GrantRequestsTable.spec.js +1 -1
- package/src/components/__tests__/GrantRoutes.spec.js +16 -16
- package/src/components/__tests__/GrantsDownloadButton.spec.js +68 -40
- package/src/components/__tests__/GrantsLabelResults.spec.js +2 -2
- package/src/components/__tests__/GrantsLoader.spec.js +1 -1
- package/src/components/__tests__/GrantsTable.spec.js +4 -4
- package/src/components/__tests__/LineageForm.spec.js +5 -5
- package/src/components/__tests__/LineageGroup.spec.js +6 -6
- package/src/components/__tests__/LineageResource.spec.js +5 -5
- package/src/components/__tests__/LineageRoutes.spec.js +6 -6
- package/src/components/__tests__/PendingStructureNoteRow.spec.js +4 -4
- package/src/components/__tests__/PendingStructureNotes.spec.js +1 -1
- package/src/components/__tests__/PendingStructureNotesLabelResults.spec.js +1 -1
- package/src/components/__tests__/PendingStructureNotesPagination.spec.js +1 -1
- package/src/components/__tests__/PendingStructureNotesTable.spec.js +2 -2
- package/src/components/__tests__/ProfileExecution.spec.js +2 -2
- package/src/components/__tests__/ProfileGroup.spec.js +2 -2
- package/src/components/__tests__/ReferenceDataset.spec.js +7 -5
- package/src/components/__tests__/ReferenceDatasetCreate.spec.js +1 -1
- package/src/components/__tests__/ReferenceDatasetDetail.spec.js +1 -1
- package/src/components/__tests__/ReferenceDatasetFieldSelector.spec.js +9 -9
- package/src/components/__tests__/ReferenceDatasetForm.spec.js +9 -7
- package/src/components/__tests__/ReferenceDatasetRoutes.spec.js +1 -1
- package/src/components/__tests__/StructureFieldRow.spec.js +3 -3
- package/src/components/__tests__/StructureFieldsDropdown.spec.js +5 -5
- package/src/components/__tests__/StructureGrantCartCheckout.spec.js +2 -2
- package/src/components/__tests__/StructureGrantCartInformation.spec.js +1 -1
- package/src/components/__tests__/StructureGrantCartUserSelector.spec.js +4 -4
- package/src/components/__tests__/StructureGrantDropdown.spec.js +3 -3
- package/src/components/__tests__/StructureGrantListButton.spec.js +4 -4
- package/src/components/__tests__/StructureGrantSummaryButton.spec.js +5 -5
- package/src/components/__tests__/StructureItem.spec.js +3 -3
- package/src/components/__tests__/StructureMetadata.spec.js +2 -4
- package/src/components/__tests__/StructureNavClassified.spec.js +1 -1
- package/src/components/__tests__/StructureNoteActions.spec.js +17 -15
- package/src/components/__tests__/StructureNoteLink.spec.js +8 -9
- package/src/components/__tests__/StructureNotes.spec.js +3 -3
- package/src/components/__tests__/StructureNotesDownloadButton.spec.js +15 -15
- package/src/components/__tests__/StructureNotesEdit.spec.js +1 -1
- package/src/components/__tests__/StructureRelationRow.spec.js +2 -2
- package/src/components/__tests__/StructureRelations.spec.js +2 -2
- package/src/components/__tests__/StructureRow.spec.js +2 -2
- package/src/components/__tests__/StructureSelectorInputField.spec.js +2 -2
- package/src/components/__tests__/StructureSelectorInputFieldJoin.spec.js +1 -1
- package/src/components/__tests__/StructureStructureForm.spec.js +1 -1
- package/src/components/__tests__/StructureStructureLinks.spec.js +15 -15
- package/src/components/__tests__/StructureSummary.spec.js +1 -1
- package/src/components/__tests__/StructureTabPane.spec.js +10 -12
- package/src/components/__tests__/StructureTabRoutes.spec.js +1 -1
- package/src/components/__tests__/StructureTabs.spec.js +24 -8
- package/src/components/__tests__/StructureTag.spec.js +11 -11
- package/src/components/__tests__/StructureTagForm.spec.js +17 -17
- package/src/components/__tests__/StructureTypesRoutes.spec.js +4 -4
- package/src/components/__tests__/StructureVersions.spec.js +0 -1
- package/src/components/__tests__/StructuresBulkUpdate.spec.js +3 -3
- package/src/components/__tests__/StructuresDownloadOption.spec.js +3 -3
- package/src/components/__tests__/StructuresEditableDownloadOption.spec.js +2 -2
- package/src/components/__tests__/StructuresGrantRequestView.spec.js +2 -2
- package/src/components/__tests__/StructuresLabelResults.spec.js +1 -1
- package/src/components/__tests__/StructuresLoader.spec.js +1 -1
- package/src/components/__tests__/StructuresOptions.spec.js +15 -9
- package/src/components/__tests__/StructuresRoutes.spec.js +1 -1
- package/src/components/__tests__/StructuresSearchResults.spec.js +2 -2
- package/src/components/__tests__/StructuresTable.spec.js +5 -5
- package/src/components/__tests__/StructuresUpdateOption.spec.js +2 -2
- package/src/components/__tests__/StructuresUploadOption.spec.js +2 -2
- package/src/components/__tests__/StructuresView.spec.js +6 -6
- package/src/components/__tests__/SystemCards.spec.js +2 -2
- package/src/components/__tests__/SystemFilteredNav.spec.js +1 -1
- package/src/components/__tests__/SystemStructuresLoader.spec.js +1 -1
- package/src/components/__tests__/SystemsRoutes.spec.js +1 -1
- package/src/components/__tests__/TagForm.spec.js +7 -5
- package/src/components/__tests__/TagsRoutes.spec.js +1 -1
- package/src/components/__tests__/Tasks.spec.js +9 -9
- package/src/components/__tests__/TasksRoutes.spec.js +1 -1
- package/src/components/__tests__/ValueConditionStructure.spec.js +2 -2
- package/src/hooks/useBucketPaths.js +1 -1
- package/src/hooks/useBucketStructures.js +1 -1
- package/src/hooks/useCustomTabs.js +1 -1
- package/src/hooks/useGrant.js +7 -3
- package/src/hooks/useGrantRequest.js +4 -4
- package/src/hooks/useStructures.js +4 -5
- package/src/hooks/useTemplatesByIds.js +10 -5
- package/src/messages/en.js +1 -2
- package/src/messages/es.js +1 -2
- package/src/messages/index.js +1 -1
- package/src/reducers/__tests__/bulkUpdateStructuresLoading.spec.js +5 -5
- package/src/reducers/__tests__/creatingGrantRequestApproval.spec.js +3 -3
- package/src/reducers/__tests__/csvGraphDownloading.spec.js +4 -4
- package/src/reducers/__tests__/ddMessage.spec.js +3 -3
- package/src/reducers/__tests__/grantFilters.spec.js +1 -1
- package/src/reducers/__tests__/grantQuery.spec.js +6 -6
- package/src/reducers/__tests__/grantRequests.spec.js +2 -2
- package/src/reducers/__tests__/grantRequestsCart.spec.js +31 -31
- package/src/reducers/__tests__/grantRequestsLoading.spec.js +3 -3
- package/src/reducers/__tests__/grantRequestsQuery.spec.js +2 -2
- package/src/reducers/__tests__/grants.spec.js +2 -2
- package/src/reducers/__tests__/graph.spec.js +1 -1
- package/src/reducers/__tests__/graphLoading.spec.js +6 -4
- package/src/reducers/__tests__/graphRedirect.spec.js +11 -7
- package/src/reducers/__tests__/lineageEventsLoading.spec.js +2 -2
- package/src/reducers/__tests__/lineageQuery.spec.js +6 -6
- package/src/reducers/__tests__/nodes.spec.js +1 -1
- package/src/reducers/__tests__/nodesLoading.spec.js +2 -2
- package/src/reducers/__tests__/profileExecution.spec.js +6 -6
- package/src/reducers/__tests__/profileExecutionLoading.spec.js +5 -3
- package/src/reducers/__tests__/profileGroup.spec.js +12 -12
- package/src/reducers/__tests__/profileGroupLoading.spec.js +6 -6
- package/src/reducers/__tests__/referenceDatasetSaving.spec.js +8 -4
- package/src/reducers/__tests__/selectedGroups.spec.js +2 -2
- package/src/reducers/__tests__/selectedNode.spec.js +5 -5
- package/src/reducers/__tests__/selectedResources.spec.js +5 -5
- package/src/reducers/__tests__/selectedUserSearchFilter.spec.js +3 -3
- package/src/reducers/__tests__/structure.spec.js +2 -2
- package/src/reducers/__tests__/structureActions.spec.js +4 -4
- package/src/reducers/__tests__/structureAncestry.spec.js +6 -6
- package/src/reducers/__tests__/structureChildren.spec.js +2 -2
- package/src/reducers/__tests__/structureFields.spec.js +5 -5
- package/src/reducers/__tests__/structureImpactGraph.spec.js +6 -6
- package/src/reducers/__tests__/structureImpactId.spec.js +7 -7
- package/src/reducers/__tests__/structureLineageGraph.spec.js +7 -7
- package/src/reducers/__tests__/structureLineageId.spec.js +7 -7
- package/src/reducers/__tests__/structureLinks.spec.js +6 -6
- package/src/reducers/__tests__/structureLoading.spec.js +2 -2
- package/src/reducers/__tests__/structureNotes.spec.js +1 -1
- package/src/reducers/__tests__/structureParents.spec.js +2 -2
- package/src/reducers/__tests__/structureProfile.spec.js +9 -6
- package/src/reducers/__tests__/structureQuery.spec.js +4 -4
- package/src/reducers/__tests__/structureRedirect.spec.js +9 -9
- package/src/reducers/__tests__/structureRelations.spec.js +4 -4
- package/src/reducers/__tests__/structureSiblings.spec.js +2 -2
- package/src/reducers/__tests__/structureSystem.spec.js +3 -3
- package/src/reducers/__tests__/structureTagSaving.spec.js +2 -2
- package/src/reducers/__tests__/structureType.spec.js +2 -2
- package/src/reducers/__tests__/structureTypeLoading.spec.js +6 -6
- package/src/reducers/__tests__/structureVersion.spec.js +4 -4
- package/src/reducers/__tests__/structureVersions.spec.js +9 -5
- package/src/reducers/__tests__/structures.spec.js +3 -3
- package/src/reducers/__tests__/structuresAliasNameMode.spec.js +5 -5
- package/src/reducers/__tests__/structuresUploadEvents.spec.js +1 -1
- package/src/reducers/__tests__/structuresUploadEventsLoading.spec.js +4 -4
- package/src/reducers/__tests__/system.spec.js +2 -2
- package/src/reducers/__tests__/systemId.spec.js +3 -3
- package/src/reducers/__tests__/systemStructures.spec.js +3 -3
- package/src/reducers/__tests__/systemStructuresLoading.spec.js +2 -2
- package/src/reducers/ddMessage.js +1 -1
- package/src/reducers/grantFilters.js +1 -1
- package/src/reducers/grantRequestsCart.js +16 -13
- package/src/reducers/grantSelectedFilter.js +1 -1
- package/src/reducers/profileGroup.js +1 -1
- package/src/reducers/selectedResources.js +1 -1
- package/src/reducers/selectedUserSearchFilter.js +1 -1
- package/src/reducers/structure.js +1 -1
- package/src/reducers/structureImpactGraph.js +1 -1
- package/src/reducers/structureLineageGraph.js +1 -1
- package/src/reducers/structureRedirect.js +1 -1
- package/src/reducers/structuresAliasNameMode.js +1 -1
- package/src/reducers/structuresUploadEvents.js +1 -1
- package/src/reducers/systemId.js +1 -1
- package/src/reducers/userSearchFilters.js +1 -1
- package/src/routines.js +31 -32
- package/src/sagas/__tests__/createGrantApprovalRule.spec.js +1 -1
- package/src/sagas/__tests__/createGrantRequestApproval.spec.js +1 -1
- package/src/sagas/__tests__/createGrantRequestStatus.spec.js +1 -1
- package/src/sagas/__tests__/createGraph.spec.js +5 -5
- package/src/sagas/__tests__/createProfileGroup.spec.js +10 -10
- package/src/sagas/__tests__/deleteGrantApprovalRule.spec.js +1 -1
- package/src/sagas/__tests__/deleteStructureStructureLink.spec.js +1 -1
- package/src/sagas/__tests__/doStructureNoteAction.spec.js +6 -6
- package/src/sagas/__tests__/downloadCsvGraph.spec.js +2 -2
- package/src/sagas/__tests__/fetchGrantFilters.spec.js +1 -1
- package/src/sagas/__tests__/fetchGrantRequestsFilters.spec.js +3 -3
- package/src/sagas/__tests__/fetchProfileExecution.spec.js +3 -3
- package/src/sagas/__tests__/fetchProfileGroup.spec.js +6 -6
- package/src/sagas/__tests__/fetchStructureNotes.spec.js +3 -3
- package/src/sagas/__tests__/fetchStructures.spec.js +2 -2
- package/src/sagas/__tests__/fetchStructuresUploadEvents.spec.js +1 -1
- package/src/sagas/__tests__/fetchSystemStructures.spec.js +4 -4
- package/src/sagas/__tests__/requestGrantRemoval.spec.js +2 -2
- package/src/sagas/__tests__/updateGrantApprovalRule.spec.js +1 -1
- package/src/sagas/__tests__/updateStructure.spec.js +1 -1
- package/src/sagas/__tests__/uploadStructuresDomains.spec.js +3 -3
- package/src/sagas/bulkUpdateStructures.js +1 -1
- package/src/sagas/createGrantApprovalRule.js +1 -1
- package/src/sagas/createGrantRequestApproval.js +1 -1
- package/src/sagas/createGrantRequestStatus.js +2 -2
- package/src/sagas/createGraph.js +3 -3
- package/src/sagas/createProfileGroup.js +1 -1
- package/src/sagas/createSystem.js +2 -2
- package/src/sagas/deleteCatalogViewConfig.js +1 -1
- package/src/sagas/deleteGrantApprovalRule.js +1 -1
- package/src/sagas/deleteStructureStructureLink.js +1 -1
- package/src/sagas/doStructureNoteAction.js +9 -4
- package/src/sagas/downloadCsvGraph.js +2 -2
- package/src/sagas/downloadReferenceDataset.js +1 -1
- package/src/sagas/fetchGrantRequestsFilters.js +1 -1
- package/src/sagas/fetchGraph.js +1 -1
- package/src/sagas/fetchStructuresUploadEvents.js +1 -1
- package/src/sagas/graph/polling.js +4 -4
- package/src/sagas/linkStructureToStructure.js +2 -2
- package/src/sagas/requestGrantRemoval.js +1 -1
- package/src/sagas/updateGrantApprovalRule.js +1 -1
- package/src/sagas/updateStructure.js +1 -1
- package/src/sagas/uploadStructuresDomains.js +2 -2
- package/src/sagas/upsertCatalogViewConfig.js +1 -1
- package/src/selectors/__tests__/getActiveTab.spec.js +99 -28
- package/src/selectors/__tests__/getBusinessConceptsLinksToStructuresColumnsSelector.spec.js +1 -1
- package/src/selectors/__tests__/getGrantRequestsColumns.spec.js +2 -2
- package/src/selectors/__tests__/getGrantRequestsSearchColumns.spec.js +1 -1
- package/src/selectors/__tests__/getGrantsColumns.spec.js +4 -4
- package/src/selectors/__tests__/getParsedEvents.spec.js +1 -1
- package/src/selectors/__tests__/getSortedRelations.spec.js +5 -5
- package/src/selectors/__tests__/getStructureFieldColumns.spec.js +1 -1
- package/src/selectors/__tests__/getStructureRelations.spec.js +1 -1
- package/src/selectors/__tests__/getTabVisibility.spec.js +38 -28
- package/src/selectors/__tests__/messages.spec.js +4 -4
- package/src/selectors/getActiveTab.js +16 -4
- package/src/selectors/getBusinessConceptsLinksToStructuresColumnsSelector.js +1 -1
- package/src/selectors/getGrantAvailableFilters.js +2 -2
- package/src/selectors/getGrantRequestTemplate.js +1 -1
- package/src/selectors/getGrantRequests.js +2 -2
- package/src/selectors/getGrantRequestsColumns.js +6 -6
- package/src/selectors/getGrantRequestsQuery.js +1 -1
- package/src/selectors/getGrantRequestsSearchColumns.js +2 -2
- package/src/selectors/getGrantSelectedFilters.js +1 -1
- package/src/selectors/getGrantsColumns.js +5 -5
- package/src/selectors/getLineageLevels.js +1 -1
- package/src/selectors/getLinkedImplementationsToStructuresColumns.js +1 -1
- package/src/selectors/getRelationSortingCriteria.js +1 -1
- package/src/selectors/getSortedRelations.js +5 -5
- package/src/selectors/getSortedStructureNotes.js +4 -4
- package/src/selectors/getStructureDeletedAt.js +2 -2
- package/src/selectors/getStructureFieldColumns.js +1 -1
- package/src/selectors/getStructureLinks.js +1 -1
- package/src/selectors/getStructureParent.js +2 -2
- package/src/selectors/getStructureProperties.js +1 -1
- package/src/selectors/getStructureRelations.js +4 -4
- package/src/selectors/getStructureSortingCriteria.js +1 -1
- package/src/selectors/getStructureUpdatedAt.js +1 -1
- package/src/selectors/getStructuresFields.js +5 -5
- package/src/selectors/getStructuresUploadEventColumns.js +1 -1
- package/src/selectors/getSystem.js +1 -1
- package/src/selectors/getSystemTemplate.js +1 -1
- package/src/selectors/getTabVisibility.js +2 -2
- package/src/selectors/groupOptionsSelector.js +2 -2
- package/src/selectors/leafClassesSelector.js +1 -1
- package/src/selectors/messages.js +1 -1
- package/src/selectors/metadataViewsSelector.js +6 -6
- package/src/selectors/resourceOptionsSelector.js +2 -2
- package/src/selectors/structureColumnsSelector.js +2 -2
- package/src/selectors/structureNotesColumnsSelector.js +1 -1
- package/src/selectors/templateNamesSelector.js +1 -1
- package/src/selectors/utils/decorators.js +32 -20
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@truedat/dd",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.7.1",
|
|
4
4
|
"description": "Truedat Web Data Dictionary",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"module": "src/index.js",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@testing-library/jest-dom": "^6.6.3",
|
|
52
52
|
"@testing-library/react": "^16.3.0",
|
|
53
53
|
"@testing-library/user-event": "^14.6.1",
|
|
54
|
-
"@truedat/test": "8.
|
|
54
|
+
"@truedat/test": "8.7.1",
|
|
55
55
|
"identity-obj-proxy": "^3.0.0",
|
|
56
56
|
"jest": "^29.7.0",
|
|
57
57
|
"redux-saga-test-plan": "^4.0.6"
|
|
@@ -86,5 +86,5 @@
|
|
|
86
86
|
"svg-pan-zoom": "^3.6.2",
|
|
87
87
|
"swr": "^2.3.3"
|
|
88
88
|
},
|
|
89
|
-
"gitHead": "
|
|
89
|
+
"gitHead": "f7605a6ea3f78839b42bb7d8339eec125ba49acb"
|
|
90
90
|
}
|
|
@@ -44,7 +44,7 @@ export const BucketView = ({
|
|
|
44
44
|
_.path("search"),
|
|
45
45
|
(search) => new URLSearchParams(search).entries(),
|
|
46
46
|
(entries) => Object.fromEntries(entries),
|
|
47
|
-
_.pick(["propertyPath", "propertyValue"])
|
|
47
|
+
_.pick(["propertyPath", "propertyValue"]),
|
|
48
48
|
);
|
|
49
49
|
|
|
50
50
|
useEffect(() => {
|
|
@@ -54,7 +54,7 @@ export const BucketView = ({
|
|
|
54
54
|
_.values,
|
|
55
55
|
(keyValue) => Object.fromEntries(new Map([keyValue]).entries()),
|
|
56
56
|
(filter) => ({ view: "BUCKET_VIEW", filter }),
|
|
57
|
-
saveNavFilter
|
|
57
|
+
saveNavFilter,
|
|
58
58
|
)(location);
|
|
59
59
|
}, [location, saveNavFilter]);
|
|
60
60
|
|
|
@@ -16,7 +16,7 @@ const moveMissingBucketToTheEnd = (buckets) =>
|
|
|
16
16
|
const orderBuckets = (buckets) =>
|
|
17
17
|
_.flow(
|
|
18
18
|
_.orderBy([({ key }) => key.toLowerCase()], ["asc"]),
|
|
19
|
-
moveMissingBucketToTheEnd
|
|
19
|
+
moveMissingBucketToTheEnd,
|
|
20
20
|
)(buckets);
|
|
21
21
|
|
|
22
22
|
export default function CatalogCustomViewCards() {
|
|
@@ -18,6 +18,8 @@ import {
|
|
|
18
18
|
} from "@truedat/core/routes";
|
|
19
19
|
import { ProtectedRoute } from "@truedat/core/router";
|
|
20
20
|
import SystemsLoader from "@truedat/core/components/SystemsLoader";
|
|
21
|
+
import UploadJobs from "@truedat/core/components/UploadJobs";
|
|
22
|
+
import UploadJob from "@truedat/core/components/UploadJob";
|
|
21
23
|
import CatalogViewConfigs from "./CatalogViewConfigs";
|
|
22
24
|
import PendingStructureNotes from "./PendingStructureNotes";
|
|
23
25
|
import ProfileExecution from "./ProfileExecution";
|
|
@@ -39,11 +41,9 @@ import {
|
|
|
39
41
|
} from "./CatalogViewConfigForm";
|
|
40
42
|
import StructuresView from "./StructuresView";
|
|
41
43
|
import BucketView from "./BucketView";
|
|
42
|
-
import UploadJobs from "@truedat/core/components/UploadJobs";
|
|
43
|
-
import UploadJob from "@truedat/core/components/UploadJob";
|
|
44
44
|
|
|
45
45
|
const TemplatesLoader = React.lazy(
|
|
46
|
-
() => import("@truedat/core/components/TemplatesLoader")
|
|
46
|
+
() => import("@truedat/core/components/TemplatesLoader"),
|
|
47
47
|
);
|
|
48
48
|
|
|
49
49
|
export default function DictionaryRoutes() {
|
|
@@ -23,7 +23,7 @@ export const FilteredNav = ({
|
|
|
23
23
|
totalStructures,
|
|
24
24
|
}) => {
|
|
25
25
|
const hasOriginalName = _.some((structure) =>
|
|
26
|
-
_.has("original_name")(structure)
|
|
26
|
+
_.has("original_name")(structure),
|
|
27
27
|
)(childStructures);
|
|
28
28
|
const { formatMessage } = useIntl();
|
|
29
29
|
|
|
@@ -109,7 +109,7 @@ export const FilteredNavLoader = ({
|
|
|
109
109
|
(ancestryDsIds) => [...ancestryDsIds, dsid],
|
|
110
110
|
(idPath) => _.get(idPath, bucketPaths?.forest),
|
|
111
111
|
_.keys,
|
|
112
|
-
(keys) => keys || []
|
|
112
|
+
(keys) => keys || [],
|
|
113
113
|
)(ancestry)
|
|
114
114
|
: _.keys(bucketPaths?.forest);
|
|
115
115
|
|
|
@@ -154,7 +154,7 @@ export const FilteredNavLoader = ({
|
|
|
154
154
|
const fnHasCatalogViewProp = (structure) =>
|
|
155
155
|
navFilter?.view === "BUCKET_VIEW"
|
|
156
156
|
? bucketPaths?.filtered_children[parentOrCurrentId]?.includes(
|
|
157
|
-
structure?.id
|
|
157
|
+
structure?.id,
|
|
158
158
|
) || false
|
|
159
159
|
: undefined;
|
|
160
160
|
|
package/src/components/Grant.js
CHANGED
|
@@ -13,7 +13,7 @@ import GrantRemoval from "./GrantRemoval";
|
|
|
13
13
|
import GrantChangeRequest from "./GrantChangeRequest";
|
|
14
14
|
|
|
15
15
|
const DynamicFieldValue = lazy(
|
|
16
|
-
() => import("@truedat/df/components/DynamicFieldValue")
|
|
16
|
+
() => import("@truedat/df/components/DynamicFieldValue"),
|
|
17
17
|
);
|
|
18
18
|
|
|
19
19
|
const GrantView = () => {
|
|
@@ -115,7 +115,7 @@ export const Grant = ({ grant, actions, loading, onStatusChange }) => {
|
|
|
115
115
|
|
|
116
116
|
const data_structure_version = _.pathOr(
|
|
117
117
|
undefined,
|
|
118
|
-
"data_structure_version"
|
|
118
|
+
"data_structure_version",
|
|
119
119
|
)(grant);
|
|
120
120
|
const data_structure = _.pathOr(undefined, "data_structure")(grant);
|
|
121
121
|
|
|
@@ -127,7 +127,7 @@ export const Grant = ({ grant, actions, loading, onStatusChange }) => {
|
|
|
127
127
|
const path = _.flow(
|
|
128
128
|
_.map("name"),
|
|
129
129
|
(names) => [...names, data_structure_version?.name],
|
|
130
|
-
_.join(" › ")
|
|
130
|
+
_.join(" › "),
|
|
131
131
|
)(data_structure_version?.path);
|
|
132
132
|
|
|
133
133
|
return (
|
|
@@ -240,7 +240,7 @@ export const Grant = ({ grant, actions, loading, onStatusChange }) => {
|
|
|
240
240
|
label={field}
|
|
241
241
|
value={{ value, origin: "user" }}
|
|
242
242
|
/>
|
|
243
|
-
)
|
|
243
|
+
),
|
|
244
244
|
)}
|
|
245
245
|
</List>
|
|
246
246
|
</List.Description>
|
|
@@ -125,7 +125,7 @@ export const GrantApprovalRule = () => {
|
|
|
125
125
|
<Table.Body>
|
|
126
126
|
{_.getOr(
|
|
127
127
|
[],
|
|
128
|
-
"conditions"
|
|
128
|
+
"conditions",
|
|
129
129
|
)(approvalRule).map(({ field, operator, values }, key) => {
|
|
130
130
|
const fields = field.match(/(\w+)\.(.*)/);
|
|
131
131
|
const fieldPrefix = fields ? fields[1] : null;
|
|
@@ -102,7 +102,7 @@ export default function GrantApprovalRuleConditions({
|
|
|
102
102
|
allowAdditions
|
|
103
103
|
value={condition.values || []}
|
|
104
104
|
options={_.map((value) => ({ text: value, value }))(
|
|
105
|
-
condition.values || []
|
|
105
|
+
condition.values || [],
|
|
106
106
|
)}
|
|
107
107
|
onChange={(_e, { value, name }) =>
|
|
108
108
|
handleChange(key, name, value)
|
|
@@ -30,7 +30,7 @@ export default function GrantApprovalRuleForm({ onSubmit, approvalRule }) {
|
|
|
30
30
|
const fieldPrefix = fields ? fields[1] : null;
|
|
31
31
|
const fieldName = fields ? fields[2] : field;
|
|
32
32
|
return { fieldPrefix, fieldName, operator, values };
|
|
33
|
-
})
|
|
33
|
+
}),
|
|
34
34
|
)(approvalRule),
|
|
35
35
|
domainId: _.path("domainIds[0]")(approvalRule),
|
|
36
36
|
}
|
|
@@ -55,7 +55,7 @@ export default function GrantApprovalRuleForm({ onSubmit, approvalRule }) {
|
|
|
55
55
|
? null
|
|
56
56
|
: _.flow(
|
|
57
57
|
_.get("currentRoles"),
|
|
58
|
-
_.map((role) => ({ key: role, value: role, text: role }))
|
|
58
|
+
_.map((role) => ({ key: role, value: role, text: role })),
|
|
59
59
|
)(rolesData);
|
|
60
60
|
|
|
61
61
|
const doHandleSubmit = handleSubmit((data) => {
|
|
@@ -66,12 +66,12 @@ export default function GrantApprovalRuleForm({ onSubmit, approvalRule }) {
|
|
|
66
66
|
field: [fieldPrefix, fieldName].join("."),
|
|
67
67
|
operator,
|
|
68
68
|
values,
|
|
69
|
-
}))
|
|
69
|
+
})),
|
|
70
70
|
)(data);
|
|
71
71
|
const approvalRule = _.flow(
|
|
72
72
|
_.omit(["domainId"]),
|
|
73
73
|
_.set("domainIds", [domainId]),
|
|
74
|
-
_.set("conditions", conditions)
|
|
74
|
+
_.set("conditions", conditions),
|
|
75
75
|
)(data);
|
|
76
76
|
onSubmit({ approvalRule });
|
|
77
77
|
});
|
|
@@ -86,8 +86,8 @@ export default function GrantApprovalRuleForm({ onSubmit, approvalRule }) {
|
|
|
86
86
|
_.every(
|
|
87
87
|
(field) =>
|
|
88
88
|
!_.isNil(_.get(field)(condition)) &&
|
|
89
|
-
!_.isEmpty(_.get(field)(condition))
|
|
90
|
-
)(["fieldPrefix", "fieldName", "operator", "values"])
|
|
89
|
+
!_.isEmpty(_.get(field)(condition)),
|
|
90
|
+
)(["fieldPrefix", "fieldName", "operator", "values"]),
|
|
91
91
|
)(value);
|
|
92
92
|
|
|
93
93
|
return (
|
|
@@ -17,7 +17,7 @@ export const GrantRemovalWorkflow = ({
|
|
|
17
17
|
const navigate = useNavigate();
|
|
18
18
|
const { formatMessage } = useIntl();
|
|
19
19
|
const [latestGrantRequest, setLatestGrantRequest] = useState(
|
|
20
|
-
latestGrantRequestProp
|
|
20
|
+
latestGrantRequestProp,
|
|
21
21
|
);
|
|
22
22
|
const grantRequestStatus = _.prop("status.status")(latestGrantRequest);
|
|
23
23
|
const { trigger: createGrantRequestGroupTrigger } = useGrantRequestGroup();
|
|
@@ -85,7 +85,7 @@ export const GrantRemovalWorkflowLoader = (props) => {
|
|
|
85
85
|
fetchPolicy: "cache-and-network",
|
|
86
86
|
skip: props?.actions?.hasOwnProperty("manage_grant_removal"),
|
|
87
87
|
variables: { id: props.grant.id, requestType: "GRANT_REMOVAL" },
|
|
88
|
-
}
|
|
88
|
+
},
|
|
89
89
|
);
|
|
90
90
|
if (error) return null;
|
|
91
91
|
if (loading) return <Loader />;
|
|
@@ -102,7 +102,7 @@ export const GrantRemovalWorkflowDropdown = ({
|
|
|
102
102
|
<Header as="h6">{formatMessage({ id: stateProps.header })}</Header>
|
|
103
103
|
) : null}
|
|
104
104
|
{!["workflowBypassedActive", "workflowBypassedPendingRemoval"].includes(
|
|
105
|
-
currentState
|
|
105
|
+
currentState,
|
|
106
106
|
) && latestGrantRequest
|
|
107
107
|
? grantRequestDetails
|
|
108
108
|
: null}
|
|
@@ -12,11 +12,11 @@ import GrantRequestHeader from "./GrantRequestHeader";
|
|
|
12
12
|
import GrantRequestSummary from "./GrantRequestSummary";
|
|
13
13
|
|
|
14
14
|
const DynamicFormViewer = lazy(
|
|
15
|
-
() => import("@truedat/df/components/DynamicFormViewer")
|
|
15
|
+
() => import("@truedat/df/components/DynamicFormViewer"),
|
|
16
16
|
);
|
|
17
17
|
|
|
18
18
|
const ConditionSummary = lazy(
|
|
19
|
-
() => import("@truedat/dq/components/ConditionSummary")
|
|
19
|
+
() => import("@truedat/dq/components/ConditionSummary"),
|
|
20
20
|
);
|
|
21
21
|
|
|
22
22
|
export const GrantRequest = ({ grantRequest, template }) => {
|
|
@@ -26,7 +26,7 @@ export const GrantRequest = ({ grantRequest, template }) => {
|
|
|
26
26
|
const path = _.flow(
|
|
27
27
|
_.map("name"),
|
|
28
28
|
(names) => [...names, data_structure?.name],
|
|
29
|
-
_.join(" › ")
|
|
29
|
+
_.join(" › "),
|
|
30
30
|
)(data_structure?.path);
|
|
31
31
|
const rows = grantRequest?.filters?.rows;
|
|
32
32
|
const user = grantRequest?._embedded?.group?._embedded?.user?.user_name;
|
|
@@ -25,7 +25,7 @@ export const GrantRequestApprovalForm = ({
|
|
|
25
25
|
|
|
26
26
|
const dropdownOptions = _.flow(
|
|
27
27
|
_.get("pending_roles"),
|
|
28
|
-
_.map((role) => ({ key: role, value: role, text: role }))
|
|
28
|
+
_.map((role) => ({ key: role, value: role, text: role })),
|
|
29
29
|
)(grantRequest);
|
|
30
30
|
|
|
31
31
|
const onSubmit = (formValues) => {
|
|
@@ -127,5 +127,5 @@ export const mapStateToProps = (state) => ({
|
|
|
127
127
|
});
|
|
128
128
|
|
|
129
129
|
export default connect(mapStateToProps, { createGrantRequestApproval })(
|
|
130
|
-
GrantRequestApprovalForm
|
|
130
|
+
GrantRequestApprovalForm,
|
|
131
131
|
);
|
|
@@ -65,7 +65,7 @@ export const GrantRequestBulkActions = ({
|
|
|
65
65
|
: {
|
|
66
66
|
...payload,
|
|
67
67
|
must: { id: selectedGrantRequests },
|
|
68
|
-
}
|
|
68
|
+
},
|
|
69
69
|
).then((data) => {
|
|
70
70
|
navigate(GRANT_REQUESTS_APPROVALS_RESULT, {
|
|
71
71
|
state: _.prop("data.data")(data),
|
|
@@ -75,7 +75,7 @@ export const GrantRequestBulkActions = ({
|
|
|
75
75
|
|
|
76
76
|
const roleOptions = _.flow(
|
|
77
77
|
_.sortBy(_.identity),
|
|
78
|
-
_.map((role) => ({ key: role, value: role, text: role }))
|
|
78
|
+
_.map((role) => ({ key: role, value: role, text: role })),
|
|
79
79
|
)(rolesPermission);
|
|
80
80
|
|
|
81
81
|
return (
|
|
@@ -11,7 +11,7 @@ export const GrantRequestBulkRoleSelector = ({
|
|
|
11
11
|
const { formatMessage } = useIntl();
|
|
12
12
|
const options = _.flow(
|
|
13
13
|
_.sortBy(_.identity),
|
|
14
|
-
_.map((role) => ({ key: role, value: role, text: role }))
|
|
14
|
+
_.map((role) => ({ key: role, value: role, text: role })),
|
|
15
15
|
)(roles);
|
|
16
16
|
|
|
17
17
|
return (
|
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
import _ from "lodash/fp";
|
|
2
2
|
import { useIntl, FormattedMessage } from "react-intl";
|
|
3
3
|
import { Link, useParams } from "react-router";
|
|
4
|
-
import {
|
|
4
|
+
import {
|
|
5
|
+
Message,
|
|
6
|
+
List,
|
|
7
|
+
Header,
|
|
8
|
+
Segment,
|
|
9
|
+
Button,
|
|
10
|
+
Loader,
|
|
11
|
+
} from "semantic-ui-react";
|
|
5
12
|
import { linkTo } from "@truedat/core/routes";
|
|
6
13
|
import { MY_GRANT_REQUESTS } from "@truedat/core/routes";
|
|
7
14
|
import { useGrantRequestGroupsByIds } from "../hooks/useGrantRequestGroupsByIds";
|
|
@@ -58,7 +65,10 @@ export const GrantRequestCartResult = () => {
|
|
|
58
65
|
<Segment>
|
|
59
66
|
<Message negative>
|
|
60
67
|
<Message.Header>
|
|
61
|
-
<FormattedMessage
|
|
68
|
+
<FormattedMessage
|
|
69
|
+
id="grantRequest.cart.result.error"
|
|
70
|
+
defaultMessage="Error loading results"
|
|
71
|
+
/>
|
|
62
72
|
</Message.Header>
|
|
63
73
|
<Button as={Link} to={MY_GRANT_REQUESTS}>
|
|
64
74
|
<FormattedMessage id="grantRequest.cart.result.viewMyRequests" />
|
|
@@ -87,7 +97,7 @@ export const GrantRequestCartResult = () => {
|
|
|
87
97
|
group.type ||
|
|
88
98
|
formatMessage(
|
|
89
99
|
{ id: "grantRequest.cart.result.itemDefault" },
|
|
90
|
-
{ id: group.id }
|
|
100
|
+
{ id: group.id },
|
|
91
101
|
);
|
|
92
102
|
const href = linkTo.GRANT_REQUEST_GROUP({ id: group.id });
|
|
93
103
|
const structures = getStructuresFromGroup(group);
|
|
@@ -38,10 +38,10 @@ export const GrantRequests = ({
|
|
|
38
38
|
<Table.Body>
|
|
39
39
|
{grantRequests.map((grantRequest, i) => {
|
|
40
40
|
const createdById = _.path("_embedded.group.created_by_id")(
|
|
41
|
-
grantRequest
|
|
41
|
+
grantRequest,
|
|
42
42
|
);
|
|
43
43
|
const userId = _.path("_embedded.group._embedded.user.id")(
|
|
44
|
-
grantRequest
|
|
44
|
+
grantRequest,
|
|
45
45
|
);
|
|
46
46
|
return (
|
|
47
47
|
<Table.Row key={i} warning={createdById !== userId}>
|
|
@@ -58,30 +58,30 @@ export const GrantRequestsSearchResults = () => {
|
|
|
58
58
|
const ids = _.map(_.prop("id"))(grantRequests);
|
|
59
59
|
checkedAll
|
|
60
60
|
? setSelectedGrantRequests(
|
|
61
|
-
_.flow(_.concat(ids), _.uniq)(selectedGrantRequests)
|
|
61
|
+
_.flow(_.concat(ids), _.uniq)(selectedGrantRequests),
|
|
62
62
|
)
|
|
63
63
|
: setSelectedGrantRequests(
|
|
64
64
|
_.flow(
|
|
65
65
|
_.difference(selectedGrantRequests),
|
|
66
|
-
_.uniq
|
|
67
|
-
)(selectedGrantRequests)
|
|
66
|
+
_.uniq,
|
|
67
|
+
)(selectedGrantRequests),
|
|
68
68
|
);
|
|
69
69
|
};
|
|
70
70
|
|
|
71
71
|
const checkRow = (grantRequest) => {
|
|
72
72
|
const id = _.prop("id")(grantRequest);
|
|
73
73
|
const exists = _.some((selectedId) => _.eq(id, selectedId))(
|
|
74
|
-
selectedGrantRequests
|
|
74
|
+
selectedGrantRequests,
|
|
75
75
|
);
|
|
76
76
|
exists
|
|
77
77
|
? setSelectedGrantRequests(
|
|
78
78
|
_.flow(
|
|
79
79
|
_.remove((selectedId) => _.eq(id, selectedId)),
|
|
80
|
-
_.uniq()
|
|
81
|
-
)(selectedGrantRequests)
|
|
80
|
+
_.uniq(),
|
|
81
|
+
)(selectedGrantRequests),
|
|
82
82
|
)
|
|
83
83
|
: setSelectedGrantRequests(
|
|
84
|
-
_.flow(_.concat(id), _.uniq)(selectedGrantRequests)
|
|
84
|
+
_.flow(_.concat(id), _.uniq)(selectedGrantRequests),
|
|
85
85
|
);
|
|
86
86
|
};
|
|
87
87
|
|
|
@@ -29,7 +29,7 @@ import GrantRequestCartResult from "./GrantRequestCartResult";
|
|
|
29
29
|
import StructuresGrantRequestView from "./StructuresGrantRequestView";
|
|
30
30
|
|
|
31
31
|
const TemplatesLoader = lazy(
|
|
32
|
-
() => import("@truedat/core/components/TemplatesLoader")
|
|
32
|
+
() => import("@truedat/core/components/TemplatesLoader"),
|
|
33
33
|
);
|
|
34
34
|
|
|
35
35
|
const GrantRequestGroup = () => {
|
|
@@ -64,14 +64,8 @@ export const GrantRoutes = ({ grantRequestLoaded }) => {
|
|
|
64
64
|
element={<GrantRequestCartResult />}
|
|
65
65
|
/>
|
|
66
66
|
<Route path="/grants/:id" element={<GrantView />} />
|
|
67
|
-
<Route
|
|
68
|
-
|
|
69
|
-
element={<Grants />}
|
|
70
|
-
/>
|
|
71
|
-
<Route
|
|
72
|
-
path="/myGrants"
|
|
73
|
-
element={<Grants onlyMyGrants />}
|
|
74
|
-
/>
|
|
67
|
+
<Route path="/grants" element={<Grants />} />
|
|
68
|
+
<Route path="/myGrants" element={<Grants onlyMyGrants />} />
|
|
75
69
|
<Route
|
|
76
70
|
path="/myGrantRequests"
|
|
77
71
|
element={
|
package/src/components/Grants.js
CHANGED
|
@@ -4,12 +4,12 @@ import { Header, Icon, Segment, Dimmer, Loader } from "semantic-ui-react";
|
|
|
4
4
|
import { FormattedMessage, useIntl } from "react-intl";
|
|
5
5
|
import { SearchContextProvider } from "@truedat/core/search/SearchContext";
|
|
6
6
|
import SearchWidget from "@truedat/core/search/SearchWidget";
|
|
7
|
+
import { useSearchContext } from "@truedat/core/search/SearchContext";
|
|
7
8
|
import { useGrantFilters, useGrantSearch } from "../hooks/useGrant";
|
|
8
9
|
import GrantsTable from "./GrantsTable";
|
|
9
10
|
import GrantsLabelResults from "./GrantsLabelResults";
|
|
10
11
|
import GrantsDownloadButton from "./GrantsDownloadButton";
|
|
11
12
|
import GrantsPagination from "./GrantsPagination";
|
|
12
|
-
import { useSearchContext } from "@truedat/core/search/SearchContext";
|
|
13
13
|
|
|
14
14
|
export const Grants = ({ onlyMyGrants }) => {
|
|
15
15
|
const { formatMessage } = useIntl();
|
|
@@ -44,7 +44,11 @@ export const Grants = ({ onlyMyGrants }) => {
|
|
|
44
44
|
hasFilterApplied
|
|
45
45
|
setDownloading={setDownloading}
|
|
46
46
|
/>
|
|
47
|
-
<SearchWidget
|
|
47
|
+
<SearchWidget
|
|
48
|
+
dateFilter
|
|
49
|
+
searchField={"start_date,end_date"}
|
|
50
|
+
isGrantDateRange
|
|
51
|
+
/>
|
|
48
52
|
<Dimmer.Dimmable dimmed={grantsLoading}>
|
|
49
53
|
{grantsLoading ? (
|
|
50
54
|
<Dimmer active inverted>
|
|
@@ -53,7 +57,10 @@ export const Grants = ({ onlyMyGrants }) => {
|
|
|
53
57
|
) : null}
|
|
54
58
|
</Dimmer.Dimmable>
|
|
55
59
|
<GrantsLabelResults />
|
|
56
|
-
<GrantsTable
|
|
60
|
+
<GrantsTable
|
|
61
|
+
onlyMyGrants={onlyMyGrants}
|
|
62
|
+
setDownloading={setDownloading}
|
|
63
|
+
/>
|
|
57
64
|
<GrantsPagination />
|
|
58
65
|
</Segment>
|
|
59
66
|
</Segment>
|
|
@@ -80,7 +87,10 @@ export const GrantsWrapper = ({ onlyMyGrants }) => {
|
|
|
80
87
|
};
|
|
81
88
|
|
|
82
89
|
return (
|
|
83
|
-
<SearchContextProvider
|
|
90
|
+
<SearchContextProvider
|
|
91
|
+
key={onlyMyGrants ? "myGrants" : "allGrants"}
|
|
92
|
+
{...searchProps}
|
|
93
|
+
>
|
|
84
94
|
<Grants onlyMyGrants={onlyMyGrants} />
|
|
85
95
|
</SearchContextProvider>
|
|
86
96
|
);
|
|
@@ -2,11 +2,8 @@ import { FormattedMessage } from "react-intl";
|
|
|
2
2
|
import { Label } from "semantic-ui-react";
|
|
3
3
|
import { useSearchContext } from "@truedat/core/search/SearchContext";
|
|
4
4
|
|
|
5
|
-
export const GrantsLabelResults = (
|
|
6
|
-
const {
|
|
7
|
-
loading: grantsLoading,
|
|
8
|
-
count: grantCount,
|
|
9
|
-
} = useSearchContext();
|
|
5
|
+
export const GrantsLabelResults = () => {
|
|
6
|
+
const { loading: grantsLoading, count: grantCount } = useSearchContext();
|
|
10
7
|
|
|
11
8
|
return (
|
|
12
9
|
<Label className="grants-label-results">
|
|
@@ -32,7 +32,7 @@ const makeMapStateToProps = () => {
|
|
|
32
32
|
const searchQuerySelector = makeSearchQuerySelector(
|
|
33
33
|
"grantQuery",
|
|
34
34
|
"grantActiveFilters",
|
|
35
|
-
"grantDateFilter"
|
|
35
|
+
"grantDateFilter",
|
|
36
36
|
);
|
|
37
37
|
const mapStateToProps = (state, props) => {
|
|
38
38
|
return {
|
|
@@ -43,5 +43,5 @@ const makeMapStateToProps = () => {
|
|
|
43
43
|
};
|
|
44
44
|
|
|
45
45
|
export default connect(makeMapStateToProps, { clearGrants, fetchGrants })(
|
|
46
|
-
GrantsLoader
|
|
46
|
+
GrantsLoader,
|
|
47
47
|
);
|
|
@@ -12,10 +12,7 @@ import { useGrantDownload } from "../hooks/useGrant";
|
|
|
12
12
|
import { getGrantsTableColumns } from "../selectors";
|
|
13
13
|
import { sortGrants } from "../routines";
|
|
14
14
|
|
|
15
|
-
export const GrantsTable = ({
|
|
16
|
-
columns,
|
|
17
|
-
setDownloading,
|
|
18
|
-
}) => {
|
|
15
|
+
export const GrantsTable = ({ columns, setDownloading }) => {
|
|
19
16
|
const { formatMessage } = useIntl();
|
|
20
17
|
const navigate = useNavigate();
|
|
21
18
|
|
|
@@ -27,8 +24,7 @@ export const GrantsTable = ({
|
|
|
27
24
|
handleSortSelection,
|
|
28
25
|
} = useSearchContext();
|
|
29
26
|
|
|
30
|
-
const { isMutating: grantsDownloading } =
|
|
31
|
-
useGrantDownload();
|
|
27
|
+
const { isMutating: grantsDownloading } = useGrantDownload();
|
|
32
28
|
|
|
33
29
|
useEffect(() => {
|
|
34
30
|
setDownloading(grantsDownloading);
|
|
@@ -37,10 +33,9 @@ export const GrantsTable = ({
|
|
|
37
33
|
const grants = searchData?.data;
|
|
38
34
|
|
|
39
35
|
const filteredColumns = _.filter((c) => _.any(_.prop(c.name))(grants))(
|
|
40
|
-
columns
|
|
36
|
+
columns,
|
|
41
37
|
);
|
|
42
38
|
|
|
43
|
-
|
|
44
39
|
return (
|
|
45
40
|
<>
|
|
46
41
|
{!_.isEmpty(grants) && (
|
|
@@ -24,7 +24,7 @@ export const LineageDownloadButton = ({
|
|
|
24
24
|
const { formatMessage } = useIntl();
|
|
25
25
|
const headerLabels = _.flow(
|
|
26
26
|
_.map((l) => [l, formatMessage({ id: `graph.header.${l}` })]),
|
|
27
|
-
_.fromPairs
|
|
27
|
+
_.fromPairs,
|
|
28
28
|
)(staticLabels);
|
|
29
29
|
const messagePopup = _.negate(_.isEmpty)(graph)
|
|
30
30
|
? formatMessage({ id: "graph.actions.download.tooltip" })
|
|
@@ -66,5 +66,5 @@ const mapStateToProps = (state, ownProps) => ({
|
|
|
66
66
|
});
|
|
67
67
|
|
|
68
68
|
export default connect(mapStateToProps, { downloadCsvGraph })(
|
|
69
|
-
LineageDownloadButton
|
|
69
|
+
LineageDownloadButton,
|
|
70
70
|
);
|