catch up with main

.github/workflows/build_and_release.yml

@@ -23,9 +23,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.13.0
+          node-version: 18.17.1
       - run: npm install 
-      - run: npm run test-unit
       - name: "Run Cypress"
         run: npm run cypress run-ct
         env:
@@ -39,7 +38,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.13.0
+          node-version: 18.17.1
       - run: npm install 
       - run: npm run build-bundle
       - uses: actions/upload-artifact@master
@@ -59,7 +58,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           registry-url: 'https://registry.npmjs.org'
-          node-version: 12.13.0
+          node-version: 18.17.1
       - name: Download dist
         uses: actions/download-artifact@master
         with:

CHANGELOG.md

@@ -7,11 +7,57 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## [v0.6.7](https://github.com/ABI-Software/mapintegratedvuer/compare/v0.6.6...v0.6.7)
+## [v1.0.2](https://github.com/ABI-Software/mapintegratedvuer/compare/v1.0.1...v1.0.2)
+
+### Commits
+
+- Update flatmapvuer and scaffoldvuer. [`4fcf5d0`](https://github.com/ABI-Software/mapintegratedvuer/commit/4fcf5d0dc8350b30485dcfe244615063d06b2439)
+
+## [v1.0.1](https://github.com/ABI-Software/mapintegratedvuer/compare/v1.0.0...v1.0.1) - 2024-04-28
+
+### Merged
+
+- Include a fix which fixes facets issue on the sidebar. [`#205`](https://github.com/ABI-Software/mapintegratedvuer/pull/205)
+- 1.0.0 [`#204`](https://github.com/ABI-Software/mapintegratedvuer/pull/204)
+
+### Commits
+
+- Update build and release script. [`4ab5714`](https://github.com/ABI-Software/mapintegratedvuer/commit/4ab5714f042d012b0e561dd834a48a37beb24fe4)
+
+## [v1.0.0](https://github.com/ABI-Software/mapintegratedvuer/compare/v0.6.7...v1.0.0) - 2024-04-24
+
+### Merged
+
+- Getting package and testing ready for v1.0.0 [`#203`](https://github.com/ABI-Software/mapintegratedvuer/pull/203)
+- Annotation authentication [`#198`](https://github.com/ABI-Software/mapintegratedvuer/pull/198)
+- Bugfix/cypress component test [`#200`](https://github.com/ABI-Software/mapintegratedvuer/pull/200)
+- API Documentation [`#197`](https://github.com/ABI-Software/mapintegratedvuer/pull/197)
+- Fix cypress component test issue [`#199`](https://github.com/ABI-Software/mapintegratedvuer/pull/199)
+- Remove unused npm packages [`#196`](https://github.com/ABI-Software/mapintegratedvuer/pull/196)
+- Fix featured marker by switching to the new api [`#194`](https://github.com/ABI-Software/mapintegratedvuer/pull/194)
+- Make sure scaffoldvuer uses the same version of flatmapvuer. [`#195`](https://github.com/ABI-Software/mapintegratedvuer/pull/195)
+- Migration to vue 3. [`#193`](https://github.com/ABI-Software/mapintegratedvuer/pull/193)
+- Adjust toolbar items alignments [`#8`](https://github.com/ABI-Software/mapintegratedvuer/pull/8)
+- Fix search box spacing [`#7`](https://github.com/ABI-Software/mapintegratedvuer/pull/7)
+- Fix popover position top in ContentVuer [`#6`](https://github.com/ABI-Software/mapintegratedvuer/pull/6)
+
+### Commits
+
+- Remove most of the warning. [`57f7431`](https://github.com/ABI-Software/mapintegratedvuer/commit/57f74313e589016c4c652bc9be95986f341b96fe)
+- Use the latest plotvuer and simulationvuer. [`123b89d`](https://github.com/ABI-Software/mapintegratedvuer/commit/123b89da50ce2a09c43cafafa5e0464b59d7594b)
+- Improve and fix testing error. [`b71e1e6`](https://github.com/ABI-Software/mapintegratedvuer/commit/b71e1e6a6a5722bed51c690bb7048c5d2f4b59a8)
+
+## [v0.6.7](https://github.com/ABI-Software/mapintegratedvuer/compare/v0.6.6...v0.6.7) - 2024-01-05
 
 ### Merged
 
 - S3 bucket fix [`#192`](https://github.com/ABI-Software/mapintegratedvuer/pull/192)
+- S3 bucket fix [`#191`](https://github.com/ABI-Software/mapintegratedvuer/pull/191)
+
+### Commits
+
+- Update unit test. [`3a92d5a`](https://github.com/ABI-Software/mapintegratedvuer/commit/3a92d5a8a4d478c40f55374867e4983c37c0bd21)
+- Fix an issue with state not being reset. [`eb73cee`](https://github.com/ABI-Software/mapintegratedvuer/commit/eb73cee93982c424a2ab3c10d4a21d8ad6cdf9dc)
 
 ## [v0.6.6](https://github.com/ABI-Software/mapintegratedvuer/compare/v0.6.5...v0.6.6) - 2024-01-05
 

cypress/component/MapContent.cy.js

@@ -1,7 +1,5 @@
 /* eslint-disable no-alert, no-console */
 import { MapContent } from '../../src/components/index.js';
-import { createPinia, setActivePinia } from 'pinia';
-
 
 describe('MapContent', () => {
 
@@ -45,9 +43,6 @@ describe('MapContent', () => {
           algoliaId: Cypress.env('ALGOLIA_ID'),
         }
       },
-      global: {
-        plugins: setActivePinia(createPinia())
-      }
     });
 
     Cypress.on('uncaught:exception', (err) => {
@@ -59,17 +54,17 @@ describe('MapContent', () => {
         return false
       if (err.message.includes("Failed to fetch"))
         return false
+      if (err.message.includes('Source "mapbox-gl-draw-cold" already exists.'))
+        return false
       return true
     })
 
     Cypress.Commands.add('checkFlatmapProvenanceCard', (species) => {
-      cy.get('#flatmap-select').click();
+      cy.get('#flatmap-select').click({force: true} );
       cy.get('.el-select-dropdown__wrap > .el-scrollbar__view').contains(species).click();
       cy.get('.multi-container > .el-loading-parent--relative > [name="el-loading-fade"] > .el-loading-mask', {timeout: 30000}).should('not.exist');
-      cy.get('.selected').then(() => {
-        cy.get('.toolbar > .icon-group > :nth-child(2)').click()
-        cy.get('.flatmap-context-card > .card-right > a').contains('here').should('have.attr', 'href').and('include', species.toLowerCase())
-      })
+      cy.get('.el-row > div[style=""]').click()
+      cy.get('.flatmap-context-card > .card-right > a').contains('here').should('have.attr', 'href').and('include', species.toLowerCase())
     })
 
     //Wait for the curie response before continuing

cypress/support/component.js

@@ -15,7 +15,23 @@
 
 // Import commands.js using ES2015 syntax:
 import './commands'
-
+import { createPinia } from 'pinia';
 import { mount } from 'cypress/vue'
 
-Cypress.Commands.add('mount', mount)
+Cypress.Commands.add('mount', (component, options = {}) => {
+
+  const pinia = createPinia();
+
+  const installPinia = (app) => {
+    app.use(pinia);
+  }
+
+  options = {
+    global: {
+      plugins:[installPinia]
+    },
+    ...options
+  };
+
+  return mount(component, options);
+});