profile-pane 3.2.1 → 3.2.2-test.0

package/lib/sections/resume/ResumeEditDialog.js

@@ -4,19 +4,327 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createResumeEditDialog = createResumeEditDialog;
+exports.fetchWikidataOrganizationSuggestions = fetchWikidataOrganizationSuggestions;
 var _dialog = require("../../ui/dialog");
 var _litHtml = require("lit-html");
+require("solid-ui/components/actions/button");
+require("solid-ui/components/forms/combobox");
+require("solid-ui/components/forms/select");
 require("../../styles/EditDialogs.css");
-require("../../styles/ContactInfoEditDialog.css");
+require("../contactInfo/ContactInfoEditDialog.css");
 var _rdflib = require("rdflib");
 var _mutations = require("./mutations");
 var _rowState = require("../shared/rowState");
 var _textUtils = require("../../textUtils");
 var _profileIcons = require("../../icons-svg/profileIcons");
 var _texts = require("../../texts");
+const RESUME_ORGANIZATION_TYPE_OPTIONS = [{
+  label: 'Corporation',
+  value: 'Corporation'
+}, {
+  label: 'Educational Organization',
+  value: 'EducationalOrganization'
+}, {
+  label: 'Research Organization',
+  value: 'ResearchOrganization'
+}, {
+  label: 'Government Organization',
+  value: 'GovernmentOrganization'
+}, {
+  label: 'NGO',
+  value: 'NGO'
+}, {
+  label: 'Performing Group',
+  value: 'PerformingGroup'
+}, {
+  label: 'Project',
+  value: 'Project'
+}, {
+  label: 'Sports Organization',
+  value: 'SportsOrganization'
+}, {
+  label: 'Other',
+  value: 'Other'
+}];
+const RESUME_MONTH_OPTIONS = [{
+  value: '01',
+  label: 'January'
+}, {
+  value: '02',
+  label: 'February'
+}, {
+  value: '03',
+  label: 'March'
+}, {
+  value: '04',
+  label: 'April'
+}, {
+  value: '05',
+  label: 'May'
+}, {
+  value: '06',
+  label: 'June'
+}, {
+  value: '07',
+  label: 'July'
+}, {
+  value: '08',
+  label: 'August'
+}, {
+  value: '09',
+  label: 'September'
+}, {
+  value: '10',
+  label: 'October'
+}, {
+  value: '11',
+  label: 'November'
+}, {
+  value: '12',
+  label: 'December'
+}];
+const WIKIDATA_ORGANIZATION_SEARCH_URI = 'https://www.wikidata.org/w/api.php?action=wbsearchentities&language=$(language)&type=item&limit=$(limit)&format=json&origin=*&search=$(name)';
+const WIKIDATA_ENTITY_LOOKUP_URI = 'https://www.wikidata.org/w/api.php?action=wbgetentities&format=json&origin=*&props=claims&ids=$(ids)';
+const WIKIDATA_ORGANIZATION_SEARCH_LANGUAGE = 'en';
+const WIKIDATA_ORGANIZATION_SEARCH_LIMIT = 8;
+const WIKIDATA_ORGANIZATION_SEARCH_CANDIDATE_LIMIT = 24;
+const RESUME_ORGANIZATION_TYPE_WIKIDATA_CLASS_URIS = {
+  Corporation: ['http://www.wikidata.org/entity/Q6881511', 'http://www.wikidata.org/entity/Q4830453'],
+  EducationalOrganization: ['http://www.wikidata.org/entity/Q178706', 'http://www.wikidata.org/entity/Q2385804', 'http://www.wikidata.org/entity/Q1664720'],
+  ResearchOrganization: ['http://www.wikidata.org/entity/Q31855'],
+  GovernmentOrganization: ['http://www.wikidata.org/entity/Q327333'],
+  NGO: ['http://www.wikidata.org/entity/Q163740', 'http://www.wikidata.org/entity/Q79913', 'http://www.wikidata.org/entity/Q708676'],
+  PerformingGroup: ['http://www.wikidata.org/entity/Q32178211'],
+  Project: ['http://www.wikidata.org/entity/Q170584'],
+  SportsOrganization: ['http://www.wikidata.org/entity/Q4438121'],
+  Other: ['http://www.wikidata.org/entity/Q43229']
+};
+const RESUME_ORGANIZATION_SEARCH_CLASS_URIS = Array.from(new Set(RESUME_ORGANIZATION_TYPE_OPTIONS.flatMap(option => RESUME_ORGANIZATION_TYPE_WIKIDATA_CLASS_URIS[option.value] || [])));
+const RESUME_PRESENT_MONTH_VALUE = '__present__';
 function sanitizeResumeFieldValue(value) {
   return (0, _textUtils.sanitizeTextValue)(value);
 }
+function normalizeResumeOrganizationPublicId(value) {
+  return sanitizeResumeFieldValue(value);
+}
+function buildWikidataOrganizationSearchUrl(name) {
+  return WIKIDATA_ORGANIZATION_SEARCH_URI.replace('$(language)', encodeURIComponent(WIKIDATA_ORGANIZATION_SEARCH_LANGUAGE)).replace('$(limit)', encodeURIComponent(String(WIKIDATA_ORGANIZATION_SEARCH_CANDIDATE_LIMIT))).replace('$(name)', encodeURIComponent(name));
+}
+function buildWikidataEntityLookupUrl(ids) {
+  return WIKIDATA_ENTITY_LOOKUP_URI.replace('$(ids)', encodeURIComponent(ids.join('|')));
+}
+function getWikidataIdFromUri(value) {
+  const trimmed = sanitizeResumeFieldValue(value);
+  const match = trimmed.match(/Q\d+/);
+  return match ? match[0] : '';
+}
+function getWikidataClaimIds(entity, property) {
+  const claims = entity?.claims?.[property] || [];
+  return claims.map(claim => claim?.mainsnak).filter(snak => snak?.snaktype === 'value').map(snak => snak?.datavalue?.value?.id).filter(id => typeof id === 'string' && id.length > 0);
+}
+function getAllowedOrganizationTypeIds(selectedType) {
+  const normalizedType = normalizeResumeOrganizationTypeValue(selectedType);
+  const typeUris = RESUME_ORGANIZATION_TYPE_WIKIDATA_CLASS_URIS[normalizedType];
+  if (!typeUris?.length) {
+    return RESUME_ORGANIZATION_SEARCH_CLASS_URIS.map(uri => getWikidataIdFromUri(uri)).filter(Boolean);
+  }
+  return typeUris.map(uri => getWikidataIdFromUri(uri)).filter(Boolean);
+}
+const allowedOrganizationTypeIdSetCache = new Map();
+function getAllowedOrganizationTypeIdSet(selectedType) {
+  const normalizedType = normalizeResumeOrganizationTypeValue(selectedType);
+  const cachedIds = allowedOrganizationTypeIdSetCache.get(normalizedType);
+  if (cachedIds) {
+    return cachedIds;
+  }
+  const allowedIds = new Set(getAllowedOrganizationTypeIds(normalizedType));
+  allowedOrganizationTypeIdSetCache.set(normalizedType, allowedIds);
+  return allowedIds;
+}
+async function fetchWikidataEntities(ids) {
+  const uniqueIds = Array.from(new Set(ids.filter(Boolean)));
+  if (!uniqueIds.length || typeof fetch !== 'function') return {};
+  const response = await fetch(buildWikidataEntityLookupUrl(uniqueIds));
+  if (!response.ok) return {};
+  const payload = await response.json();
+  return payload?.entities || {};
+}
+function entityMatchesAllowedOrganizationTypes(entityId, entityMap, selectedType) {
+  const allowedIds = getAllowedOrganizationTypeIdSet(selectedType);
+  const visited = new Set();
+  const agenda = [entityId];
+  while (agenda.length) {
+    const currentId = agenda.shift();
+    if (!currentId || visited.has(currentId)) continue;
+    visited.add(currentId);
+    if (allowedIds.has(currentId)) {
+      return true;
+    }
+    const entity = entityMap[currentId];
+    agenda.push(...getWikidataClaimIds(entity, 'P31'));
+    agenda.push(...getWikidataClaimIds(entity, 'P279'));
+  }
+  return false;
+}
+function toResumeOrganizationLabel(result) {
+  return result?.label || result?.match?.text || result?.id || '';
+}
+function toResumeOrganizationSuggestion(result) {
+  const label = sanitizeResumeFieldValue(toResumeOrganizationLabel(result));
+  const publicId = normalizeResumeOrganizationPublicId(typeof result?.concepturi === 'string' ? result.concepturi : typeof result?.url === 'string' ? result.url : '');
+  return {
+    label,
+    publicId
+  };
+}
+function dedupeResumeOrganizationSuggestions(suggestions) {
+  const seen = new Set();
+  return suggestions.filter(suggestion => {
+    if (!suggestion.label || !suggestion.publicId) return false;
+    const key = suggestion.label.toLowerCase();
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
+}
+async function fetchWikidataOrganizationSuggestions(name, selectedType) {
+  const query = sanitizeResumeFieldValue(name);
+  if (query.length < 2 || typeof fetch !== 'function') return [];
+  try {
+    const response = await fetch(buildWikidataOrganizationSearchUrl(query));
+    if (!response.ok) return [];
+    const payload = await response.json();
+    const results = Array.isArray(payload?.search) ? payload.search : [];
+    const suggestions = dedupeResumeOrganizationSuggestions(results.map(result => toResumeOrganizationSuggestion(result)));
+    const resultIds = suggestions.map(suggestion => getWikidataIdFromUri(suggestion.publicId)).filter(Boolean);
+    if (!resultIds.length) {
+      return suggestions.slice(0, WIKIDATA_ORGANIZATION_SEARCH_LIMIT);
+    }
+    const resultEntities = await fetchWikidataEntities(resultIds);
+    const relatedIds = Array.from(new Set(Object.values(resultEntities).flatMap(entity => [...getWikidataClaimIds(entity, 'P31'), ...getWikidataClaimIds(entity, 'P279')])));
+    const relatedEntities = await fetchWikidataEntities(relatedIds);
+    const entityMap = {
+      ...resultEntities,
+      ...relatedEntities
+    };
+    if (Object.keys(entityMap).length === 0) {
+      return suggestions.slice(0, WIKIDATA_ORGANIZATION_SEARCH_LIMIT);
+    }
+    const filteredSuggestions = suggestions.filter(suggestion => {
+      const entityId = getWikidataIdFromUri(suggestion.publicId);
+      return entityMatchesAllowedOrganizationTypes(entityId, entityMap, selectedType);
+    });
+    return filteredSuggestions.slice(0, WIKIDATA_ORGANIZATION_SEARCH_LIMIT);
+  } catch {
+    return [];
+  }
+}
+function toResumeOrganizationComboboxOption(suggestion) {
+  return {
+    label: suggestion.label,
+    value: suggestion.publicId,
+    publicId: suggestion.publicId
+  };
+}
+function readResumeOrganizationComboboxInputValue(event) {
+  const customEvent = event;
+  if (typeof customEvent.detail?.value === 'string') {
+    return customEvent.detail.value;
+  }
+  const target = event.target;
+  return typeof target?.value === 'string' ? target.value : '';
+}
+function readResumeOrganizationComboboxChange(event) {
+  const customEvent = event;
+  if (customEvent.detail?.option) {
+    return customEvent.detail.option;
+  }
+  return null;
+}
+function createResumeOrganizationSuggestionProvider(getSelectedType) {
+  return async query => {
+    const suggestions = await fetchWikidataOrganizationSuggestions(query, getSelectedType());
+    return suggestions.map(toResumeOrganizationComboboxOption);
+  };
+}
+function normalizeResumeOrganizationTypeValue(value) {
+  return RESUME_ORGANIZATION_TYPE_OPTIONS.some(option => option.value === value) ? value : RESUME_ORGANIZATION_TYPE_OPTIONS[0]?.value || '';
+}
+function readResumeOrganizationTypeChange(event) {
+  const customEvent = event;
+  if (typeof customEvent.detail?.value === 'string') {
+    return customEvent.detail.value;
+  }
+  const target = event.target;
+  return typeof target?.value === 'string' ? target.value : '';
+}
+function readResumeSelectChange(event) {
+  return readResumeOrganizationTypeChange(event);
+}
+function getResumeYearOptions(selectedYears) {
+  const currentYear = new Date().getFullYear();
+  const baseYearOptions = Array.from({
+    length: 120
+  }, (_, i) => String(currentYear - i));
+  const yearOptions = Array.from(new Set([...baseYearOptions, ...selectedYears].filter(Boolean))).sort((a, b) => Number(b) - Number(a));
+  return yearOptions.map(year => ({
+    label: year,
+    value: year
+  }));
+}
+function getResumeDateSelectOptions(kind, selectedYears, isCurrentRole) {
+  if (kind === 'start-month') {
+    return RESUME_MONTH_OPTIONS;
+  }
+  if (kind === 'start-year') {
+    return getResumeYearOptions(selectedYears);
+  }
+  if (kind === 'end-month') {
+    if (isCurrentRole) {
+      return [{
+        value: RESUME_PRESENT_MONTH_VALUE,
+        label: 'Present'
+      }];
+    }
+    return RESUME_MONTH_OPTIONS;
+  }
+  if (kind === 'end-year' && isCurrentRole) {
+    return [{
+      value: '',
+      label: ''
+    }];
+  }
+  return getResumeYearOptions(selectedYears);
+}
+function getResumeDateSelectLabel(kind, row) {
+  switch (kind) {
+    case 'start-month':
+    case 'end-month':
+      return row?.isCurrentRole && kind === 'end-month' ? 'Present' : 'Select Month';
+    case 'start-year':
+      return 'Select Year';
+    case 'end-year':
+      return row?.isCurrentRole ? '' : 'Select Year';
+    default:
+      return '';
+  }
+}
+function getResumeDateSelectValue(kind, row) {
+  const startDateParts = parseYearMonthFromDateText((0, _textUtils.toText)(row?.startDate));
+  const endDateParts = parseYearMonthFromDateText((0, _textUtils.toText)(row?.endDate));
+  switch (kind) {
+    case 'start-month':
+      return startDateParts.month;
+    case 'start-year':
+      return startDateParts.year;
+    case 'end-month':
+      return row?.isCurrentRole ? RESUME_PRESENT_MONTH_VALUE : endDateParts.month;
+    case 'end-year':
+      return row?.isCurrentRole ? '' : endDateParts.year;
+    default:
+      return '';
+  }
+}
 function parseYearMonthFromDateText(dateText) {
   const normalized = (dateText || '').trim();
   if (!normalized) return {
@@ -47,7 +355,8 @@ function toFormState(resumeData) {
     endDate: role.endDate,
     isCurrentRole: role.isCurrentRole ?? !role.endDate,
     orgName: sanitizeResumeFieldValue((0, _textUtils.toText)(role.orgName)),
-    orgType: sanitizeResumeFieldValue((0, _textUtils.toText)(role.orgType)),
+    orgPublicId: normalizeResumeOrganizationPublicId(sanitizeResumeFieldValue((0, _textUtils.toText)(role.orgPublicId))),
+    orgType: normalizeResumeOrganizationTypeValue(sanitizeResumeFieldValue((0, _textUtils.toText)(role.orgType))),
     orgLocation: sanitizeResumeFieldValue((0, _textUtils.toText)(role.orgLocation)),
     orgHomePage: sanitizeResumeFieldValue((0, _textUtils.toText)(role.orgHomePage)),
     description: sanitizeResumeFieldValue((0, _textUtils.toText)(role.description)),
@@ -62,7 +371,8 @@ function toFormState(resumeData) {
       endDate: undefined,
       isCurrentRole: false,
       orgName: '',
-      orgType: '',
+      orgPublicId: '',
+      orgType: RESUME_ORGANIZATION_TYPE_OPTIONS[0].value,
       orgLocation: '',
       orgHomePage: '',
       description: '',
@@ -88,6 +398,66 @@ function validateResumeBeforeSave(rows) {
     ok: true
   };
 }
+function initializeResumeOrganizationTypeSelects(form, resumeData) {
+  const selectElements = form.querySelectorAll('solid-ui-select[data-resume-organization-type-index]');
+  selectElements.forEach(selectElement => {
+    const rowIndex = Number(selectElement.dataset.resumeOrganizationTypeIndex);
+    if (Number.isNaN(rowIndex)) return;
+    const resumeRow = resumeData[rowIndex];
+    if (!resumeRow) return;
+    selectElement.options = RESUME_ORGANIZATION_TYPE_OPTIONS;
+    selectElement.value = normalizeResumeOrganizationTypeValue(resumeRow.orgType || '');
+    selectElement.label = '';
+  });
+}
+function initializeResumeOrganizationComboboxes(form, resumeData) {
+  const comboboxElements = form.querySelectorAll('solid-ui-combobox[data-resume-organization-index]');
+  comboboxElements.forEach(comboboxElement => {
+    const rowIndex = Number(comboboxElement.dataset.resumeOrganizationIndex);
+    if (Number.isNaN(rowIndex)) return;
+    const resumeRow = resumeData[rowIndex];
+    if (!resumeRow) return;
+    const options = resumeRow.orgPublicId && resumeRow.orgName ? [{
+      label: resumeRow.orgName,
+      value: resumeRow.orgPublicId,
+      publicId: resumeRow.orgPublicId
+    }] : [];
+    comboboxElement.suggestionProvider = createResumeOrganizationSuggestionProvider(() => normalizeResumeOrganizationTypeValue(resumeRow.orgType || ''));
+    comboboxElement.options = options;
+    comboboxElement.value = resumeRow.orgPublicId || '';
+    comboboxElement.inputValue = resumeRow.orgName || '';
+    comboboxElement.label = '';
+    comboboxElement.placeholder = 'Company or Organization';
+  });
+}
+function syncResumeOrganizationRowsFromComboboxes(form, resumeData) {
+  const comboboxElements = form.querySelectorAll('solid-ui-combobox[data-resume-organization-index]');
+  comboboxElements.forEach(comboboxElement => {
+    const rowIndex = Number(comboboxElement.dataset.resumeOrganizationIndex);
+    if (Number.isNaN(rowIndex) || !resumeData[rowIndex]) return;
+    const comboboxInput = comboboxElement.shadowRoot?.querySelector('input');
+    const nextName = sanitizeResumeFieldValue(comboboxInput?.value || comboboxElement.inputValue || '');
+    const nextPublicId = normalizeResumeOrganizationPublicId(comboboxElement.value || '');
+    (0, _rowState.applyRowFieldChange)(resumeData[rowIndex], 'orgName', nextName, rowHasContent);
+    resumeData[rowIndex].orgPublicId = nextPublicId;
+  });
+}
+function initializeResumeDateSelects(form, resumeData) {
+  const selectElements = form.querySelectorAll('solid-ui-select[data-resume-date-kind]');
+  selectElements.forEach(selectElement => {
+    const kind = selectElement.dataset.resumeDateKind;
+    const rowIndex = Number(selectElement.dataset.resumeRowIndex);
+    if (!kind || Number.isNaN(rowIndex)) return;
+    const resumeRow = resumeData[rowIndex];
+    if (!resumeRow) return;
+    const startDateParts = parseYearMonthFromDateText((0, _textUtils.toText)(resumeRow.startDate));
+    const endDateParts = parseYearMonthFromDateText((0, _textUtils.toText)(resumeRow.endDate));
+    const selectedYears = [startDateParts.year, endDateParts.year];
+    selectElement.options = getResumeDateSelectOptions(kind, selectedYears, Boolean(resumeRow.isCurrentRole));
+    selectElement.value = getResumeDateSelectValue(kind, resumeRow);
+    selectElement.label = getResumeDateSelectLabel(kind, resumeRow);
+  });
+}
 function renderResumeInputRow({
   resumeData,
   index,
@@ -130,59 +500,7 @@ function renderResumeInputRow({
   const endYearParsedText = endDateParts.year;
   const isCurrentRoleId = `resume-current-role-${index}`;
   const currentYear = new Date().getFullYear();
-  const baseYearOptions = Array.from({
-    length: 120
-  }, (_, i) => String(currentYear - i));
-  const yearOptions = Array.from(new Set([...baseYearOptions, startYearText, endYearParsedText].filter(Boolean))).sort((a, b) => Number(b) - Number(a));
-  const monthOptions = [{
-    value: '01',
-    label: 'January'
-  }, {
-    value: '02',
-    label: 'February'
-  }, {
-    value: '03',
-    label: 'March'
-  }, {
-    value: '04',
-    label: 'April'
-  }, {
-    value: '05',
-    label: 'May'
-  }, {
-    value: '06',
-    label: 'June'
-  }, {
-    value: '07',
-    label: 'July'
-  }, {
-    value: '08',
-    label: 'August'
-  }, {
-    value: '09',
-    label: 'September'
-  }, {
-    value: '10',
-    label: 'October'
-  }, {
-    value: '11',
-    label: 'November'
-  }, {
-    value: '12',
-    label: 'December'
-  }];
-  const renderMonthOptions = (selectedMonth, emptyLabel = 'Select Month') => (0, _litHtml.html)`
-    <option value="" ?selected=${!selectedMonth}>${emptyLabel}</option>
-    ${monthOptions.map(month => (0, _litHtml.html)`
-      <option value=${month.value} ?selected=${month.value === selectedMonth}>${month.label}</option>
-    `)}
-  `;
-  const renderYearOptions = (selectedYear, emptyLabel = 'Select Year') => (0, _litHtml.html)`
-    <option value="" ?selected=${!selectedYear}>${emptyLabel}</option>
-    ${yearOptions.map(year => (0, _litHtml.html)`
-      <option value=${year} ?selected=${year === selectedYear}>${year}</option>
-    `)}
-  `;
+  const selectedYears = [startYearText, endYearParsedText];
   const handleResumeInput = field => e => {
     const target = e.target;
     const nextValue = sanitizeResumeFieldValue(target.value);
@@ -203,8 +521,7 @@ function renderResumeInputRow({
   /* The following function was generated by AI Model: GPT-5.3-Codex  */
   /* Prompt: can you make this a month drop down for the start year */
   const handleStartMonthChange = event => {
-    const target = event.target;
-    const month = target.value;
+    const month = readResumeSelectChange(event);
     const year = parseYearMonthFromDateText((0, _textUtils.toText)(resumeData[index]?.startDate)).year || String(currentYear);
     const nextStartDate = buildDateLiteral(month, year);
     if (resumeData[index]) {
@@ -213,8 +530,7 @@ function renderResumeInputRow({
     }
   };
   const handleStartYearChange = event => {
-    const target = event.target;
-    const year = target.value;
+    const year = readResumeSelectChange(event);
     const month = parseYearMonthFromDateText((0, _textUtils.toText)(resumeData[index]?.startDate)).month || '01';
     const nextStartDate = buildDateLiteral(month, year);
     if (resumeData[index]) {
@@ -223,8 +539,8 @@ function renderResumeInputRow({
     }
   };
   const handleEndMonthChange = event => {
-    const target = event.target;
-    const month = target.value;
+    if (resumeData[index]?.isCurrentRole) return;
+    const month = readResumeSelectChange(event);
     const year = parseYearMonthFromDateText((0, _textUtils.toText)(resumeData[index]?.endDate)).year || String(currentYear);
     const nextEndDate = buildDateLiteral(month, year);
     if (resumeData[index]) {
@@ -233,8 +549,8 @@ function renderResumeInputRow({
     }
   };
   const handleEndYearChange = event => {
-    const target = event.target;
-    const year = target.value;
+    if (resumeData[index]?.isCurrentRole) return;
+    const year = readResumeSelectChange(event);
     const month = parseYearMonthFromDateText((0, _textUtils.toText)(resumeData[index]?.endDate)).month || '01';
     const nextEndDate = buildDateLiteral(month, year);
     if (resumeData[index]) {
@@ -257,48 +573,45 @@ function renderResumeInputRow({
       if (target.checked) {
         (0, _rowState.applyRowFieldChange)(resumeData[index], 'endDate', undefined, rowHasContent);
       }
-      const formRoot = target.form || target.closest('form');
-      const endMonthSelect = formRoot?.querySelector(`#${endMonthSelectId}`);
-      const endYearSelect = formRoot?.querySelector(`#${endYearSelectId}`);
-      if (endMonthSelect) {
-        endMonthSelect.disabled = target.checked;
-        endMonthSelect.value = '';
-        const emptyOption = endMonthSelect.options[0];
-        if (emptyOption) {
-          emptyOption.text = target.checked ? 'Present' : 'Select Month';
-        }
-      }
-      if (endYearSelect) {
-        endYearSelect.disabled = target.checked;
-        endYearSelect.value = '';
-        const emptyOption = endYearSelect.options[0];
-        if (emptyOption) {
-          emptyOption.text = target.checked ? '' : 'Select Year';
-        }
-      }
+      onChange();
     }
   };
   const handleOrganizationTypeInput = e => {
-    const target = e.target;
-    const nextType = target.value;
+    const nextType = normalizeResumeOrganizationTypeValue(readResumeOrganizationTypeChange(e));
     if (resumeRow) {
       (0, _rowState.applyRowSelectChange)(resumeRow, 'orgType', nextType);
+      resumeRow.orgPublicId = '';
       onChange();
     }
   };
+  const handleOrganizationNameInput = e => {
+    const nextValue = sanitizeResumeFieldValue(readResumeOrganizationComboboxInputValue(e));
+    if (resumeRow) {
+      (0, _rowState.applyRowFieldChange)(resumeRow, 'orgName', nextValue, rowHasContent);
+      resumeRow.orgPublicId = '';
+    }
+  };
+  const handleOrganizationNameChange = e => {
+    const selectedOption = readResumeOrganizationComboboxChange(e);
+    if (!resumeRow || !selectedOption?.publicId) return;
+    (0, _rowState.applyRowFieldChange)(resumeRow, 'orgName', sanitizeResumeFieldValue(selectedOption.label), rowHasContent);
+    resumeRow.orgPublicId = selectedOption.publicId;
+  };
   return (0, _litHtml.html)`
     <div class="profile-edit-dialog__row profile-edit-dialog__row--resume-entry-header" role="group" aria-labelledby=${experienceHeadingId}>
       <h3 id=${experienceHeadingId} class="profile-edit-dialog__entry-heading">${label}</h3>
       <div class="profile-edit-dialog__actions profile-edit-dialog__actions--edge">
-        <button
+        <solid-ui-button
           type="button"
+          variant="icon"
+          size="md"
           class="profile-edit-dialog__delete-button"
           aria-label=${`Delete resume ${displayIndex + 1}`}
           title=${_texts.deleteEntryButtonTitleText}
           @click=${handleDelete}
         >
-          <span class="profile-edit-dialog__delete-icon" aria-hidden="true">${_profileIcons.trashIcon}</span>
-        </button>
+          <span slot="icon" class="profile-edit-dialog__delete-icon" aria-hidden="true">${_profileIcons.trashIcon}</span>
+        </solid-ui-button>
       </div>
     </div>
     <label aria-label=${`${label} Title`} class="label profile-edit-dialog__field">
@@ -318,36 +631,28 @@ function renderResumeInputRow({
       />
     </label>
     <div class="profile-edit-dialog__row">
+      <label aria-label=${`${label} Organization Type`} class="label profile-edit-dialog__field">
+        Organization Type
+        <solid-ui-select
+          class="profile-edit-dialog__resume-organization-type-select"
+          name=${organizationTypeName}
+          id=${organizationTypeSelectId}
+          data-resume-organization-type-index=${String(index)}
+          .options=${RESUME_ORGANIZATION_TYPE_OPTIONS}
+          .value=${normalizeResumeOrganizationTypeValue(resumeRow?.orgType || '')}
+          .label=${''}
+          @change=${handleOrganizationTypeInput}
+        ></solid-ui-select>
+      </label>
       <label aria-label=${`${label} Organization Name`} class="label profile-edit-dialog__field">
         Company or Organization 
-        <input
-          class="input"
-          type="text"
+        <solid-ui-combobox
           name=${organizationName}
-          .value=${resumeRow?.orgName || ''}
+          data-resume-organization-index=${String(index)}
           required
-          data-contact-field="organizationName"
-          data-entry-node=${resumeRow?.entryNode || ''}
-          data-row-status=${resumeRow?.status || 'n/a'}
-          placeholder="Company or Organization"
-          autocomplete="organization"
-          inputmode="text"
-          @change=${handleResumeInput('orgName')}
-        />
-      </label>
-      <label aria-label=${`${label} Organization Type`} class="label profile-edit-dialog__field">
-        Organization Type
-        <select name=${organizationTypeName} id=${organizationTypeSelectId} @change=${handleOrganizationTypeInput} .value=${resumeRow?.orgType || ''}>
-          <option value="Corporation">Corporation</option>
-          <option value="EducationalOrganization">Educational Organization</option>
-          <option value="ResearchOrganization">Research Organization</option>
-          <option value="GovernmentOrganization">Government Organization</option>
-          <option value="NGO">NGO</option>
-          <option value="PerformingGroup">Performing Group</option>
-          <option value="Project">Project</option>
-          <option value="SportsOrganization">Sports Organization</option>
-          <option value="Other">Other</option>
-        </select>
+          @input=${handleOrganizationNameInput}
+          @change=${handleOrganizationNameChange}
+        ></solid-ui-combobox>
       </label>
     </div>  
     <div class="profile-edit-dialog__row">
@@ -388,35 +693,63 @@ function renderResumeInputRow({
       <label aria-label=${`Start Date ${displayIndex + 1}`} class="label profile-edit-dialog__field profile-edit-dialog__field--date-group">
         <span>Start Date</span>
         <div class="profile-edit-dialog__date-pair">
-          <select name=${startMonthInputName} id=${startMonthSelectId} aria-label=${startMonthLabel} @change=${handleStartMonthChange}>
-            ${renderMonthOptions(startMonthValue)}
-          </select>
-          <select name=${startYearInputName} id=${startYearSelectId} aria-label=${startYearLabel} @change=${handleStartYearChange}>
-            ${renderYearOptions(startYearText)}
-          </select>
+          <solid-ui-select
+            class="profile-edit-dialog__resume-date-select"
+            name=${startMonthInputName}
+            id=${startMonthSelectId}
+            aria-label=${startMonthLabel}
+            data-resume-date-kind="start-month"
+            data-resume-row-index=${String(index)}
+            .options=${getResumeDateSelectOptions('start-month', selectedYears, Boolean(resumeRow?.isCurrentRole))}
+            .value=${startMonthValue}
+            .label=${getResumeDateSelectLabel('start-month', resumeRow)}
+            @change=${handleStartMonthChange}
+          ></solid-ui-select>
+          <solid-ui-select
+            class="profile-edit-dialog__resume-date-select"
+            name=${startYearInputName}
+            id=${startYearSelectId}
+            aria-label=${startYearLabel}
+            data-resume-date-kind="start-year"
+            data-resume-row-index=${String(index)}
+            .options=${getResumeDateSelectOptions('start-year', selectedYears, Boolean(resumeRow?.isCurrentRole))}
+            .value=${startYearText}
+            .label=${getResumeDateSelectLabel('start-year', resumeRow)}
+            @change=${handleStartYearChange}
+          ></solid-ui-select>
         </div>
       </label>
       <label aria-label=${`End Date ${displayIndex + 1}`} class="label profile-edit-dialog__field profile-edit-dialog__field--date-group">
         <span>End Date</span>
         <div class="profile-edit-dialog__date-pair">
-          <select
+          <solid-ui-select
+            class=${`profile-edit-dialog__resume-date-select${resumeRow?.isCurrentRole ? ' profile-edit-dialog__resume-date-select--disabled' : ''}`}
             name=${endMonthInputName}
             id=${endMonthSelectId}
             aria-label=${endMonthLabel}
+            aria-disabled=${String(Boolean(resumeRow?.isCurrentRole))}
+            tabindex=${resumeRow?.isCurrentRole ? '-1' : '0'}
+            data-resume-date-kind="end-month"
+            data-resume-row-index=${String(index)}
+            .options=${getResumeDateSelectOptions('end-month', selectedYears, Boolean(resumeRow?.isCurrentRole))}
+            .value=${resumeRow?.isCurrentRole ? RESUME_PRESENT_MONTH_VALUE : endMonthValue}
+            .label=${getResumeDateSelectLabel('end-month', resumeRow)}
             @change=${handleEndMonthChange}
-            ?disabled=${Boolean(resumeRow?.isCurrentRole)}
-          >
-            ${renderMonthOptions(endMonthValue, resumeRow?.isCurrentRole ? 'Present' : 'Select Month')}
-          </select>
-          <select
+          ></solid-ui-select>
+          <solid-ui-select
+            class=${`profile-edit-dialog__resume-date-select${resumeRow?.isCurrentRole ? ' profile-edit-dialog__resume-date-select--disabled' : ''}`}
             name=${endYearInputName}
             id=${endYearSelectId}
             aria-label=${endYearLabel}
+            aria-disabled=${String(Boolean(resumeRow?.isCurrentRole))}
+            tabindex=${resumeRow?.isCurrentRole ? '-1' : '0'}
+            data-resume-date-kind="end-year"
+            data-resume-row-index=${String(index)}
+            .options=${getResumeDateSelectOptions('end-year', selectedYears, Boolean(resumeRow?.isCurrentRole))}
+            .value=${resumeRow?.isCurrentRole ? '' : endYearParsedText}
+            .label=${getResumeDateSelectLabel('end-year', resumeRow)}
             @change=${handleEndYearChange}
-            ?disabled=${Boolean(resumeRow?.isCurrentRole)}
-          >
-            ${renderYearOptions(endYearParsedText, resumeRow?.isCurrentRole ? '' : 'Select Year')}
-          </select>
+          ></solid-ui-select>
         </div>
       </label>
     </div>
@@ -486,16 +819,24 @@ function renderResumeEditTemplate(form, formState, rerender, viewerMode) {
     ${renderResumeSection(formState.resumeData, rerender)}
     ${viewerMode !== 'owner' ? (0, _litHtml.html)`<p class="profile-edit-dialog__login-message">${_texts.ownerLoginRequiredDialogMessageText}</p>` : null}
   `, form);
+  initializeResumeOrganizationTypeSelects(form, formState.resumeData);
+  initializeResumeOrganizationComboboxes(form, formState.resumeData);
+  initializeResumeDateSelects(form, formState.resumeData);
 }
 function captureResumeDialogRenderState(form) {
   const dialog = form.closest('dialog');
   const description = dialog?.querySelector('#modal-desc');
   const activeElement = form.ownerDocument.activeElement;
+  const activeTextField = activeElement instanceof HTMLInputElement || activeElement instanceof HTMLTextAreaElement ? activeElement : null;
   return {
     dialogScrollTop: dialog?.scrollTop || 0,
     descriptionScrollTop: description?.scrollTop || 0,
     activeId: activeElement?.id || '',
-    activeName: activeElement?.getAttribute('name') || ''
+    activeName: activeElement?.getAttribute('name') || '',
+    selectionStart: activeTextField?.selectionStart ?? null,
+    selectionEnd: activeTextField?.selectionEnd ?? null,
+    fieldScrollLeft: activeTextField?.scrollLeft || 0,
+    fieldScrollTop: activeTextField?.scrollTop || 0
   };
 }
 function restoreResumeDialogRenderState(form, state) {
@@ -512,22 +853,61 @@ function restoreResumeDialogRenderState(form, state) {
   if (!nextActive && escapedName) {
     nextActive = form.querySelector(`[name="${escapedName}"]`);
   }
-  if (nextActive && typeof nextActive.focus === 'function') {
-    nextActive.focus({
-      preventScroll: true
-    });
+  focusResumeFieldElement(nextActive, {
+    selectionStart: state.selectionStart,
+    selectionEnd: state.selectionEnd,
+    scrollLeft: state.fieldScrollLeft,
+    scrollTop: state.fieldScrollTop
+  });
+}
+function getResumeFocusableTarget(element) {
+  if (!element) return null;
+  if (element.tagName === 'SOLID-UI-COMBOBOX') {
+    const comboboxInput = element.shadowRoot?.querySelector('input');
+    if (comboboxInput) return comboboxInput;
   }
+  return element;
 }
-function focusResumeField(form, selector) {
-  const nextField = form.querySelector(selector);
-  if (!nextField || typeof nextField.focus !== 'function') return;
-  nextField.focus({
+function focusResumeFieldElement(element, options = {}) {
+  const focusTarget = getResumeFocusableTarget(element);
+  if (!focusTarget || typeof focusTarget.focus !== 'function') return;
+  const view = focusTarget.ownerDocument.defaultView;
+  const shouldAvoidFocus = Boolean(view?.matchMedia && (view.matchMedia('(pointer: coarse)').matches || view.matchMedia('(max-width: 640px)').matches));
+  if (shouldAvoidFocus) {
+    focusTarget.scrollIntoView({
+      block: 'nearest',
+      behavior: 'auto'
+    });
+    return;
+  }
+  focusTarget.focus({
     preventScroll: true
   });
-  if (nextField instanceof HTMLInputElement || nextField instanceof HTMLTextAreaElement) {
-    nextField.select();
+  if (focusTarget instanceof HTMLInputElement || focusTarget instanceof HTMLTextAreaElement) {
+    const selectionStart = options.selectionStart ?? focusTarget.value.length;
+    const selectionEnd = options.selectionEnd ?? selectionStart;
+    focusTarget.setSelectionRange(selectionStart, selectionEnd);
+    focusTarget.scrollLeft = options.scrollLeft ?? focusTarget.scrollLeft;
+    focusTarget.scrollTop = options.scrollTop ?? focusTarget.scrollTop;
+    requestAnimationFrame(() => {
+      focusTarget.scrollLeft = options.scrollLeft ?? focusTarget.scrollLeft;
+      focusTarget.scrollTop = options.scrollTop ?? focusTarget.scrollTop;
+    });
+  }
+  if (element?.tagName === 'SOLID-UI-COMBOBOX') {
+    const comboboxHost = element;
+    if (comboboxHost._closePopup) {
+      requestAnimationFrame(() => {
+        comboboxHost._closePopup?.();
+      });
+    }
   }
 }
+function focusResumeField(form, selector) {
+  const nextField = form.querySelector(selector);
+  if (!nextField) return;
+  focusResumeFieldElement(nextField);
+}
 function createResumeEditForm(resumeData, viewerMode) {
   const form = document.createElement('form');
   form.classList.add('profile__edit-form');
@@ -556,7 +936,8 @@ function createResumeEditForm(resumeData, viewerMode) {
       endDate: undefined,
       isCurrentRole: false,
       orgName: '',
-      orgType: '',
+      orgPublicId: '',
+      orgType: RESUME_ORGANIZATION_TYPE_OPTIONS[0].value,
       orgLocation: '',
       orgHomePage: '',
       description: '',
@@ -587,6 +968,11 @@ async function createResumeEditDialog(event, store, subject, resumeData, viewerM
     title: _texts.editResumeDialogTitleText,
     dom,
     form,
+    shouldCloseWithoutSave: () => {
+      syncResumeOrganizationRowsFromComboboxes(form, formState.resumeData);
+      const plan = (0, _rowState.summarizeRowOps)(formState.resumeData, rowHasContent);
+      return plan.create.length === 0 && plan.update.length === 0 && plan.remove.length === 0;
+    },
     headerAction: {
       type: 'button',
       label: '+ Add More',
@@ -596,14 +982,10 @@ async function createResumeEditDialog(event, store, subject, resumeData, viewerM
     submitLabel: _texts.dialogSubmitLabelText,
     cancelLabel: _texts.dialogCancelLabelText,
     validate: async () => {
+      syncResumeOrganizationRowsFromComboboxes(form, formState.resumeData);
       if (viewerMode !== 'owner') {
         return _texts.ownerLoginRequiredDialogMessageText;
       }
-      const plan = (0, _rowState.summarizeRowOps)(formState.resumeData, rowHasContent);
-      const hasChanges = plan.create.length > 0 || plan.update.length > 0 || plan.remove.length > 0;
-      if (!hasChanges) {
-        return 'No resume changes detected.';
-      }
       const validation = validateResumeBeforeSave(formState.resumeData);
       if (!validation.ok) {
         return validation.message || 'Please complete the required resume fields.';
@@ -611,13 +993,13 @@ async function createResumeEditDialog(event, store, subject, resumeData, viewerM
       return null;
     },
     onSave: async () => {
+      syncResumeOrganizationRowsFromComboboxes(form, formState.resumeData);
       const plan = (0, _rowState.summarizeRowOps)(formState.resumeData, rowHasContent);
       await (0, _mutations.processResumeMutations)(store, subject, plan);
       rerender();
     },
     formatSaveError: error => {
-      const message = error instanceof Error ? error.message : String(error);
-      return `${_texts.saveResumeUpdatesFailedPrefixText} ${message}`;
+      return error instanceof Error ? error.message : _texts.saveResumeUpdatesFailedMessageText;
     }
   });
   if (!result) return;