Fix/Edge browser - Invite invitation logic

components/browser/Column.js

@@ -9,7 +9,12 @@ import EdgeBrowserContext from './EdgeBrowserContext'
 import EntityList from './EntityList'
 import { prettyId, prettyInvitationId, pluralizeString } from '../../lib/utils'
 import EditEdgeInviteEmail from './EditEdgeInviteEmail'
-import { getInvitationPrefix, transformName } from '../../lib/edge-utils'
+import {
+ getInvitationPrefix,
+ isForBothGroupTypesInvite,
+ isNotInGroupInvite,
+ transformName,
+} from '../../lib/edge-utils'
 import api from '../../lib/api-client'
 import useUser from '../../hooks/useUser'
 import useQuery from '../../hooks/useQuery'
@@ -96,8 +101,6 @@ export default function Column(props) {
 
  const buildNewEditEdge = (editInvitation, entityId, weight = 0) => {
  if (!editInvitation) return null
- const isInviteInvitation =
- editInvitation[otherType]?.query?.['value-regex'] === '~.*|.+@.+'
 
  return {
  invitation: editInvitation.id,
@@ -221,10 +224,7 @@ export default function Column(props) {
  // eslint-disable-next-line react/jsx-one-expression-per-line
  return (
  <p>
- {invitationNamePlural} for{' '}
- <strong>
- {name.fullname}
- </strong>
+ {invitationNamePlural} for <strong>{name.fullname}</strong>
  </p>
  )
  }
@@ -335,7 +335,10 @@ export default function Column(props) {
 
  if (fieldName === 'editEdges' && entityType === 'profile') {
  const editInvitation = editInvitations.filter((p) => p.id === edge.invitation)?.[0]
- if (editInvitation[type]?.query?.['value-regex']) {
+ if (
+ isNotInGroupInvite(editInvitation, type) ||
+ isForBothGroupTypesInvite(editInvitation, type)
+ ) {
  itemToAdd = {
  id: headOrTailId,
  content: {
@@ -793,7 +796,7 @@ export default function Column(props) {
  if (!itemToAdd) {
  if (entityType === 'profile') {
  const hasInviteInvitation = editInvitations.some(
- (p) => p[type]?.query?.['value-regex']
+ (p) => isNotInGroupInvite(p, type) || isForBothGroupTypesInvite(p, type)
  )
  const hasProposedAssignmentInvitation = editInvitations.some((p) =>
  p.id.includes('Proposed_Assignment')

components/browser/EditEdgeInviteEmail.js

@@ -3,7 +3,12 @@
 
 import { useContext, useState } from 'react'
 import api from '../../lib/api-client'
-import { getInterpolatedValues, getSignatures } from '../../lib/edge-utils'
+import {
+ getInterpolatedValues,
+ getSignatures,
+ isForBothGroupTypesInvite,
+ isNotInGroupInvite,
+} from '../../lib/edge-utils'
 import { isValidEmail, prettyInvitationId } from '../../lib/utils'
 import LoadingSpinner from '../LoadingSpinner'
 import UserContext from '../UserContext'
@@ -23,10 +28,9 @@ const EditEdgeInviteEmail = ({
  useContext(EdgeBrowserContext)
  const { user, accessToken } = useContext(UserContext)
 
- const editInvitation = editInvitations?.filter(
- (p) => p?.[type]?.query?.['value-regex'] === '~.*|.+@.+'
- )?.[0]
-
+ const inviteInvitation = editInvitations.find(
+ (p) => isNotInGroupInvite(p, type) || isForBothGroupTypesInvite(p, type)
+ )
  // readers/nonreaders/writers
  const getValues = (value, email) =>
  getInterpolatedValues({
@@ -46,20 +50,20 @@ const EditEdgeInviteEmail = ({
  setLoading(true)
  // construct the template
  const newEdgeJson = {
- invitation: editInvitation.id,
+ invitation: inviteInvitation.id,
  [type]: email,
  [otherType]: parentId,
- label: editInvitation.label?.default,
+ label: inviteInvitation.label?.default,
  weight: 0,
- readers: getValues(editInvitation.readers, email),
- writers: getValues(editInvitation.writers, email),
+ readers: getValues(inviteInvitation.readers, email),
+ writers: getValues(inviteInvitation.writers, email),
  signatures: getSignatures(
- editInvitation,
+ inviteInvitation,
  availableSignaturesInvitationMap,
  parentNumber,
  user
  ),
- nonreaders: getValues(editInvitation.nonreaders, email),
+ nonreaders: getValues(inviteInvitation.nonreaders, email),
  }
  // post
  try {
@@ -80,7 +84,7 @@ const EditEdgeInviteEmail = ({
  return !isValidEmail(emailToInvite.trim())
  }
 
- if (!editInvitation || entityType !== 'profile') return null
+ if (!inviteInvitation || entityType !== 'profile') return null
  return (
  <div className="">
  <form
@@ -96,8 +100,8 @@ const EditEdgeInviteEmail = ({
  className="form-control input-sm"
  autoComplete="off"
  value={emailToInvite}
- placeholder={editInvitation[type].description}
- title={editInvitation[type].description}
+ placeholder={inviteInvitation[type].description}
+ title={inviteInvitation[type].description}
  onChange={(e) => setEmailToInvite(e.target.value)}
  />
  <button
@@ -106,7 +110,7 @@ const EditEdgeInviteEmail = ({
  disabled={shouldDisableSubmitBtn()}
  >
  {loading && <LoadingSpinner inline text="" extraClass="spinner-small" />}
- {prettyInvitationId(editInvitation.id)}
+ {prettyInvitationId(inviteInvitation.id)}
  </button>
  </form>
  </div>

components/browser/NoteEntity.js

@@ -14,7 +14,13 @@ import ScoresList from './ScoresList'
 import EditEdgeTwoDropdowns from './EditEdgeTwoDropdowns'
 import api from '../../lib/api-client'
 import UserContext from '../UserContext'
-import { getInterpolatedValues, getSignatures } from '../../lib/edge-utils'
+import {
+ getInterpolatedValues,
+ getSignatures,
+ isForBothGroupTypesInvite,
+ isInGroupInvite,
+ isNotInGroupInvite,
+} from '../../lib/edge-utils'
 
 export default function NoteEntity(props) {
  const { editInvitations, traverseInvitation, availableSignaturesInvitationMap, version } =
@@ -115,7 +121,8 @@ export default function NoteEntity(props) {
  )?.[0]
  const otherColumnType = props.columnType === 'head' ? 'tail' : 'head'
  const isInviteInvitation =
- editInvitation[otherColumnType]?.query?.['value-regex'] === '~.*|.+@.+'
+ isInGroupInvite(editInvitation, otherColumnType) ||
+ isForBothGroupTypesInvite(editInvitation, otherColumnType)
  const signatures = getSignatures(
  editInvitation,
  availableSignaturesInvitationMap,
@@ -179,7 +186,10 @@ export default function NoteEntity(props) {
  const parentColumnType = props.columnType === 'head' ? 'tail' : 'head'
  const isAssigned = metadata.isAssigned || metadata.isUserAssigned
  const isInviteInvitation =
- editInvitation[parentColumnType]?.query?.['value-regex'] === '~.*|.+@.+'
+ isInGroupInvite(editInvitation, parentColumnType) ||
+ isNotInGroupInvite(editInvitation, parentColumnType) ||
+ isForBothGroupTypesInvite(editInvitation, parentColumnType)
+ const isExternalOnlyInviteInvitation = isNotInGroupInvite(editInvitation, parentColumnType)
  const isReviewerAssignmentStage = editInvitations.some((p) =>
  p.id.includes('Proposed_Assignment')
  )
@@ -197,6 +207,12 @@ export default function NoteEntity(props) {
  let shouldDisableControl = false
  let disableControlReason = null
 
+ // show invite only at bottom of column
+ if (isExternalOnlyInviteInvitation && !editEdge) return null
+
+ // not to show invite assignment when removed from reviewers group
+ if (isInviteInvitation && props.parentInfo.content?.isDummyProfile) return null
+
  // invited profile show only invite edge and proposed assignment edge
  if (isParentInvited && !(isInviteInvitation || isProposedAssignmentInvitation)) return null
  // show existing invite edge for normal reviewers

components/browser/ProfileEntity.js

@@ -6,7 +6,13 @@
 import { nanoid } from 'nanoid'
 import React, { useContext } from 'react'
 import api from '../../lib/api-client'
-import { getInterpolatedValues, getSignatures } from '../../lib/edge-utils'
+import {
+ getInterpolatedValues,
+ getSignatures,
+ isForBothGroupTypesInvite,
+ isInGroupInvite,
+ isNotInGroupInvite,
+} from '../../lib/edge-utils'
 import UserContext from '../UserContext'
 import EdgeBrowserContext from './EdgeBrowserContext'
 import EditEdgeDropdown from './EditEdgeDropdown'
@@ -160,7 +166,8 @@ export default function ProfileEntity(props) {
  ? traverseInvitation
  : editInvitations.filter((p) => p.id === editEdgeTemplate.invitation)?.[0]
  const isInviteInvitation =
- editInvitation[props.columnType]?.query?.['value-regex'] === '~.*|.+@.+'
+ isInGroupInvite(editInvitation, props.columnType) ||
+ isForBothGroupTypesInvite(editInvitation, props.columnType)
  const isTraverseInvitation = editInvitation.id === traverseInvitation.id
  const isCustomLoadInvitation = editInvitation.id.includes('Custom_Max_Papers')
  const maxLoadInvitationHead = editInvitation.head?.query?.id
@@ -217,7 +224,10 @@ export default function ProfileEntity(props) {
  const renderEditEdgeWidget = ({ edge, invitation, isTraverseEdge = false }) => {
  const isAssigned = metadata.isAssigned || metadata.isUserAssigned
  const isInviteInvitation =
- invitation[props.columnType]?.query?.['value-regex'] === '~.*|.+@.+'
+ isInGroupInvite(invitation, props.columnType) ||
+ isNotInGroupInvite(invitation, props.columnType) ||
+ isForBothGroupTypesInvite(invitation, props.columnType)
+ const isExternalOnlyInviteInvitation = isNotInGroupInvite(invitation, props.columnType)
  const isProposedAssignmentInvitation = invitation.id.includes('Proposed_Assignment')
  const isAssignmentInvitation = invitation.id.includes('/Assignment')
  const isCustomLoadInvitation = invitation.id.includes('Custom_Max_Papers')
@@ -253,6 +263,12 @@ export default function ProfileEntity(props) {
  disableControlReason = 'The reviewer has already been invited'
  }
 
+ // show invite only at bottom of column
+ if (isExternalOnlyInviteInvitation && !edge) return null
+
+ // not to show invite assignment when removed from reviewers group
+ if (isInviteInvitation && !edge && content.isDummyProfile) return null
+
  // reviewer assignmet stage (1st stage) don't show invite assignment except for invited (has editEdge)
  if (isReviewerAssignmentStage && isInviteInvitation && !edge) return null
 
@@ -376,10 +392,12 @@ export default function ProfileEntity(props) {
  traverseInvitation.id.includes('/Assignment') &&
  editEdges?.some(
  (p) =>
- editInvitations.find((q) => q.id === p.invitation)?.[props.columnType]?.query?.[
- 'value-regex'
- ] === '~.*|.+@.+' && // invite invitation
- p.label === 'Accepted'
+ editInvitations.find(
+ (q) =>
+ q.id === p.invitation &&
+ (isNotInGroupInvite(q, props.columnType) ||
+ isForBothGroupTypesInvite(q, props.columnType))
+ ) && p.label === 'Accepted'
  )
  ) {
  return renderEditEdgeWidget({

lib/edge-utils.js

@@ -336,6 +336,11 @@ export function translateFieldSpec(invitation, fieldName, version) {
  group: field.param.inGroup,
  }
  }
+ if (field.param?.notInGroup) {
+ spec.query = {
+ notInGroup: field.param.notInGroup,
+ }
+ }
  if (field.param?.options?.group) {
  spec.query = {
  group: field.param.options.group,
@@ -506,3 +511,23 @@ export function transformName(name, toVerb = false, pluralForm = false) {
 export function getInvitationPrefix(invitationId) {
  return invitationId ? invitationId.split('/-')?.[0] : null
 }
+
+export function isInGroupInvite(invitation, headOrTail) {
+ if (!invitation.id.endsWith('Invite_Assignment')) return false
+ if (invitation[headOrTail]?.query?.group) return true
+ return false
+}
+
+export function isNotInGroupInvite(invitation, headOrTail) {
+ if (!invitation.id.endsWith('Invite_Assignment')) return false
+ if (invitation[headOrTail]?.query?.notInGroup) return true
+ return false
+}
+
+// invite invitation using regex
+export function isForBothGroupTypesInvite(invitation, headOrTail) {
+ if (!invitation.id.endsWith('Invite_Assignment')) return false
+ if (invitation[headOrTail]?.query?.group) return false
+ if (invitation[headOrTail]?.query?.notInGroup) return false
+ return true
+}