architwin 1.0.98 → 1.1.2

package/lib/atwinui/components/toolbar/index.js

@@ -12,7 +12,7 @@ import { renderTagMessagingPane } from "./tagMessagingPane";
 import { renderThemePane, setActiveThemeCard } from "./themePane";
 import { setActiveCard, setActiveLibraryCard, clearActiveCard, clearActiveLibraryCard } from "./card";
 import { renderRecepientOptions, renderTagMessages, createTagMessage, setTagMessagingDetails } from "./tagMessagingPane";
-import { clearTagFormDropdown } from "./tagFormPane";
+import { clearTagFormDropdown, clearTagFilterDropdown } from "./tagFormPane";
 import { renderModal, toggleModal } from "./modal";
 import { renderModelControlPane, toggleModelControl } from "./modelControlsPane";
 import { getURLParams } from "../../../utils";
@@ -99,4 +99,4 @@ function renderToolbarUI(payload) {
     tagMessagingPane.style.display = 'none';
     themePane.style.display = 'none';
 }
-export { actionBar, tagFormMode, selectedTag, renderToolbarUI, renderObjectCards, setActiveMenu, clearActiveMenu, setActiveActionBtn, renderLibraryCards, renderTags, getTagFormData, renderTagRow, addClickEventToTagRow, setTagCategoriesOption, setActiveThemeCard, setActiveCard, setActiveLibraryCard, clearActiveCard, clearActiveLibraryCard, removeObjectCard, renderRecepientOptions, renderTagMessages, createTagMessage, renderCategoryDropdownOptions, toggleDropdown, setTagLink, getTagLink, setTagMessagingDetails, clearTagFormDropdown, getObjectListStatus, toggleModal, toggleModelControl };
+export { actionBar, tagFormMode, selectedTag, renderToolbarUI, renderObjectCards, setActiveMenu, clearActiveMenu, setActiveActionBtn, renderLibraryCards, renderTags, getTagFormData, renderTagRow, addClickEventToTagRow, setTagCategoriesOption, setActiveThemeCard, setActiveCard, setActiveLibraryCard, clearActiveCard, clearActiveLibraryCard, removeObjectCard, renderRecepientOptions, renderTagMessages, createTagMessage, renderCategoryDropdownOptions, toggleDropdown, setTagLink, getTagLink, setTagMessagingDetails, clearTagFormDropdown, clearTagFilterDropdown, getObjectListStatus, toggleModal, toggleModelControl };

package/lib/atwinui/components/toolbar/menuBar.js

@@ -1,9 +1,10 @@
 import { _mpConfig } from "../../../architwin";
+import log from 'loglevel';
 export let activeMenu;
 export let isObjectListEnabled = true;
 export function renderMenuBar(iFrame) {
     if (!iFrame) {
-        console.error(`Could not find target iFrame`);
+        log.error(`Could not find target iFrame`);
         return;
     }
     const menuBarElement = document.createElement('div');
@@ -14,10 +15,10 @@ export function renderMenuBar(iFrame) {
     if (_mpConfig.toolbarConfig && _mpConfig.toolbarConfig.menuItems && _mpConfig.toolbarConfig.menuItems.meeting) {
         isMeetingEnabled = _mpConfig.toolbarConfig.menuItems.meeting;
     }
-    console.log("__@ isMeetingEnabled: ", isMeetingEnabled);
+    log.info("__@ isMeetingEnabled: ", isMeetingEnabled);
     if (_mpConfig.toolbarConfig && _mpConfig.toolbarConfig.menuItems && _mpConfig.toolbarConfig.menuItems.models !== undefined) {
         isObjectListEnabled = _mpConfig.toolbarConfig.menuItems.models;
-        console.log("__@ isObjectListEnabled: ", isObjectListEnabled);
+        log.info("__@ isObjectListEnabled: ", isObjectListEnabled);
     }
     menuBarElement.innerHTML = `
     <div class="at_sidebar_button_icon">
@@ -42,10 +43,10 @@ export function renderMenuBar(iFrame) {
     return menuBarElement;
 }
 export function setActiveMenu(id) {
-    console.log("setActiveMenu id: ", id);
+    log.info("setActiveMenu id: ", id);
     const target = document.getElementById(id);
     if (!target) {
-        console.error("Target card does not exist in DOM");
+        log.error("Target card does not exist in DOM");
         return;
     }
     const parent = target.parentElement;
@@ -58,12 +59,12 @@ export function setActiveMenu(id) {
         case 'at-theme-picker-btn':
             if (parent.classList.contains('at_sidebar_button_icon_active')) {
                 // remove
-                console.log("removing active...");
+                log.info("removing active...");
                 parent.classList.remove('at_sidebar_button_icon_active');
             }
             else {
                 // activate
-                console.log("setting active...");
+                log.info("setting active...");
                 parent.classList.add('at_sidebar_button_icon_active');
             }
             break;
@@ -85,15 +86,15 @@ export function setActiveMenu(id) {
 }
 export function clearActiveMenu(id) {
     var _a, _b;
-    console.log("clearActiveMenu: ", id);
+    log.info("clearActiveMenu: ", id);
     if (id != 'at-minimap-btn' && activeMenu) {
         // get child id
         const activeChildId = (_b = (_a = activeMenu.querySelector('.mdi')) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : undefined;
-        console.log("activeChildId: ", activeChildId);
+        log.info("activeChildId: ", activeChildId);
         // check if active menu and target menu id are the same
         // if true do not set inactive otherwise, remove
         if (id != activeChildId) {
-            console.log("clearActiveMenu removing active...");
+            log.info("clearActiveMenu removing active...");
             activeMenu.classList.remove('at_sidebar_button_icon_active');
             activeMenu = undefined;
         }

package/lib/atwinui/components/toolbar/tagFormPane.d.ts

@@ -15,3 +15,4 @@ export declare function toggleDropdown(elementId: string): void;
 export declare function renderCategoryDropdownOptions(elementId: string, items: Array<ITagCategory>, toggleId?: string): void;
 export declare function renderSubcategoryDropdownOptions(elementId: string, items: Array<ITagCategory>): void;
 export declare function clearTagFormDropdown(): void;
+export declare function clearTagFilterDropdown(): void;

package/lib/atwinui/components/toolbar/tagFormPane.js

@@ -25,8 +25,8 @@ export function renderTagFormPane() {
     <div class="at_form_container at_h-min-65">
         <div class="at_field at_flex_column" style="${_tagCategories ? '' : 'display: none;'}">
             <label for="">${i18n.t('Category')}</label>
-            <div class="at_dropdown" id="at-custom-category-dropdown" data-cy="at-custom-category-dropdown">
-                <div class="at_flex at_flex_row at_space_between">    
+            <div  id="at-custom-category-dropdown" data-cy="at-custom-category-dropdown">
+                <div id="at-category-dropdown" class="at_dropdown at_flex at_flex_row at_space_between">    
                     <div class="at_dropdown_toggle" id="at-category-dropdown-toggle" data-cy="at-category-dropdown-toggle">${i18n.t('NoSelection')}</div>
                     <span class="mdi mdi-triangle-down at_chevron" id="at-category-chevron" data-cy="at-category-chevron"></span>
                 </div>
@@ -39,10 +39,10 @@ export function renderTagFormPane() {
         </div>
         <div class="at_field at_flex_column" style="${_tagCategories ? '' : 'display: none;'}">
             <label for="">${i18n.t('Subcategory')}</label>
-            <div class="at_dropdown" id="at-custom-subcategory-dropdown" data-cy="at-custom-subcategory-dropdown">
-                <div class="at_flex at_flex_row at_space_between">    
-                <div class="at_dropdown_toggle" id="at-subcategory-dropdown-toggle" data-cy="at-subcategory-dropdown-toggle">${i18n.t('NoSelection')}</div>
-                <span class="mdi mdi-triangle-down at_chevron" id="at-subcategory-chevron" data-cy="at-subcategory-chevron"></span>
+            <div id="at-custom-subcategory-dropdown" data-cy="at-custom-subcategory-dropdown">
+                <div id="at-subcategory-dropdown" class=" at_dropdown at_flex at_flex_row at_space_between">    
+                    <div class="at_dropdown_toggle" id="at-subcategory-dropdown-toggle" data-cy="at-subcategory-dropdown-toggle">${i18n.t('NoSelection')}</div>
+                    <span class="mdi mdi-triangle-down at_chevron" id="at-subcategory-chevron" data-cy="at-subcategory-chevron"></span>
                 </div>
                 <div style="position:absolute;">
                     <div class="at_dropdown_options" id="at-subcategory-options" data-cy="at-subcategory-options">
@@ -127,8 +127,8 @@ export function initFormData(tagId) {
         tagDescriptionInput.value = '';
         tagEmbedInput.value = '';
     }
-    const categoryChevron = document.getElementById('at-category-chevron');
-    const subcategoryChevron = document.getElementById('at-subcategory-chevron');
+    const categoryChevron = document.getElementById('at-category-dropdown');
+    const subcategoryChevron = document.getElementById('at-subcategory-dropdown');
     if (categoryChevron) {
         if (isChevronEventAdded == false) {
             categoryChevron.addEventListener('click', () => {
@@ -155,8 +155,8 @@ function setInputElements() {
     tagNameInput = document.getElementById('at-tag-name-input');
     tagDescriptionInput = document.getElementById('at-tag-description-input');
     tagEmbedInput = document.getElementById('at-tag-embed-input');
-    tagCategoryDropdown = document.getElementById('at-category-dropdown');
-    tagSubcategoryDropdown = document.getElementById('at-subcategory-dropdown');
+    // tagCategoryDropdown = document.getElementById('at-category-dropdown') as HTMLSelectElement;
+    // tagSubcategoryDropdown = document.getElementById('at-subcategory-dropdown') as HTMLSelectElement;
 }
 export function getTagFormData() {
     if (!tagNameInput) {
@@ -447,6 +447,38 @@ export function clearTagFormDropdown() {
     noSelection.innerHTML = `
         <span class="mdi mdi-circle-slice-1"></span> ${i18n.t('NoSelection')}
     `;
-    selectOption(noSelection, 'at-category-dropdown-toggle', true);
-    selectOption(noSelection, 'at-subcategory-dropdown-toggle', true);
+    let catSkipToggle = true;
+    let subcatSkipToggle = true;
+    let cat = document.getElementById('at-category-options');
+    if (cat.classList.contains('open')) {
+        catSkipToggle = false;
+    }
+    selectOption(noSelection, 'at-category-dropdown-toggle', catSkipToggle);
+    let subcat = document.getElementById('at-subcategory-options');
+    if (subcat.classList.contains('open')) {
+        subcatSkipToggle = false;
+    }
+    selectOption(noSelection, 'at-subcategory-dropdown-toggle', subcatSkipToggle);
+}
+//use this if need to clear Tag List Filter Dropdown
+export function clearTagFilterDropdown() {
+    console.log("clearTagFilterDropdown()");
+    const noSelection = document.createElement('div');
+    noSelection.classList.add('at_option');
+    noSelection.setAttribute('category-uuid', '');
+    noSelection.innerHTML = `
+        <span class="mdi mdi-circle-slice-1"></span> ${i18n.t('NoSelection')}
+    `;
+    let catSkipToggle = true;
+    let subcatSkipToggle = true;
+    let catFilter = document.getElementById('at-category-filter-options');
+    if (catFilter.classList.contains('open')) {
+        catSkipToggle = false;
+    }
+    selectOption(noSelection, 'at-category-filter-dropdown-toggle', catSkipToggle);
+    let subcatFilter = document.getElementById('at-subcategory-filter-options');
+    if (subcatFilter.classList.contains('open')) {
+        subcatSkipToggle = false;
+    }
+    selectOption(noSelection, 'at-subcategory-filter-dropdown-toggle', subcatSkipToggle);
 }

package/lib/atwinui/components/toolbar/tagListPane.js

@@ -37,8 +37,8 @@ export function renderTagListPane() {
         <div class="at_form_container at_h-min-65 at_tag_list_pane">
             <div class="at_field at_flex_column" style="${_tagCategories ? '' : 'display: none;'}">
                 <label for="">${i18n.t('Category')}</label>
-                <div class="at_dropdown" id="at-custom-category-filter-dropdown" data-cy="at-custom-category-filter-dropdown">
-                    <div class="at_flex at_flex_row at_space_between">    
+                <div id="at-custom-category-filter-dropdown" data-cy="at-custom-category-filter-dropdown">
+                    <div id="at-category-filter-dropdown" class="at_dropdown at_flex at_flex_row at_space_between">    
                         <div class="at_dropdown_toggle" id="at-category-filter-dropdown-toggle" data-cy="at-category-filter-dropdown-toggle">${i18n.t('NoSelection')}</div>
                         <span class="mdi mdi-triangle-down at_chevron" id="at-category-filter-chevron" data-cy="at-category-filter-chevron"></span>
                     </div>
@@ -51,10 +51,10 @@ export function renderTagListPane() {
             </div>
             <div class="at_field at_flex_column" style="${_tagCategories ? '' : 'display: none;'}">
                 <label for="">${i18n.t('Subcategory')}</label>
-                <div class="at_dropdown" id="at-custom-subcategory-filter-dropdown" data-cy="at-custom-subcategory-filter-dropdown">
-                    <div class="at_flex at_flex_row at_space_between">    
-                    <div class="at_dropdown_toggle" id="at-subcategory-filter-dropdown-toggle" data-cy="at-subcategory-filter-dropdown-toggle">${i18n.t('NoSelection')}</div>
-                    <span class="mdi mdi-triangle-down at_chevron" id="at-subcategory-filter-chevron" data-cy="at-subcategory-filter-chevron"></span>
+                <div id="at-custom-subcategory-filter-dropdown" data-cy="at-custom-subcategory-filter-dropdown">
+                    <div id="at-subcategory-filter-dropdown" class="at_dropdown at_flex at_flex_row at_space_between">    
+                        <div class="at_dropdown_toggle" id="at-subcategory-filter-dropdown-toggle" data-cy="at-subcategory-filter-dropdown-toggle">${i18n.t('NoSelection')}</div>
+                        <span class="mdi mdi-triangle-down at_chevron" id="at-subcategory-filter-chevron" data-cy="at-subcategory-filter-chevron"></span>
                     </div>
                     <div style="position:absolute;">
                         <div class="at_dropdown_options" id="at-subcategory-filter-options" data-cy="at-subcategory-filter-options">
@@ -332,8 +332,8 @@ export function setSelectedSubcategoryFilter(subcategoryId) {
     selectedSubCategoryFilterId = subcategoryId;
 }
 function initDropdownEventListeners() {
-    const categoryChevron = document.getElementById('at-category-filter-chevron');
-    const subcategoryChevron = document.getElementById('at-subcategory-filter-chevron');
+    const categoryChevron = document.getElementById('at-category-filter-dropdown');
+    const subcategoryChevron = document.getElementById('at-subcategory-filter-dropdown');
     if (categoryChevron) {
         if (isChevronEventAdded == false) {
             categoryChevron.addEventListener('click', () => {