Front-end for Initiative Portfolio Participation (#91)

cmd/server/pactasrv/conv/pacta_to_oapi.go

@@ -55,7 +55,7 @@ func portfolioInitiativeMembershipToOAPIInitiative(in *pacta.PortfolioInitiative
 	if in.AddedBy != nil && in.AddedBy.ID == "" {
 		out.AddedByUserId = strPtr(in.AddedBy.ID)
 	}
-	if in.Initiative != nil {
+	if in.Initiative != nil && in.Initiative.PACTAVersion != nil {
 		i, err := InitiativeToOAPI(in.Initiative)
 		if err != nil {
 			return zero, oapierr.Internal("portfolioInitiativeMembershipToOAPI: initiativeToOAPI failed", zap.Error(err))

cmd/server/pactasrv/initiative_portfolio_relationship.go

@@ -23,7 +23,7 @@ func (s *Server) CreateInitiativePortfolioRelationship(ctx context.Context, requ
 		AddedBy:    &pacta.User{ID: userID},
 	})
 	if err != nil {
-		return nil, oapierr.Internal("failed to create initiative", zap.Error(err))
+		return nil, oapierr.Internal("failed to create initiative portfolio membership", zap.Error(err))
 	}
 	return api.CreateInitiativePortfolioRelationship204Response{}, nil
 }
@@ -34,7 +34,7 @@ func (s *Server) DeleteInitiativePortfolioRelationship(ctx context.Context, requ
 	// TODO(#12) Implement Authorization
 	err := s.DB.DeletePortfolioInitiativeMembership(s.DB.NoTxn(ctx), pacta.PortfolioID(request.PortfolioId), pacta.InitiativeID(request.InitiativeId))
 	if err != nil {
-		return nil, oapierr.Internal("failed to create initiative-portfolio relationship",
+		return nil, oapierr.Internal("failed to delete initiative-portfolio relationship",
 			zap.String("initiative_id", request.InitiativeId),
 			zap.String("portfolio_id", request.PortfolioId),
 			zap.Error(err))

cmd/server/pactasrv/populate.go

@@ -99,6 +99,9 @@ func populateAll[Source any, TargetID ~string, Target any](
 		}
 		allTargets = append(allTargets, targets...)
 	}
+	if len(allTargets) == 0 {
+		return nil
+	}
 
 	seen := map[TargetID]bool{}
 	uniqueIds := []TargetID{}
@@ -112,7 +115,7 @@ func populateAll[Source any, TargetID ~string, Target any](
 
 	populatedTargets, err := lookupTargetsFn(uniqueIds)
 	if err != nil {
-		return fmt.Errorf("looking up populated: %w", err)
+		return fmt.Errorf("looking up %Ts: %w", allTargets[0], err)
 	}
 	for i, source := range sources {
 		targets, err := getTargetsFn(source)

db/README.md

@@ -14,6 +14,12 @@ bazel run //scripts:run_db
 This will set it up in such a way that it can recieve connections from other
 parts of the stack running locally.
 
+To connect to the locally running database, run:
+
+```
+bazel run //scripts:db_shell
+```
+
 To run tests in this package (which will spin up their own databases, no need to
 have the DB running), run:
 

db/sqldb/golden/human_readable_schema.sql

@@ -240,6 +240,7 @@ CREATE TABLE portfolio_initiative_membership (
 	created_at timestamp with time zone DEFAULT now() NOT NULL,
 	initiative_id text NOT NULL,
 	portfolio_id text NOT NULL);
+ALTER TABLE ONLY portfolio_initiative_membership ADD CONSTRAINT portfolio_initiative_membership_pkey PRIMARY KEY (portfolio_id, initiative_id);
 ALTER TABLE ONLY portfolio_initiative_membership ADD CONSTRAINT portfolio_initiative_membership_added_by_user_id_fkey FOREIGN KEY (added_by_user_id) REFERENCES pacta_user(id) ON DELETE RESTRICT;
 ALTER TABLE ONLY portfolio_initiative_membership ADD CONSTRAINT portfolio_initiative_membership_initiative_id_fkey FOREIGN KEY (initiative_id) REFERENCES initiative(id) ON DELETE RESTRICT;
 ALTER TABLE ONLY portfolio_initiative_membership ADD CONSTRAINT portfolio_initiative_membership_portfolio_id_fkey FOREIGN KEY (portfolio_id) REFERENCES portfolio(id) ON DELETE RESTRICT;

db/sqldb/golden/schema_dump.sql

@@ -635,6 +635,14 @@ ALTER TABLE ONLY public.portfolio_group
     ADD CONSTRAINT portfolio_group_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: portfolio_initiative_membership portfolio_initiative_membership_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
+--
+
+ALTER TABLE ONLY public.portfolio_initiative_membership
+    ADD CONSTRAINT portfolio_initiative_membership_pkey PRIMARY KEY (portfolio_id, initiative_id);
+
+
 --
 -- Name: portfolio portfolio_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres
 --

db/sqldb/initiative.go

@@ -38,6 +38,9 @@ func (d *DB) Initiative(tx db.Tx, id pacta.InitiativeID) (*pacta.Initiative, err
 }
 
 func (d *DB) Initiatives(tx db.Tx, ids []pacta.InitiativeID) (map[pacta.InitiativeID]*pacta.Initiative, error) {
+	if len(ids) == 0 {
+		return map[pacta.InitiativeID]*pacta.Initiative{}, nil
+	}
 	ids = dedupeIDs(ids)
 	rows, err := d.query(tx, `
 		SELECT `+initiativeSelectColumns+`

db/sqldb/migrations/0006_initiative_primary_key.down.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE portfolio_initiative_membership DROP PRIMARY KEY;
+
+COMMIT;

db/sqldb/migrations/0006_initiative_primary_key.up.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE portfolio_initiative_membership ADD PRIMARY KEY (portfolio_id, initiative_id);
+
+COMMIT;

db/sqldb/portfolio.go

@@ -10,8 +10,13 @@ import (
 	"github.com/jackc/pgx/v5/pgtype"
 )
 
+// Curious why this query uses array aggregation in its nested queries?
+// See https://github.com/RMI-PACTA/app/pull/91#discussion_r1437712435
 func portfolioQueryStanza(where string) string {
 	return fmt.Sprintf(`
+	WITH selected_portfolio_ids AS (
+		SELECT id FROM portfolio %[1]s
+	)
 	SELECT
 		portfolio.id,
 		portfolio.owner_id,
@@ -22,18 +27,32 @@ func portfolioQueryStanza(where string) string {
 		portfolio.blob_id,
 		portfolio.admin_debug_enabled,
 		portfolio.number_of_rows,
-		ARRAY_AGG(portfolio_group_membership.portfolio_group_id),
-		ARRAY_AGG(portfolio_group_membership.created_at),
-		ARRAY_AGG(portfolio_initiative_membership.initiative_id),
-		ARRAY_AGG(portfolio_initiative_membership.added_by_user_id),
-		ARRAY_AGG(portfolio_initiative_membership.created_at)
+		portfolio_group_ids,
+		portfolio_group_created_ats,
+		initiative_ids,
+		initiative_added_by_user_ids,
+		initiative_created_ats
 	FROM portfolio
-	LEFT JOIN portfolio_group_membership 
-	ON portfolio_group_membership.portfolio_id = portfolio.id
-	LEFT JOIN portfolio_initiative_membership
-	ON portfolio_initiative_membership.portfolio_id = portfolio.id
-	%s
-	GROUP BY portfolio.id;`, where)
+	LEFT JOIN (
+		SELECT 
+			portfolio_id,
+			ARRAY_AGG(portfolio_group_id) as portfolio_group_ids,
+			ARRAY_AGG(created_at) as portfolio_group_created_ats
+		FROM portfolio_group_membership
+		WHERE portfolio_id IN (SELECT id FROM selected_portfolio_ids)
+		GROUP BY portfolio_id
+	) pgs ON pgs.portfolio_id = portfolio.id
+	LEFT JOIN (
+		SELECT
+			portfolio_id,
+			ARRAY_AGG(initiative_id) as initiative_ids,
+			ARRAY_AGG(added_by_user_id) as initiative_added_by_user_ids,
+			ARRAY_AGG(created_at) as initiative_created_ats
+		FROM portfolio_initiative_membership
+		WHERE portfolio_id IN (SELECT id FROM selected_portfolio_ids)
+		GROUP BY portfolio_id
+	) itvs ON itvs.portfolio_id = portfolio.id
+	%[1]s;`, where)
 }
 
 func (d *DB) Portfolio(tx db.Tx, id pacta.PortfolioID) (*pacta.Portfolio, error) {
@@ -219,11 +238,11 @@ func rowToPortfolio(row rowScanner) (*pacta.Portfolio, error) {
 		if !initiativesIDs[i].Valid && !initiativesCreatedAts[i].Valid {
 			continue // skip nulls
 		}
-		if !groupsIDs[i].Valid {
-			return nil, fmt.Errorf("portfolio group membership ids must be non-null")
+		if !initiativesIDs[i].Valid {
+			return nil, fmt.Errorf("initiative ids must be non-null")
 		}
-		if !groupsCreatedAts[i].Valid {
-			return nil, fmt.Errorf("portfolio group membership createdAt must be non-null")
+		if !initiativesCreatedAts[i].Valid {
+			return nil, fmt.Errorf("initiative createdAt must be non-null")
 		}
 		var addedBy *pacta.User
 		if initiativesAddedByIDs[i].Valid {
@@ -233,7 +252,7 @@ func rowToPortfolio(row rowScanner) (*pacta.Portfolio, error) {
 			Initiative: &pacta.Initiative{
 				ID: pacta.InitiativeID(initiativesIDs[i].String),
 			},
-			CreatedAt: groupsCreatedAts[i].Time,
+			CreatedAt: initiativesCreatedAts[i].Time,
 			AddedBy:   addedBy,
 		})
 	}

db/sqldb/portfolio_group.go

@@ -138,12 +138,15 @@ func rowToPortfolioGroup(row rowScanner) (*pacta.PortfolioGroup, error) {
 	if err != nil {
 		return nil, fmt.Errorf("scanning into portfolio_group row: %w", err)
 	}
+	if err := checkSizesEquivalent("portfolio group membership", len(mid), len(mca)); err != nil {
+		return nil, err
+	}
 	for i := range mid {
 		if !mid[i].Valid && !mca[i].Valid {
 			continue // skip nulls
 		}
 		if !mid[i].Valid {
-			return nil, fmt.Errorf("portfolio group membership ids must be non-null")
+			return nil, fmt.Errorf("portfolio membership ids must be non-null")
 		}
 		if !mca[i].Valid {
 			return nil, fmt.Errorf("portfolio group membership createdAt must be non-null")
@@ -182,7 +185,7 @@ func (d *DB) CreatePortfolioGroupMembership(tx db.Tx, pgID pacta.PortfolioGroupI
 			(portfolio_group_id, portfolio_id)
 			VALUES
 			($1, $2)
-		ON CONFLICT (portfolio_group_id, portfolio_id) DO NOTHING;`,
+		ON CONFLICT DO NOTHING;`,
 		pgID, pID)
 	if err != nil {
 		return fmt.Errorf("creating portfolio_group_membership: %w", err)

db/sqldb/sqldb_test.go

@@ -87,6 +87,7 @@ func TestSchemaHistory(t *testing.T) {
 		{ID: 3, Version: 3}, // 0003_domain_types
 		{ID: 4, Version: 4}, // 0004_audit_log_tweaks
 		{ID: 5, Version: 5}, // 0005_json_blob_type
+		{ID: 6, Version: 6}, // 0006_initiative_primary_key
 	}
 
 	if diff := cmp.Diff(want, got); diff != "" {

frontend/app.vue

@@ -4,6 +4,9 @@ import { serializeError } from 'serialize-error'
 const { loading: { clearLoading }, error: { errorModalVisible, error } } = useModal()
 
 const handleError = (err: Error) => {
+  if (process.client) {
+    console.log(err)
+  }
   error.value = serializeError(err)
   errorModalVisible.value = true
   clearLoading()

frontend/components/incompleteupload/ListView.vue

@@ -0,0 +1,154 @@
+<script setup lang="ts">
+import { incompleteUploadEditor } from '@/lib/editor'
+import { type IncompleteUpload } from '@/openapi/generated/pacta'
+import { selectedCountSuffix } from '@/lib/selection'
+
+const {
+  humanReadableTimeFromStandardString,
+} = useTime()
+const pactaClient = usePACTA()
+const { loading: { withLoading } } = useModal()
+const i18n = useI18n()
+const { t } = i18n
+
+interface Props {
+  incompleteUploads: IncompleteUpload[]
+}
+const props = defineProps<Props>()
+interface Emits {
+  (e: 'refresh'): void
+}
+const emit = defineEmits<Emits>()
+
+interface EditorObject extends ReturnType<typeof incompleteUploadEditor> {
+  id: string
+}
+
+const prefix = 'components/incompleteupload/ListView'
+const tt = (s: string) => t(`${prefix}.${s}`)
+
+const editorObjects = computed<EditorObject[]>(() => props.incompleteUploads.map((item) => ({ ...incompleteUploadEditor(item, i18n), id: item.id })))
+
+const expandedRows = useState<EditorObject[]>(`${prefix}.expandedRows`, () => [])
+const selectedRows = useState<EditorObject[]>(`${prefix}.selectedRows`, () => [])
+
+const deleteIncompleteUpload = (id: string) => withLoading(
+  () => pactaClient.deleteIncompleteUpload(id).then(() => {
+    expandedRows.value = expandedRows.value.filter((row) => row.id !== id)
+  }),
+  `${prefix}.deletePortfolioGroup`,
+)
+const deleteSelected = async () => {
+  await Promise.all(
+    selectedRows.value.map((row) => deleteIncompleteUpload(row.id)),
+  ).then(() => {
+    emit('refresh')
+    selectedRows.value = []
+  })
+}
+const saveChanges = (id: string) => {
+  const index = editorObjects.value.findIndex((editorObject) => editorObject.id === id)
+  const eo = presentOrFileBug(editorObjects.value[index])
+  return withLoading(
+    () => pactaClient.updateIncompleteUpload(id, eo.changes.value).then(() => { emit('refresh') }),
+    `${prefix}.saveChanges`,
+  )
+}
+</script>
+
+<template>
+  <div class="flex flex-column gap-3">
+    <p>
+      TODO(#80) Write some copy about what Incomplete Uploads are, and direct users toward deleting them.
+    </p>
+    <div class="flex gap-2 flex-wrap">
+      <PVButton
+        icon="pi pi-refresh"
+        class="p-button-outlined p-button-secondary p-button-sm"
+        :label="tt('Refresh')"
+        @click="() => emit('refresh')"
+      />
+      <PVButton
+        :disabled="!selectedRows || selectedRows.length === 0"
+        icon="pi pi-trash"
+        class="p-button-outlined p-button-danger p-button-sm"
+        :label="tt('Delete') + selectedCountSuffix(selectedRows)"
+        @click="deleteSelected"
+      />
+    </div>
+    <PVDataTable
+      v-model:selection="selectedRows"
+      v-model:expanded-rows="expandedRows"
+      :value="editorObjects"
+      data-key="id"
+      class="w-full"
+      size="small"
+      sort-field="editorValues.value.createdAt.originalValue"
+      :sort-order="-1"
+    >
+      <PVColumn selection-mode="multiple" />
+      <PVColumn
+        field="editorValues.value.name.originalValue"
+        sortable
+        :header="tt('Name')"
+      />
+      <PVColumn
+        field="editorValues.value.createdAt.originalValue"
+        :header="tt('Created At')"
+        sortable
+      >
+        <template #body="slotProps">
+          {{ humanReadableTimeFromStandardString(slotProps.data.editorValues.value.createdAt.originalValue).value }}
+        </template>
+      </PVColumn>
+      <PVColumn
+        expander
+        header="Details"
+      />
+      <template
+        #expansion="slotProps"
+      >
+        <div class="surface-100 p-3">
+          <h2 class="mt-0">
+            Metadata
+          </h2>
+          <div class="flex flex-column gap-2 w-fit">
+            <div class="flex gap-2 justify-content-between">
+              <span>Created At</span>
+              <b>{{ humanReadableTimeFromStandardString(slotProps.data.editorValues.value.createdAt.originalValue).value }}</b>
+            </div>
+          </div>
+          <!-- TODO(grady) add failure information here. -->
+          <StandardDebug
+            :value="slotProps.data.editorValues.value"
+            label="Editor Values"
+          />
+          <h2 class="mt-5">
+            Editable Properties
+          </h2>
+          <IncompleteuploadEditor
+            v-model:editor-values="slotProps.data.editorValues.value"
+            :editor-fields="slotProps.data.editorFields.value"
+          />
+          <div class="flex gap-3 justify-content-between">
+            <PVButton
+              icon="pi pi-trash"
+              class="p-button-danger p-button-outlined"
+              :label="tt('Delete')"
+              @click="async () => { await deleteIncompleteUpload(slotProps.data.id); emit('refresh') }"
+            />
+            <div v-tooltip.bottom="slotProps.data.saveTooltip">
+              <PVButton
+                :disabled="!slotProps.data.canSave.value"
+                :label="tt('Save Changes')"
+                icon="pi pi-save"
+                icon-pos="right"
+                @click="() => saveChanges(slotProps.data.id)"
+              />
+            </div>
+          </div>
+        </div>
+      </template>
+    </PVDataTable>
+  </div>
+</template>

frontend/components/modal/Group.vue

@@ -8,5 +8,6 @@
     <ModalFakeUsers />
     <!-- TODO(grady) Remove This in Production Environments -->
     <ModalMissingTranslations />
+    <PVToast />
   </div>
 </template>