@kalisio/kdk 2.6.4 → 2.7.0

package/coverage/lcov-report/map/api/hooks/hooks.catalog.js.html

@@ -25,7 +25,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>0/124</span>
+                <span class='fraction'>0/171</span>
             </div>
         
             
@@ -46,7 +46,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>0/124</span>
+                <span class='fraction'>0/171</span>
             </div>
         
             
@@ -187,7 +187,53 @@
 <a name='L122'></a><a href='#L122'>122</a>
 <a name='L123'></a><a href='#L123'>123</a>
 <a name='L124'></a><a href='#L124'>124</a>
-<a name='L125'></a><a href='#L125'>125</a></td><td class="line-coverage quiet"><span class="cline-any cline-no">&nbsp;</span>
+<a name='L125'></a><a href='#L125'>125</a>
+<a name='L126'></a><a href='#L126'>126</a>
+<a name='L127'></a><a href='#L127'>127</a>
+<a name='L128'></a><a href='#L128'>128</a>
+<a name='L129'></a><a href='#L129'>129</a>
+<a name='L130'></a><a href='#L130'>130</a>
+<a name='L131'></a><a href='#L131'>131</a>
+<a name='L132'></a><a href='#L132'>132</a>
+<a name='L133'></a><a href='#L133'>133</a>
+<a name='L134'></a><a href='#L134'>134</a>
+<a name='L135'></a><a href='#L135'>135</a>
+<a name='L136'></a><a href='#L136'>136</a>
+<a name='L137'></a><a href='#L137'>137</a>
+<a name='L138'></a><a href='#L138'>138</a>
+<a name='L139'></a><a href='#L139'>139</a>
+<a name='L140'></a><a href='#L140'>140</a>
+<a name='L141'></a><a href='#L141'>141</a>
+<a name='L142'></a><a href='#L142'>142</a>
+<a name='L143'></a><a href='#L143'>143</a>
+<a name='L144'></a><a href='#L144'>144</a>
+<a name='L145'></a><a href='#L145'>145</a>
+<a name='L146'></a><a href='#L146'>146</a>
+<a name='L147'></a><a href='#L147'>147</a>
+<a name='L148'></a><a href='#L148'>148</a>
+<a name='L149'></a><a href='#L149'>149</a>
+<a name='L150'></a><a href='#L150'>150</a>
+<a name='L151'></a><a href='#L151'>151</a>
+<a name='L152'></a><a href='#L152'>152</a>
+<a name='L153'></a><a href='#L153'>153</a>
+<a name='L154'></a><a href='#L154'>154</a>
+<a name='L155'></a><a href='#L155'>155</a>
+<a name='L156'></a><a href='#L156'>156</a>
+<a name='L157'></a><a href='#L157'>157</a>
+<a name='L158'></a><a href='#L158'>158</a>
+<a name='L159'></a><a href='#L159'>159</a>
+<a name='L160'></a><a href='#L160'>160</a>
+<a name='L161'></a><a href='#L161'>161</a>
+<a name='L162'></a><a href='#L162'>162</a>
+<a name='L163'></a><a href='#L163'>163</a>
+<a name='L164'></a><a href='#L164'>164</a>
+<a name='L165'></a><a href='#L165'>165</a>
+<a name='L166'></a><a href='#L166'>166</a>
+<a name='L167'></a><a href='#L167'>167</a>
+<a name='L168'></a><a href='#L168'>168</a>
+<a name='L169'></a><a href='#L169'>169</a>
+<a name='L170'></a><a href='#L170'>170</a>
+<a name='L171'></a><a href='#L171'>171</a></td><td class="line-coverage quiet"><span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -311,55 +357,106 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js"><span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" ><span class="branch-0 cbranch-no" title="branch not covered" >import _ from 'lodash'</span></span></span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js"><span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" ><span class="branch-0 cbranch-no" title="branch not covered" >import _ from 'lodash'</span></span></span>
 <span class="cstat-no" title="statement not covered" >import siftModule from 'sift'</span>
 <span class="cstat-no" title="statement not covered" >import common from 'feathers-hooks-common'</span>
 <span class="cstat-no" title="statement not covered" >import makeDebug from 'debug'</span>
+<span class="cstat-no" title="statement not covered" >import { toString, toJson } from '../../../core/api/hooks/index.js'</span>
 <span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >const { getItems, replaceItems } = common</span>
 <span class="cstat-no" title="statement not covered" >const sift = siftModule.default</span>
 <span class="cstat-no" title="statement not covered" >const debug = makeDebug('kdk:map:catalog:hooks')</span>
 <span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >function isQueryForType(query, type) {</span>
+<span class="cstat-no" title="statement not covered" >  // Use sift to support MongoDB operators like $in, $nin, etc.</span>
+<span class="cstat-no" title="statement not covered" >  const filter = [{ type }].filter(sift(_.pick(query, ['type'])))</span>
+<span class="cstat-no" title="statement not covered" >  return !_.isEmpty(filter)</span>
+<span class="cstat-no" title="statement not covered" >}</span>
+<span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >function addDefaultItems(query, type, items, defaultItems) {</span>
+<span class="cstat-no" title="statement not covered" >  // Add implicit type as not provided in default items config</span>
+<span class="cstat-no" title="statement not covered" >  defaultItems = _.map(defaultItems, item =&gt; Object.assign(item, { type }))</span>
+<span class="cstat-no" title="statement not covered" >  // Then filter according to query</span>
+<span class="cstat-no" title="statement not covered" >  defaultItems = defaultItems.filter(sift(_.omit(query, ['$sort', '$limit', '$skip'])))</span>
+<span class="cstat-no" title="statement not covered" >  return items.concat(defaultItems.map(item =&gt; Object.assign(item, { type })))</span>
+<span class="cstat-no" title="statement not covered" >}</span>
+<span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >// By default we only return default categories</span>
 <span class="cstat-no" title="statement not covered" >export function getDefaultCategories (hook) {</span>
 <span class="cstat-no" title="statement not covered" >  const query = _.get(hook, 'params.query', {})</span>
-<span class="cstat-no" title="statement not covered" >  if ((query.type === 'Category') &amp;&amp; (query.$limit !== 0)) {</span>
+<span class="cstat-no" title="statement not covered" >  const type = 'Category'</span>
+<span class="cstat-no" title="statement not covered" >  if ((query.$limit !== 0) &amp;&amp; isQueryForType(query, type)) {</span>
 <span class="cstat-no" title="statement not covered" >    const service = hook.service</span>
-<span class="cstat-no" title="statement not covered" >    // Read default category config</span>
-<span class="cstat-no" title="statement not covered" >    const catalogConfig = hook.app.get('catalog') || { categories: [] }</span>
-<span class="cstat-no" title="statement not covered" >    // Check for specific service override (e.g. contextual catalog different from global catalog)</span>
-<span class="cstat-no" title="statement not covered" >    let defaultCategories = _.get(service, 'options.categories', catalogConfig.categories)</span>
-<span class="cstat-no" title="statement not covered" >    // Add implicit type</span>
-<span class="cstat-no" title="statement not covered" >    defaultCategories = _.map(defaultCategories, category =&gt; Object.assign(category, { type: 'Category' }))</span>
-<span class="cstat-no" title="statement not covered" >    // Then filter according to query</span>
-<span class="cstat-no" title="statement not covered" >    defaultCategories = defaultCategories.filter(sift(_.omit(query, ['$sort', '$limit', '$skip'])))</span>
-<span class="cstat-no" title="statement not covered" >    const item = getItems(hook)</span>
-<span class="cstat-no" title="statement not covered" >    replaceItems(hook, item.concat(defaultCategories.map(category =&gt; Object.assign(category, { type: 'Category' }))))</span>
+<span class="cstat-no" title="statement not covered" >    // Check for default categories config</span>
+<span class="cstat-no" title="statement not covered" >    const defaultCategories = _.get(service, 'options.categories', [])</span>
+<span class="cstat-no" title="statement not covered" >    debug(`Retrieving ${defaultCategories.length} default categories for query`, query)</span>
+<span class="cstat-no" title="statement not covered" >    replaceItems(hook, addDefaultItems(query, type, getItems(hook), defaultCategories))</span>
 <span class="cstat-no" title="statement not covered" >  }</span>
 <span class="cstat-no" title="statement not covered" >}</span>
 <span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >// By default we only return default sublegends</span>
 <span class="cstat-no" title="statement not covered" >export function getDefaultSublegends (hook) {</span>
 <span class="cstat-no" title="statement not covered" >  const query = _.get(hook, 'params.query', {})</span>
-<span class="cstat-no" title="statement not covered" >  if ((query.type === 'Sublegend') &amp;&amp; (query.$limit !== 0)) {</span>
+<span class="cstat-no" title="statement not covered" >  const type = 'Sublegend'</span>
+<span class="cstat-no" title="statement not covered" >  if ((query.$limit !== 0) &amp;&amp; isQueryForType(query, type)) {</span>
 <span class="cstat-no" title="statement not covered" >    const service = hook.service</span>
-<span class="cstat-no" title="statement not covered" >    // Read default sublegends config</span>
-<span class="cstat-no" title="statement not covered" >    const catalogConfig = hook.app.get('catalog') || { sublegends: [] }</span>
-<span class="cstat-no" title="statement not covered" >    // Check for specific service override (e.g. contextual catalog different from global catalog)</span>
-<span class="cstat-no" title="statement not covered" >    let defaultSublegends = _.get(service, 'options.sublegends', catalogConfig.sublegends)</span>
-<span class="cstat-no" title="statement not covered" >    // Add implicit type</span>
-<span class="cstat-no" title="statement not covered" >    defaultSublegends = _.map(defaultSublegends, sublegend =&gt; Object.assign(sublegend, { type: 'Sublegend' }))</span>
-<span class="cstat-no" title="statement not covered" >    // Then filter according to query</span>
-<span class="cstat-no" title="statement not covered" >    defaultSublegends = defaultSublegends.filter(sift(_.omit(query, ['$sort', '$limit', '$skip'])))</span>
-<span class="cstat-no" title="statement not covered" >    const item = getItems(hook)</span>
-<span class="cstat-no" title="statement not covered" >    replaceItems(hook, item.concat(defaultSublegends.map(sublegend =&gt; Object.assign(sublegend, { type: 'Sublegend' }))))</span>
+<span class="cstat-no" title="statement not covered" >    // Check for default sublegends config</span>
+<span class="cstat-no" title="statement not covered" >    const defaultSublegends = _.get(service, 'options.sublegends', [])</span>
+<span class="cstat-no" title="statement not covered" >    debug(`Retrieving ${defaultSublegends.length} default sublegends for query`, query)</span>
+<span class="cstat-no" title="statement not covered" >    replaceItems(hook, addDefaultItems(query, type, getItems(hook), defaultSublegends))</span>
 <span class="cstat-no" title="statement not covered" >  }</span>
 <span class="cstat-no" title="statement not covered" >}</span>
 <span class="cstat-no" title="statement not covered" ></span>
 <span class="cstat-no" title="statement not covered" >// By default we only return layers and not other objects in catalog</span>
 <span class="cstat-no" title="statement not covered" >export function filterLayers (hook) {</span>
 <span class="cstat-no" title="statement not covered" >  const query = _.get(hook, 'params.query', {})</span>
-<span class="cstat-no" title="statement not covered" >  if (!query.type) query.type = { $nin: ['Context', 'Service', 'Category'] }</span>
+<span class="cstat-no" title="statement not covered" >  if (!query.type) query.type = { $nin: ['Context', 'Service', 'Category', 'Sublegend'] }</span>
 <span class="cstat-no" title="statement not covered" >  _.set(hook, 'params.query', query)</span>
 <span class="cstat-no" title="statement not covered" >}</span>
 <span class="cstat-no" title="statement not covered" ></span>
@@ -407,7 +504,9 @@
 <span class="cstat-no" title="statement not covered" >  if (!Array.isArray(removedItems)) removedItems = [removedItems]</span>
 <span class="cstat-no" title="statement not covered" >  for (let i = 0; i &lt; removedItems.length; i++) {</span>
 <span class="cstat-no" title="statement not covered" >    const removedItem = removedItems[i]</span>
-<span class="cstat-no" title="statement not covered" >    const isLayer = removedItem.type !== 'Context'</span>
+<span class="cstat-no" title="statement not covered" >    const isLayer = removedItem.type.endsWith('Layer')</span>
+<span class="cstat-no" title="statement not covered" >    const isView = (removedItem.type === 'Context')</span>
+<span class="cstat-no" title="statement not covered" >    if (!isLayer &amp;&amp; !isView) continue</span>
 <span class="cstat-no" title="statement not covered" >    const query = {}</span>
 <span class="cstat-no" title="statement not covered" >    if (isLayer) {</span>
 <span class="cstat-no" title="statement not covered" >      query.$or = [{ 'layers._id': removedItem._id }, { 'layers.name': removedItem.name }]</span>
@@ -421,7 +520,7 @@
 <span class="cstat-no" title="statement not covered" >    // Stop when non found</span>
 <span class="cstat-no" title="statement not covered" >    if (projects.length === 0) {</span>
 <span class="cstat-no" title="statement not covered" >      debug(`No project to update after removing item ${removedItem.name} `)</span>
-<span class="cstat-no" title="statement not covered" >      return hook</span>
+<span class="cstat-no" title="statement not covered" >      continue</span>
 <span class="cstat-no" title="statement not covered" >    }</span>
 <span class="cstat-no" title="statement not covered" >    // Update each project otherwise</span>
 <span class="cstat-no" title="statement not covered" >    await Promise.all(projects.map(project =&gt; {</span>
@@ -435,14 +534,53 @@
 <span class="cstat-no" title="statement not covered" >  }</span>
 <span class="cstat-no" title="statement not covered" >  return hook</span>
 <span class="cstat-no" title="statement not covered" >}</span>
-&nbsp;</pre></td></tr></table></pre>
+<span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >export function convertFilterQueriesToString (hook) {</span>
+<span class="cstat-no" title="statement not covered" >  let items = getItems(hook)</span>
+<span class="cstat-no" title="statement not covered" >  const isArray = Array.isArray(items)</span>
+<span class="cstat-no" title="statement not covered" >  items = (isArray ? items : [items])</span>
+<span class="cstat-no" title="statement not covered" >  let nbUpdatedItems = 0</span>
+<span class="cstat-no" title="statement not covered" >  items.forEach(item =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >    const filters = _.get(item, 'filters', [])</span>
+<span class="cstat-no" title="statement not covered" >    nbUpdatedItems += filters.length</span>
+<span class="cstat-no" title="statement not covered" >    _.forEach(filters, filter =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >      toString(filter, ['active', 'inactive'])</span>
+<span class="cstat-no" title="statement not covered" >    })</span>
+<span class="cstat-no" title="statement not covered" >  })</span>
+<span class="cstat-no" title="statement not covered" >  if (nbUpdatedItems &gt; 0) {</span>
+<span class="cstat-no" title="statement not covered" >    replaceItems(hook, isArray ? items : items[0])</span>
+<span class="cstat-no" title="statement not covered" >    debug(`Updated ${nbUpdatedItems} filters on items`)</span>
+<span class="cstat-no" title="statement not covered" >  }</span>
+<span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >  return hook</span>
+<span class="cstat-no" title="statement not covered" >}</span>
+<span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >export function convertFilterQueriesToObject (hook) {</span>
+<span class="cstat-no" title="statement not covered" >  let items = getItems(hook)</span>
+<span class="cstat-no" title="statement not covered" >  const isArray = Array.isArray(items)</span>
+<span class="cstat-no" title="statement not covered" >  items = (isArray ? items : [items])</span>
+<span class="cstat-no" title="statement not covered" >  let nbUpdatedItems = 0</span>
+<span class="cstat-no" title="statement not covered" >  items.forEach(item =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >    const filters = _.get(item, 'filters', [])</span>
+<span class="cstat-no" title="statement not covered" >    nbUpdatedItems += filters.length</span>
+<span class="cstat-no" title="statement not covered" >    _.forEach(filters, filter =&gt; {</span>
+<span class="cstat-no" title="statement not covered" >      toJson(filter, ['active', 'inactive'])</span>
+<span class="cstat-no" title="statement not covered" >    })</span>
+<span class="cstat-no" title="statement not covered" >  })</span>
+<span class="cstat-no" title="statement not covered" >  if (nbUpdatedItems &gt; 0) {</span>
+<span class="cstat-no" title="statement not covered" >    replaceItems(hook, isArray ? items : items[0])</span>
+<span class="cstat-no" title="statement not covered" >    debug(`Updated ${nbUpdatedItems} filters on items`)</span>
+<span class="cstat-no" title="statement not covered" >  }</span>
+<span class="cstat-no" title="statement not covered" ></span>
+<span class="cstat-no" title="statement not covered" >  return hook</span>
+<span class="cstat-no" title="statement not covered" >}</span></pre></td></tr></table></pre>
 
                 <div class='push'></div><!-- for sticky footer -->
             </div><!-- /wrapper -->
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.872Z
+                at 2026-03-10T09:15:24.774Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/map/api/hooks/hooks.features.js.html

@@ -382,7 +382,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.872Z
+                at 2026-03-10T09:15:24.774Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>