sr-npm 1.7.532 → 1.7.534

package/.github/workflows/update-sites.yml

@@ -0,0 +1,27 @@
+name: Update Sites After Release Main
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+      
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  update-sites:
+    uses: psdevteamenterprise/ci-workflows/.github/workflows/publish-and-notify.yml@main
+    with:
+     sites_to_update: "[{repo: 'psdevteamenterprise/tests-site', secret: 'WIX_PS_API_KEY'},
+                        {repo: 'psdevteamenterprise/external-template', secret: 'WIX_SR_API_KEY'},
+                        {repo: 'psdevteamenterprise/internal', secret: 'WIX_SR_API_KEY'}]"
+    
+    secrets:
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      NPM_TOKEN: ${{ secrets.PS_NPM_TOKEN }}
+      GH_APP_ID: ${{ secrets.GH_APP_ID }}
+      GH_APP_PRIVATE_KEY: ${{ secrets.GH_APP_PRIVATE_KEY }}
+      WIX_PS_API_KEY: ${{ secrets.WIX_PS_API_KEY }}
+      WIX_SR_API_KEY: ${{ secrets.WIX_SR_API_KEY }}

package/backend/collectionConsts.js

@@ -23,13 +23,21 @@ const JOBS_COLLECTION_FIELDS = {
   REFER_FRIEND_LINK: 'referFriendLink',
   BRAND: 'brand',
   BRAND_REF: 'brandRef',
-  CUSTOM_FIELDS:'customFields',
+  CUSTOM_VALUES: 'customValues',
+
 }
 const AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION_FIELDS = {
   TITLE: 'title',
   COUNT: 'count',
   IMAGE: 'image',
 }
+const CUSTOM_VALUES_COLLECTION_FIELDS = {
+  TITLE: 'title',
+  CUSTOM_FIELD: 'customField',
+}
+const CUSTOM_FIELDS_COLLECTION_FIELDS = {
+  TITLE: 'title',
+}
 const BRANDS_COLLECTION_FIELDS = {
   TITLE: 'title',
   COUNT: 'count',
@@ -63,6 +71,7 @@ const COLLECTIONS_FIELDS = {
         {key:'language', type: 'TEXT'},
         {key:'remote', type: 'BOOLEAN'},
         {key:'jobDescription', type: 'OBJECT'},  
+        {key:'customValues', type: 'MULTI-REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CUSTOM_VALUES } } },
         {key:'cityText', type: 'TEXT'},
         {key:'applyLink', type: 'URL'},
         {key:'referFriendLink', type: 'URL'},     
@@ -70,7 +79,6 @@ const COLLECTIONS_FIELDS = {
         {key:'departmentref', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT } } },
         {key:'city', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CITIES } } },
         {key:'brandRef', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.BRANDS } } },
-        { key: 'customFields', type: 'ARRAY' },
         { key: 'image', type: 'IMAGE' },
     ],  
     TEMPLATE_TYPE: [
@@ -84,6 +92,13 @@ const COLLECTIONS_FIELDS = {
       {key:'title', type: 'TEXT'},
       { key: 'count', type: 'NUMBER' },
     ],
+    CUSTOM_VALUES: [
+      {key:'title', type: 'TEXT'},
+      {key:'customField', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CUSTOM_FIELDS } } },
+    ],
+    CUSTOM_FIELDS: [
+      {key:'title', type: 'TEXT'},
+    ],
   };
 
 
@@ -97,22 +112,6 @@ const COLLECTIONS_FIELDS = {
     SMART_TOKEN: 'x-smarttoken',
     DESIRED_BRAND: 'desiredBrand',
   }
-
-  const URL_PARAMS = {
-    DEPARTMENT: "Department",
-    LOCATION: "Location",
-    BRAND: "Brand",
-  }
-  const DROPDOWN_IDS = {
-    DEPARTMENT: '#dropdownDepartment',
-    LOCATION: '#dropdownLocation',
-    BRAND: '#dropdownBrand',
-  } 
-  const DROPDOWN_COLLECTIONS = {
-    DEPARTMENT: 'AmountOfJobsPerDepartment',
-    LOCATION: 'cities',
-    BRAND: 'Brands',
-  }
   
 
   module.exports = {
@@ -122,9 +121,9 @@ const COLLECTIONS_FIELDS = {
     AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION_FIELDS,
     CITIES_COLLECTION_FIELDS,
     BRANDS_COLLECTION_FIELDS,
+    CUSTOM_FIELDS_COLLECTION_FIELDS,
+    CUSTOM_VALUES_COLLECTION_FIELDS,
     TEMPLATE_TYPE,
     TOKEN_NAME,
-    URL_PARAMS,
-    DROPDOWN_IDS,
-    DROPDOWN_COLLECTIONS,
+    
 };

package/backend/data.js

@@ -28,6 +28,7 @@ function validatePosition(position) {
 
 async function filterBasedOnBrand(positions) {
   try{
+
   const desiredBrand = await getTokenFromCMS(TOKEN_NAME.DESIRED_BRAND);
   validateSingleDesiredBrand(desiredBrand);
   console.log("filtering positions based on brand: ", desiredBrand);
@@ -51,23 +52,21 @@ function validateSingleDesiredBrand(desiredBrand) {
     throw new Error("Desired brand must be a single brand");
   }
 }
-
-function addCustomFields(basicJob, position) {
+function getCustomFieldsAndValuesFromPosition(position,customFields) {
   const customFieldsArray = Array.isArray(position?.customField) ? position.customField : [];
-  const customFields = {};
   for (const field of customFieldsArray) {
     if(field.fieldLabel==="Country" || field.fieldLabel==="Department") continue; //country and department are not custom fields, they are already in the job object
     const label = field.fieldLabel==="Brands" ? "brand" : field.fieldLabel
     const key = normalizeString(label);
     const value = field.valueLabel
-    customFields[key] = value;
+    customFields[key] ? customFields[key].add(value) : customFields[key]=new Set([value])
   }
-  return { ...basicJob, ...customFields,customFieldsNames:Object.keys(customFields) };
+  
 }
-
 async function saveJobsDataToCMS() {
   const positions = await fetchPositionsFromSRAPI();
   const sourcePositions = await filterBasedOnBrand(positions);
+  const customFields = {}
   // bulk insert to jobs collection without descriptions first
   const jobsData = sourcePositions.map(position => {
     const basicJob = {
@@ -90,13 +89,13 @@ async function saveJobsDataToCMS() {
       country: position.location?.country || '',
       remote: position.location?.remote || false,
       language: position.language?.label || '',
-     // brand: getBrand(position.customField),
+      brand: getBrand(position.customField),
       jobDescription: null, // Will be filled later
     };
-    
-    return addCustomFields(basicJob,position)
+    getCustomFieldsAndValuesFromPosition(position,customFields);
+    return basicJob;
   });
-
+  console.log("customFields: ", customFields);
   // Sort jobs by title (ascending, case-insensitive, numeric-aware)
   jobsData.sort((a, b) => {
     const titleA = a.title || '';
@@ -341,7 +340,9 @@ async function createCollections() {
   createCollectionIfMissing(COLLECTIONS.CITIES, COLLECTIONS_FIELDS.CITIES),
   createCollectionIfMissing(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, COLLECTIONS_FIELDS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
   createCollectionIfMissing(COLLECTIONS.SECRET_MANAGER_MIRROR, COLLECTIONS_FIELDS.SECRET_MANAGER_MIRROR),
-  createCollectionIfMissing(COLLECTIONS.BRANDS, COLLECTIONS_FIELDS.BRANDS)
+  createCollectionIfMissing(COLLECTIONS.BRANDS, COLLECTIONS_FIELDS.BRANDS),
+  createCollectionIfMissing(COLLECTIONS.CUSTOM_VALUES, CUSTOM_VALUES_COLLECTION_FIELDS.CUSTOM_VALUES),
+  createCollectionIfMissing(COLLECTIONS.CUSTOM_FIELDS, CUSTOM_FIELDS_COLLECTION_FIELDS.CUSTOM_FIELDS)
 ]);
   console.log("finished creating Collections");
 }
@@ -353,7 +354,6 @@ async function aggregateJobs() {
     aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.CITY_TEXT, collection: COLLECTIONS.CITIES }),
     aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.BRAND, collection: COLLECTIONS.BRANDS })
   ]);
-
   console.log("finished aggregating jobs");
 }
 
@@ -367,16 +367,16 @@ async function referenceJobs() {
 
 async function syncJobsFast() {
   console.log("Syncing jobs fast");
-  // await createCollections();
+  await createCollections();
   // await clearCollections();
   // await fillSecretManagerMirror();
   console.log("saving jobs data to CMS");
   await saveJobsDataToCMS();
-  console.log("saved jobs data to CMS successfully");
+  // console.log("saved jobs data to CMS successfully");
   // console.log("saving jobs descriptions and location apply url to CMS");
   // await saveJobsDescriptionsAndLocationApplyUrlToCMS();
   // console.log("saved jobs descriptions and location apply url to CMS successfully");
- //  await aggregateJobs();
+  // await aggregateJobs();
   // await referenceJobs();
   // console.log("syncing jobs fast finished successfully");
 }

package/backend/queries.js

@@ -18,16 +18,7 @@ async function getPositionsByField(field, value) {
     .then(result => result.items);
 }
 
-async function getCustomFieldKeys() {
-  return wixData
-    .query(COLLECTIONS.JOBS)
-    .eq("title", "bayan - custom field 3")
-    .find()
-    .then(result => result.items[0].customFieldsNames);
-}
-
 module.exports = {
   getAllPositions,
   getPositionsByField,
-  getCustomFieldKeys
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.7.532",
+  "version": "1.7.534",
   "description": "",
   "main": "index.js",
   "scripts": {

package/pages/careersPage.js

@@ -1,9 +1,9 @@
-const { getAllPositions,getCustomFieldKeys } = require('../backend/queries');
+const { getAllPositions } = require('../backend/queries');
 const {wixData} = require('wix-data');
 const { window } = require('@wix/site-window');
 const { query,queryParams,onChange} = require("wix-location-frontend");
 const { location } = require("@wix/site-location");
-const { COLLECTIONS, URL_PARAMS, DROPDOWN_IDS, DROPDOWN_COLLECTIONS } = require('../backend/collectionConsts');
+const { COLLECTIONS } = require('../backend/collectionConsts');
 
 const {
     debounce,
@@ -22,43 +22,29 @@ const {
   let queryLocationVar;
   let queryJobTypeVar;
   let queryBrandVar;
-  let queryCustomFields={};
   let searchInputBlurredFirstTime=true;
   let deletedParam=false;
-async function careersPageOnReady(_$w,thisObject,queryParams,customFieldsDropdownObject=null) {
+async function careersPageOnReady(_$w,thisObject,queryParams) {
 console.log("queryParams: ", queryParams);
-console.log("customFieldsDropdownObject: ", customFieldsDropdownObject)
-await retrieveQueryParams(queryParams,customFieldsDropdownObject);
+const { page, keyWord, department, location,jobType,brand } = queryParams;
+queryPageVar=page;
+queryKeyWordVar=keyWord;
+queryDepartmentVar=department;
+queryLocationVar=location;
+queryJobTypeVar=jobType;
+queryBrandVar=brand;
 thisObjectVar=thisObject;
 allJobs=await getAllPositions();
 await activateAutoLoad(_$w);
 await bind(_$w);
-await init(_$w,customFieldsDropdownObject);
+await init(_$w);
 await handleBrandDropdown(_$w);
 await handleUrlParams(_$w);
 
 
 }
 
-async function retrieveQueryParams(queryParams,customFieldsDropdownObject=null){
-const { page, keyWord, department, location,jobType,brand } = queryParams;
-queryPageVar=page;
-queryKeyWordVar=keyWord;
-queryDepartmentVar=department;
-queryLocationVar=location;
-queryJobTypeVar=jobType;
-queryBrandVar=brand;
-if(customFieldsDropdownObject){
-const customFieldKeys=Object.keys(customFieldsDropdownObject);
-console.log("customFieldKeys: ", customFieldKeys)
-for(const customFieldKey of customFieldKeys)
-{
-    queryCustomFields[customFieldKey]={elementId:customFieldsDropdownObject[customFieldKey], field:customFieldKey, queryParamValue:queryParams[customFieldKey],queryParamKey:customFieldKey}
-}
-console.log("queryCustomFields",queryCustomFields)
-}
-}
-
+  
 function activateAutoLoad(_$w)
 {
     _$w("#jobsDataset").onReady(() => {
@@ -114,24 +100,16 @@ async function handleUrlParams(_$w) {
         await handlePageParam(_$w);    
     }
     if (queryDepartmentVar) {
-        await handleGivenURLParam(_$w,URL_PARAMS.DEPARTMENT,queryDepartmentVar);
-        //await handleDepartmentParam(_$w,queryDepartmentVar);
+        await handleDepartmentParam(_$w,queryDepartmentVar);
     }
     if (queryLocationVar) {
-       // await handleLocationParam(_$w,queryLocationVar);
-       await handleGivenURLParam(_$w,URL_PARAMS.LOCATION,queryLocationVar);
+        await handleLocationParam(_$w,queryLocationVar);
     }
     if (queryJobTypeVar) {
         await handleJobTypeParam(_$w,queryJobTypeVar);
     }
     if (queryBrandVar && _$w('#dropdownBrand').isVisible) { //if it is not visible, ignore it
-        //await handleBrandParam(_$w,queryBrandVar);
-        await handleGivenURLParam(_$w,URL_PARAMS.BRAND,queryBrandVar);
-    }
-    if (queryCustomFields) {
-        for(const customFieldKey of Object.keys(queryCustomFields)){
-            await handleGivenURLParam(_$w,customFieldKey,queryCustomFields[customFieldKey].queryParamValue);
-        }
+        await handleBrandParam(_$w,queryBrandVar);
     }
     await applyFilters(_$w, true); // Skip URL update since we're handling initial URL params
 }
@@ -191,7 +169,7 @@ async function bind(_$w) {
 
 }
 
-function init(_$w,customFieldsDropdownObject=null) {
+function init(_$w) {
     const debouncedSearch = debounce(()=>applyFilters(_$w), 400,thisObjectVar);
     _$w('#searchInput').onInput(debouncedSearch);
     _$w('#searchInput').onBlur(()=>{
@@ -205,14 +183,6 @@ function init(_$w,customFieldsDropdownObject=null) {
         console.log("dropdown onChange is triggered");
         applyFilters(_$w);
     });
-    if (customFieldsDropdownObject){
-        for(const customFieldKey of Object.keys(customFieldsDropdownObject)){
-            _$w(customFieldsDropdownObject[customFieldKey]).onChange(()=>{
-                console.log("custom field onChange is triggered");
-                applyFilters(_$w);
-            }); 
-        }
-    }
 	_$w('#resetFiltersButton, #clearSearch').onClick(()=>resetFilters(_$w));
 
 	_$w('#openFiltersButton').onClick(()=>{
@@ -279,27 +249,17 @@ async function handleBackAndForth(_$w){
         
 }
 
-async function applyCustomFieldFilters(filters) {
-    for(const customFieldKey of Object.keys(queryCustomFields)){
-        filters.push({ field: customFieldKey, searchTerm: queryCustomFields[customFieldKey] });
-    }
-}
-
 async function applyFilters(_$w, skipUrlUpdate = false) {
     console.log("applying filters");
 	const dropdownFiltersMapping = [
-		{ elementId: '#dropdownDepartment', field: 'department', value: _$w('#dropdownDepartment').value,queryParamKey:"department" },
-		{ elementId: '#dropdownLocation', field: 'cityText', value: _$w('#dropdownLocation').value,queryParamKey:"location" },
-		{ elementId: '#dropdownJobType', field: 'remote', value: _$w('#dropdownJobType').value,queryParamKey:"jobType" },
-		{ elementId: '#dropdownBrand', field: 'brand', value: _$w('#dropdownBrand').value,queryParamKey:"brand" },
-		{ elementId: '#searchInput', field: 'title', value: _$w('#searchInput').value,queryParamKey:"keyWord" }
+		{ elementId: '#dropdownDepartment', field: 'department', value: _$w('#dropdownDepartment').value },
+		{ elementId: '#dropdownLocation', field: 'cityText', value: _$w('#dropdownLocation').value },
+		{ elementId: '#dropdownJobType', field: 'remote', value: _$w('#dropdownJobType').value},
+		{ elementId: '#dropdownBrand', field: 'brand', value: _$w('#dropdownBrand').value},
+		{ elementId: '#searchInput', field: 'title', value: _$w('#searchInput').value }
 		];
-    //adding custom field filters to the dropdownFiltersMapping
-    for(const customFieldKey of Object.keys(queryCustomFields)){
-        dropdownFiltersMapping.push({ elementId: queryCustomFields[customFieldKey].elementId, field: queryCustomFields[customFieldKey].field, value: _$w(queryCustomFields[customFieldKey].elementId).value,queryParamKey:queryCustomFields[customFieldKey].queryParamKey });
-    }
     console.log("dropdownFiltersMapping: ", dropdownFiltersMapping);
- 
+    
 
 
 	let filters = [];
@@ -318,29 +278,23 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
                 if(filter.field === 'title'){
                     queryParams.add({ keyWord: filter.value });
                 }
-                else{
-                    if(filter.field === 'remote'){
-                        if(filter.value === 'true'){
-                            queryParams.add({ jobType: encodeURIComponent("remote") });
-                        }
-                        else{
-                            queryParams.add({ jobType: encodeURIComponent("onsite") });
-                        }
+                if(filter.field === 'department'){
+                    queryParams.add({ department: encodeURIComponent(filter.value) });
+                }
+                if(filter.field === 'cityText'){
+                    queryParams.add({ location:  encodeURIComponent(filter.value) });
+                }
+                if(filter.field === 'remote'){
+                    if(filter.value === 'true'){
+                        queryParams.add({ jobType: encodeURIComponent("remote") });
                     }
                     else{
-                        queryParams.add({ [filter.queryParamKey] : encodeURIComponent(filter.value) });
+                        queryParams.add({ jobType: encodeURIComponent("onsite") });
                     }
                 }
-                // if(filter.field === 'department'){
-                //     queryParams.add({ department: encodeURIComponent(filter.value) });
-                // }
-                // if(filter.field === 'cityText'){
-                //     queryParams.add({ location:  encodeURIComponent(filter.value) });
-                // }
-     
-                // if(filter.field === 'brand'){
-                //     queryParams.add({ brand: encodeURIComponent(filter.value) });
-                // }
+                if(filter.field === 'brand'){
+                    queryParams.add({ brand: encodeURIComponent(filter.value) });
+                }
             }
 			if(filter.field === 'remote') {	
 				value = filter.value === 'true';
@@ -351,32 +305,28 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
 		}
     else{
         if (!skipUrlUpdate) {
-            queryParams.remove([filter.queryParamKey]);
-            // if(filter.field === 'title'){
-            //     queryParams.remove(["keyWord" ]);
-            // }
-            // if(filter.field === 'department'){
-            //     console.log("removing department from url")
-            //     queryParams.remove(["department" ]);
-            // }
-            // if(filter.field === 'cityText'){
-            //     console.log("removing location from url")
-            //     queryParams.remove(["location" ]);
-            // }
-            // if(filter.field === 'remote'){
-            //     console.log("removing jobType from url")
-            //     queryParams.remove(["jobType" ]);
-            // }
-            // if(filter.field === 'brand'){
-            //     console.log("removing brand from url")
-            //     queryParams.remove(["brand" ]);
-            // }
+            if(filter.field === 'title'){
+                queryParams.remove(["keyWord" ]);
+            }
+            if(filter.field === 'department'){
+                console.log("removing department from url")
+                queryParams.remove(["department" ]);
+            }
+            if(filter.field === 'cityText'){
+                console.log("removing location from url")
+                queryParams.remove(["location" ]);
+            }
+            if(filter.field === 'remote'){
+                console.log("removing jobType from url")
+                queryParams.remove(["jobType" ]);
+            }
+            if(filter.field === 'brand'){
+                console.log("removing brand from url")
+                queryParams.remove(["brand" ]);
+            }
         }
     }
 	});
-
-    //applyCustomFieldFilters(filters);
-    console.log("dropdownFiltersMapping after applying filters: ", dropdownFiltersMapping);
 	
 	const filter = await getFilter(filters, 'and');
     await _$w('#jobsDataset').setFilter(filter);
@@ -398,9 +348,6 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
 
 async function resetFilters(_$w) {
 	_$w('#searchInput, #dropdownDepartment, #dropdownLocation, #dropdownJobType, #dropdownBrand').value = '';
-    for(const customFieldKey of Object.keys(queryCustomFields)){
-        _$w(queryCustomFields[customFieldKey].elementId).value = '';
-    }
 
     await _$w('#jobsDataset').setFilter(wixData.filter());
     await _$w('#jobsDataset').refresh();
@@ -410,9 +357,7 @@ async function resetFilters(_$w) {
 	_$w('#resetFiltersButton').disable();
 
     queryParams.remove(["keyWord", "department","page","location","jobType","brand"]);
-    for(const customFieldKey of Object.keys(queryCustomFields)){
-        queryParams.remove([queryCustomFields[customFieldKey].queryParamKey]);
-    }
+    
 
 	await updateCount(_$w);
     console.log("reseting map markers");
@@ -427,33 +372,16 @@ async function updateCount(_$w) {
 	return count;
 }
 
-async function handleGivenURLParam(_$w,param,value,isCustomField=false) {
-    const paramValue = decodeURIComponent(value);
-    let dropdownOptions = _$w(DROPDOWN_IDS[param]).options;
-    console.log("dropdown options:", dropdownOptions);
-    let optionsFromCMS;
-    if(!isCustomField){
-        optionsFromCMS=await wixData.query(DROPDOWN_COLLECTIONS[param]).find();
-        if(dropdownOptions.length!==optionsFromCMS.items.length+1){
-            fixDropdownOptions(DROPDOWN_IDS[param],optionsFromCMS, _$w);
-        }
-    }
-    const option=_$w(DROPDOWN_IDS[param]).options.find(option => option.value.toLowerCase() === paramValue.toLowerCase())
-    if(option){
-        _$w(DROPDOWN_IDS[param]).value = option.value;
-    }
-    else{
-        console.warn("param value not found in dropdown options");
-        queryParams.remove([param]);
-    }
-}
-
 async function handleDepartmentParam(_$w,department) {
     const departmentValue = decodeURIComponent(department);
+    
+        
+    
     let dropdownOptions = _$w('#dropdownDepartment').options;
     console.log("dropdown options:", dropdownOptions);
     const optionsFromCMS=await wixData.query("AmountOfJobsPerDepartment").find();
     //+1 because of the "All" option
+
     if(dropdownOptions.length!==optionsFromCMS.items.length+1){
         fixDropdownOptions('#dropdownDepartment',optionsFromCMS, _$w);
     }