@asd20/ui-next 2.2.2 → 2.3.1

package/src/helpers/queryMessages.js

@@ -1,5 +1,8 @@
 import axios from 'axios'
 
+import { hasSearchProxyRuntime, resolveSearchProxyUrl } from './searchProxyUrl'
+import { normalizeBaseUrl, resolveRuntimeConfigValue } from './runtimeConfig'
+
 /**
  * Creates a Azure Search payload
  *
@@ -83,22 +86,58 @@ export default async function queryMessages({
   organizationIds = [],
   categories = [],
   channels = [],
+  destinationIds = [],
+  destinationTitle = [],
   tags = [],
+  isInLeadershipGroup = false,
   limit = 5,
   requireKeywords = false,
   indexName = 'messages-index',
+  requestUrl = '',
+  runtimeConfig = null,
+  searchKey = '',
+  apiVersion = '',
+  searchEndpoint = '',
+  endpoint = '',
 }) {
-  const env = {
-    searchKey:
-      process.env.VUE_APP_AZURE_SEARCH_MESSAGES_KEY ||
-      process.env.GRIDSOME_AZURE_MESSAGES_SEARCH_KEY,
-    apiVersion:
-      process.env.VUE_APP_AZURE_SEARCH_API_VERSION ||
-      process.env.GRIDSOME_AZURE_SEARCH_API_VERSION,
-    endpoint:
-      process.env.VUE_APP_AZURE_SEARCH_MESSAGES_ENDPOINT ||
-      process.env.GRIDSOME_AZURE_MESSAGES_SEARCH_ENDPOINT,
-  }
+  const resolvedSearchKey = resolveRuntimeConfigValue({
+    explicitValue: searchKey,
+    runtimeConfig,
+    runtimeConfigKeys: ['azureSearchMessagesKey', 'azureSearchKey'],
+    envKeys: [
+      'VUE_APP_AZURE_SEARCH_MESSAGES_KEY',
+      'GRIDSOME_AZURE_MESSAGES_SEARCH_KEY',
+      'VUE_APP_AZURE_SEARCH_KEY',
+      'GRIDSOME_AZURE_SEARCH_KEY',
+    ],
+  })
+  const resolvedApiVersion = resolveRuntimeConfigValue({
+    explicitValue: apiVersion,
+    runtimeConfig,
+    runtimeConfigKeys: ['azureSearchVersion'],
+    envKeys: [
+      'VUE_APP_AZURE_SEARCH_API_VERSION',
+      'GRIDSOME_AZURE_SEARCH_API_VERSION',
+    ],
+  })
+  const resolvedSearchEndpoint = resolveRuntimeConfigValue({
+    explicitValue: searchEndpoint || endpoint,
+    runtimeConfig,
+    runtimeConfigKeys: ['azureSearchMessagesEndpoint', 'azureSearchEndpoint'],
+    envKeys: [
+      'VUE_APP_AZURE_SEARCH_MESSAGES_ENDPOINT',
+      'GRIDSOME_AZURE_MESSAGES_SEARCH_ENDPOINT',
+      'VUE_APP_AZURE_SEARCH_ENDPOINT',
+      'GRIDSOME_AZURE_SEARCH_ENDPOINT',
+    ],
+  })
+  const resolvedRequestUrl =
+    typeof requestUrl === 'string' && requestUrl.trim()
+      ? requestUrl.trim()
+      : !resolvedSearchEndpoint &&
+        hasSearchProxyRuntime(runtimeConfig)
+      ? resolveSearchProxyUrl('messages', runtimeConfig)
+      : ''
 
   if (!keywords && requireKeywords)
     return {
@@ -106,29 +145,57 @@ export default async function queryMessages({
       facets: [],
     }
 
-  let { data } = await axios({
-    method: 'post',
-    headers: {
-      'api-key': env.searchKey,
-    },
-    params: {
-      'api-version': env.apiVersion,
-    },
-    url: `${env.endpoint}/indexes/${indexName}/docs/search`,
-    data: Object.assign(
-      {},
-      searchPayload({
-        keywords,
-        organizationIds,
-        categories,
-        channels,
-        tags,
-        enableFuzzySearch: true,
-        limit,
-      }),
-      { top: limit }
-    ),
-  })
+  if (
+    !resolvedRequestUrl &&
+    (!resolvedSearchEndpoint || !resolvedSearchKey || !resolvedApiVersion)
+  ) {
+    throw new Error(
+      'Azure Search or proxy configuration is required for queryMessages.'
+    )
+  }
+
+  const payload = {
+    keywords,
+    organizationIds,
+    destinationIds,
+    destinationTitle,
+    categories,
+    channels,
+    tags,
+    isInLeadershipGroup,
+    limit,
+    indexName,
+  }
+
+  const { data } = resolvedRequestUrl
+    ? await axios({
+        method: 'post',
+        url: resolvedRequestUrl,
+        data: payload,
+      })
+    : await axios({
+        method: 'post',
+        headers: {
+          'api-key': resolvedSearchKey,
+        },
+        params: {
+          'api-version': resolvedApiVersion,
+        },
+        url: `${normalizeBaseUrl(resolvedSearchEndpoint)}/indexes/${indexName}/docs/search`,
+        data: Object.assign(
+          {},
+          searchPayload({
+            keywords,
+            organizationIds,
+            categories,
+            channels,
+            tags,
+            enableFuzzySearch: true,
+            limit,
+          }),
+          { top: limit }
+        ),
+      })
 
   // Return results
   return {

package/src/helpers/queryPages.js

@@ -1,6 +1,9 @@
 import axios from 'axios'
 
-const NO_PAGE_RESULTS_FALLBACKS = [
+import { hasSearchProxyRuntime, resolveSearchProxyUrl } from './searchProxyUrl'
+import { resolveRuntimeConfigValue } from './runtimeConfig'
+
+export const NO_PAGE_RESULTS_FALLBACKS = [
   {
     id: 'calendar',
     slug: 'calendar',
@@ -106,6 +109,14 @@ export default async function queryPages({
   keywords = '',
   top = 25,
   requireKeywords = false,
+  organizations = [],
+  requestUrl = '',
+  runtimeConfig = null,
+  searchEndpoint = '',
+  endpoint = '',
+  searchKey = '',
+  apiVersion = '',
+  searchVersion = '',
 }) {
   if (!keywords && requireKeywords)
     return {
@@ -113,26 +124,82 @@ export default async function queryPages({
       facets: [],
     }
 
-  let { data } = await axios({
-    method: 'post',
-    headers: {
-      'api-key': process.env.AZURE_SEARCH_KEY,
-    },
-    params: {
-      'api-version': process.env.AZURE_SEARCH_VERSION,
-    },
-    url: `${process.env.AZURE_SEARCH_ENDPOINT}`,
-    data: Object.assign(
-      {},
-      searchPayload({
-        keywords,
-        enableFuzzySearch: true,
-      }),
-      {
-        top,
-      }
-    ),
+  const resolvedSearchKey = resolveRuntimeConfigValue({
+    explicitValue: searchKey,
+    runtimeConfig,
+    runtimeConfigKeys: ['azureSearchKey'],
+    envKeys: [
+      'AZURE_SEARCH_KEY',
+      'VUE_APP_AZURE_SEARCH_KEY',
+      'GRIDSOME_AZURE_SEARCH_KEY',
+    ],
+  })
+  const resolvedApiVersion = resolveRuntimeConfigValue({
+    explicitValue: apiVersion || searchVersion,
+    runtimeConfig,
+    runtimeConfigKeys: ['azureSearchVersion'],
+    envKeys: [
+      'AZURE_SEARCH_VERSION',
+      'VUE_APP_AZURE_SEARCH_API_VERSION',
+      'GRIDSOME_AZURE_SEARCH_API_VERSION',
+    ],
+  })
+  const resolvedSearchEndpoint = resolveRuntimeConfigValue({
+    explicitValue: searchEndpoint || endpoint,
+    runtimeConfig,
+    runtimeConfigKeys: ['azureSearchEndpoint'],
+    envKeys: [
+      'AZURE_SEARCH_ENDPOINT',
+      'VUE_APP_AZURE_SEARCH_ENDPOINT',
+      'GRIDSOME_AZURE_SEARCH_ENDPOINT',
+    ],
   })
+  const resolvedRequestUrl =
+    typeof requestUrl === 'string' && requestUrl.trim()
+      ? requestUrl.trim()
+      : !resolvedSearchEndpoint &&
+        hasSearchProxyRuntime(runtimeConfig)
+      ? resolveSearchProxyUrl('pages', runtimeConfig)
+      : ''
+
+  if (
+    !resolvedRequestUrl &&
+    (!resolvedSearchEndpoint || !resolvedSearchKey || !resolvedApiVersion)
+  ) {
+    throw new Error('Azure Search or proxy configuration is required for queryPages.')
+  }
+
+  const { data } = resolvedRequestUrl
+    ? await axios({
+        method: 'post',
+        url: resolvedRequestUrl,
+        data: {
+          keywords,
+          organizations,
+          top,
+        },
+      })
+    : await axios({
+        method: 'post',
+        headers: {
+          'api-key': resolvedSearchKey,
+        },
+        params: {
+          'api-version': resolvedApiVersion,
+        },
+        url: `${resolvedSearchEndpoint}`,
+        data: Object.assign(
+          {},
+          searchPayload({
+            keywords,
+            enableFuzzySearch: true,
+            organizations,
+          }),
+          {
+            top,
+          }
+        ),
+      })
 
   const pages = Array.isArray(data.value) ? data.value : []
   const resolvedPages = pages.length

package/src/helpers/runtimeConfig.js

@@ -0,0 +1,80 @@
+function isPlainObject(value) {
+  return Boolean(value) && typeof value === 'object' && !Array.isArray(value)
+}
+
+function normalizeConfigValue(value) {
+  return typeof value === 'string' ? value.trim() : value
+}
+
+function hasConfigValue(value) {
+  if (typeof value === 'string') {
+    return value.trim().length > 0
+  }
+
+  return value !== null && value !== undefined
+}
+
+export function resolvePublicRuntimeConfig(runtimeConfig = {}) {
+  if (!isPlainObject(runtimeConfig)) {
+    return {}
+  }
+
+  if (isPlainObject(runtimeConfig.public)) {
+    return runtimeConfig.public
+  }
+
+  return runtimeConfig
+}
+
+export function resolveWindowPublicRuntimeConfig() {
+  if (typeof window === 'undefined' || !window.__NUXT__) {
+    return {}
+  }
+
+  return resolvePublicRuntimeConfig(window.__NUXT__.config)
+}
+
+export function resolveRuntimeConfigValue({
+  explicitValue = null,
+  runtimeConfig = {},
+  runtimeConfigKeys = [],
+  envKeys = [],
+} = {}) {
+  const normalizedExplicitValue = normalizeConfigValue(explicitValue)
+  if (hasConfigValue(normalizedExplicitValue)) {
+    return normalizedExplicitValue
+  }
+
+  const sources = [
+    resolvePublicRuntimeConfig(runtimeConfig),
+    resolveWindowPublicRuntimeConfig(),
+  ]
+
+  for (const source of sources) {
+    for (const key of runtimeConfigKeys) {
+      const candidate = normalizeConfigValue(source[key])
+      if (hasConfigValue(candidate)) {
+        return candidate
+      }
+    }
+  }
+
+  if (typeof process !== 'undefined' && process && process.env) {
+    for (const key of envKeys) {
+      const candidate = normalizeConfigValue(process.env[key])
+      if (hasConfigValue(candidate)) {
+        return candidate
+      }
+    }
+  }
+
+  return null
+}
+
+export function normalizeBaseUrl(value) {
+  if (typeof value !== 'string') {
+    return ''
+  }
+
+  return value.trim().replace(/\/+$/, '')
+}

package/src/helpers/searchProxyUrl.js

@@ -0,0 +1,43 @@
+import { normalizeBaseUrl, resolveRuntimeConfigValue } from './runtimeConfig'
+
+const SEARCH_PROXY_PATHS = Object.freeze({
+  messages: '/api/search/messages',
+  pages: '/api/search/pages',
+  files: '/api/search/files',
+  events: '/api/search/events',
+})
+
+export function resolveSearchProxyPath(kind) {
+  return SEARCH_PROXY_PATHS[kind] || ''
+}
+
+export function hasSearchProxyRuntime(runtimeConfig = {}) {
+  const functionsEndpoint = resolveRuntimeConfigValue({
+    runtimeConfig,
+    runtimeConfigKeys: ['functionsEndpoint'],
+    envKeys: [],
+  })
+
+  if (functionsEndpoint) {
+    return true
+  }
+
+  return typeof window !== 'undefined' && !!window.__NUXT__
+}
+
+export function resolveSearchProxyUrl(kind, runtimeConfig = {}) {
+  const path = resolveSearchProxyPath(kind)
+
+  if (!path) {
+    throw new Error(`Unknown search proxy kind: ${String(kind)}`)
+  }
+
+  const functionsEndpoint = resolveRuntimeConfigValue({
+    runtimeConfig,
+    runtimeConfigKeys: ['functionsEndpoint'],
+    envKeys: ['FUNCTIONS_ENDPOINT', 'VUE_APP_FUNCTIONS_ENDPOINT'],
+  })
+  const baseUrl = normalizeBaseUrl(functionsEndpoint)
+
+  return baseUrl ? `${baseUrl}${path}` : path
+}

package/src/helpers/sendAccessibilityIssue.js

@@ -1,14 +1,38 @@
 import axios from 'axios'
 
+import { resolveRuntimeConfigValue } from './runtimeConfig'
+
 function issueIsValid(issue) {
   return !!issue.firstName && !!issue.lastName && !!issue.email && !!issue.issue
 }
 
-export default async function sendAccessibilityIssue(issue, endpoint, apiKey, authCode) {
+export default async function sendAccessibilityIssue(
+  issue,
+  endpoint,
+  apiKey,
+  authCode,
+  options = {}
+) {
   if (!issueIsValid(issue)) {
     throw new Error('The issue object is incomplete or invalid.')
   }
 
+  const resolvedOptions =
+    options && typeof options === 'object' && !Array.isArray(options)
+      ? options
+      : {
+          categoryId: options,
+        }
+  const categoryId = resolveRuntimeConfigValue({
+    explicitValue: resolvedOptions.categoryId,
+    runtimeConfig: resolvedOptions.runtimeConfig,
+    runtimeConfigKeys: ['happyFoxCategoryId'],
+    envKeys: ['HAPPYFOX_CATEGORY_ID'],
+  })
+  if (!categoryId) {
+    throw new Error('happyFoxCategoryId is required to send an accessibility issue.')
+  }
+
   const payload = {
     name: `${issue.firstName} ${issue.lastName}`,
     email: issue.email,
@@ -20,7 +44,7 @@ export default async function sendAccessibilityIssue(issue, endpoint, apiKey, au
       <p><strong>Mailing Address:</strong> ${issue.address || 'Not provided'}</p>
       <p><strong>Organization:</strong> ${issue.organization || 'Not provided'}</p>
     `,
-    category: Number(process.env.HAPPYFOX_CATEGORY_ID),
+    category: Number(categoryId),
   }
 
   try {

package/src/mixins/pageTemplateMixin.js

@@ -450,6 +450,9 @@ export default {
     this.desktop = window.innerWidth >= 1024
     window.addEventListener('resize', this.handleResize)
   },
+  beforeUnmount() {
+    window.removeEventListener('resize', this.handleResize)
+  },
   methods: {
     handleResize() {
       this.desktop = window.innerWidth >= 1024