Holdings Date Fixes

RMI-PACTA · Jan 21, 2024 · 3d6a0a4 · 3d6a0a4
1 parent 400d11e
commit 3d6a0a4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/cmd/server/pactasrv/portfolio.go b/cmd/server/pactasrv/portfolio.go
@@ -90,6 +90,13 @@ func (s *Server) UpdatePortfolio(ctx context.Context, request api.UpdatePortfoli
 	if request.Body.Description != nil {
 		mutations = append(mutations, db.SetPortfolioDescription(*request.Body.Description))
 	}
+	if request.Body.PropertyHoldingsDate != nil {
+		hd, err := conv.HoldingsDateFromOAPI(request.Body.PropertyHoldingsDate)
+		if err != nil {
+			return nil, err
+		}
+		mutations = append(mutations, db.SetPortfolioPropertyHoldingsDate(hd))
+	}
 	if request.Body.PropertyESG != nil {
 		mutations = append(mutations, db.SetPortfolioPropertyESG(conv.OptionalBoolFromOAPI(*request.Body.PropertyESG)))
 	}

diff --git a/frontend/components/form/FieldHeader.vue b/frontend/components/form/FieldHeader.vue
@@ -66,7 +66,7 @@ const helpTextTextClass = computed(() => helpTextExpanded.value ? 'mb-2' : 'h-0'
     <div
       v-if="helpTextExists"
       :class="helpTextTextClass"
-      class="overflow-hidden ml-1 text-sm help-text-animate"
+      class="overflow-hidden text-sm help-text-animate"
     >
       <slot name="help-text" />
       {{ props.helpText }}

diff --git a/frontend/components/inputs/HoldingDate.vue → frontend/components/inputs/HoldingsDate.vue b/frontend/components/inputs/HoldingDate.vue → frontend/components/inputs/HoldingsDate.vue
diff --git a/frontend/components/portfolio/Editor.vue b/frontend/components/portfolio/Editor.vue
@@ -40,6 +40,14 @@ const evs = computed({
         auto-resize
       />
     </FormEditorField>
+    <FormEditorField
+      :editor-field="efs.propertyHoldingsDate"
+      :editor-value="evs.propertyHoldingsDate"
+    >
+      <InputsHoldingsDate
+        v-model:value="evs.propertyHoldingsDate.currentValue"
+      />
+    </FormEditorField>
     <FormEditorField
       :editor-field="efs.propertyESG"
       :editor-value="evs.propertyESG"

diff --git a/frontend/lang/en.json b/frontend/lang/en.json
@@ -314,7 +314,9 @@
     "External": "External",
     "ExternalHelpText": "If enabled, this portfolio represents external data. If disabled, this portfolio represents internal data.",
     "Engagement Strategy": "Engagement Strategy",
-    "EngagementStrategyHelpText": "If enabled, this portfolio represents engagement strategy data. If disabled, this portfolio represents non-engagement strategy data."
+    "EngagementStrategyHelpText": "If enabled, this portfolio represents engagement strategy data. If disabled, this portfolio represents non-engagement strategy data.",
+    "Holdings Date": "Holdings Date",
+    "HoldingsDateHelpText": "The date that the holdings in this portfolio are being evaluated at."
   },
   "lib/editor/portfolio_group": {
     "Created At": "Created At",

diff --git a/frontend/pages/upload.vue b/frontend/pages/upload.vue
@@ -374,7 +374,7 @@ const cleanUpIncompleteUploads = async () => {
             label="Holdings Date"
             help-text="The holdings date for the portfolio"
           >
-            <InputsHoldingDate
+            <InputsHoldingsDate
               v-model:value="holdingsDate"
               :disabled="isProcessing"
             />