chore: stage 2.12.0

chore: stage 2.12.0

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [2.11.0](https://github.com/hypha-dao/dho-web-client/compare/v2.10.0...v2.11.0) (2022-09-05)
+
+
+### Features
+
+* add cash claims flag ([#1490](https://github.com/hypha-dao/dho-web-client/issues/1490)) ([962e104](https://github.com/hypha-dao/dho-web-client/commit/962e104bd59e86bca749aa2c764498655f40c3db))
+* added "delete proposal" button to staging proposals ([#1520](https://github.com/hypha-dao/dho-web-client/issues/1520)) ([#1538](https://github.com/hypha-dao/dho-web-client/issues/1538)) ([7d48d6f](https://github.com/hypha-dao/dho-web-client/commit/7d48d6fcb94fb5f0d904f4bd2755d89167f91e55))
+* disabled cash claims for hypha ([#1531](https://github.com/hypha-dao/dho-web-client/issues/1531)) ([61f1261](https://github.com/hypha-dao/dho-web-client/commit/61f12619d0bfd45066b29db51bd1c15f8768baa0))
+* **explore page:** show dao creation wizard to hypha members only ([#1514](https://github.com/hypha-dao/dho-web-client/issues/1514)) ([925cf02](https://github.com/hypha-dao/dho-web-client/commit/925cf020b4c3c95b7a1e4eb2cda56d6a8682fc3e))
+* **proposals:** add pull interval to auto refresh ([#1529](https://github.com/hypha-dao/dho-web-client/issues/1529)) ([7163dad](https://github.com/hypha-dao/dho-web-client/commit/7163dada7cc512ceb9de80a3b79cdecf573a9bdc))
+
+
+### Bug Fixes
+
+* badge proposal details and formatting issues ([#1551](https://github.com/hypha-dao/dho-web-client/issues/1551)) ([33b755e](https://github.com/hypha-dao/dho-web-client/commit/33b755e035cc17202fbfdf9f52bcd130587dff14))
+* **changelog:** change relase notes for 2.10 ([#1546](https://github.com/hypha-dao/dho-web-client/issues/1546)) ([6eccb13](https://github.com/hypha-dao/dho-web-client/commit/6eccb13e7c86030e9bd41afbdb45468dc3d44c3a))
+* **configuration page:** remove pattern slip and disable announcement edit for non admins  ([#1530](https://github.com/hypha-dao/dho-web-client/issues/1530)) ([2ec524f](https://github.com/hypha-dao/dho-web-client/commit/2ec524f53217dffa05a90c63ae293f14be643c83))
+* current dao in left menu (dao switcher) has been hidden ([#1544](https://github.com/hypha-dao/dho-web-client/issues/1544)) ([#1565](https://github.com/hypha-dao/dho-web-client/issues/1565)) ([04dca98](https://github.com/hypha-dao/dho-web-client/commit/04dca98e9cfa64934f790b474e13f3f13fb5e46d))
+* enable deferred button for archived assignments [#1489](https://github.com/hypha-dao/dho-web-client/issues/1489) ([#1534](https://github.com/hypha-dao/dho-web-client/issues/1534)) ([a29b231](https://github.com/hypha-dao/dho-web-client/commit/a29b231aba7097fa69f65013ffb070d033dbe31b))
+* fix wrong titles and salary tag for search items ([#1513](https://github.com/hypha-dao/dho-web-client/issues/1513)) ([#1540](https://github.com/hypha-dao/dho-web-client/issues/1540)) ([c32b3aa](https://github.com/hypha-dao/dho-web-client/commit/c32b3aa0c19a24c1da10a961bd961fdec485c137))
+* fixed color for CTA buttons ([#1522](https://github.com/hypha-dao/dho-web-client/issues/1522)) ([#1560](https://github.com/hypha-dao/dho-web-client/issues/1560)) ([3f29e32](https://github.com/hypha-dao/dho-web-client/commit/3f29e32fa7183d20659844eb8efb4e25ae9b2bcc))
+* fixed filter on the search page, added missing filter types ([#1415](https://github.com/hypha-dao/dho-web-client/issues/1415)) ([#1537](https://github.com/hypha-dao/dho-web-client/issues/1537)) ([7ad7515](https://github.com/hypha-dao/dho-web-client/commit/7ad751570faea7797f4d1a477c68e80c2d7db75e))
+* fixed widgets links in home and organisation pages ([#1550](https://github.com/hypha-dao/dho-web-client/issues/1550)) ([#1564](https://github.com/hypha-dao/dho-web-client/issues/1564)) ([c600166](https://github.com/hypha-dao/dho-web-client/commit/c600166b8334046b9fd84333d018e779019c770f))
+* hide badge multiplier ([#1476](https://github.com/hypha-dao/dho-web-client/issues/1476)) ([#1535](https://github.com/hypha-dao/dho-web-client/issues/1535)) ([c498dbb](https://github.com/hypha-dao/dho-web-client/commit/c498dbb76549621b3a0afb36b47a5d93bd090560))
+* proposal description max length ([#1496](https://github.com/hypha-dao/dho-web-client/issues/1496)) ([20f0d46](https://github.com/hypha-dao/dho-web-client/commit/20f0d46bc11f8b5469e9db914e0ed81ee0bcbff6))
+* revert to claim all with multiple transaction ([#1509](https://github.com/hypha-dao/dho-web-client/issues/1509)) ([2e1ed55](https://github.com/hypha-dao/dho-web-client/commit/2e1ed55fb7f21c3b35f56ca418ba40d3e7499710))
+* warning about character max from description has been removed ([#1555](https://github.com/hypha-dao/dho-web-client/issues/1555)) ([#1563](https://github.com/hypha-dao/dho-web-client/issues/1563)) ([571f374](https://github.com/hypha-dao/dho-web-client/commit/571f37485c15985e0e5564af0a4bcebe16923f76))
+
 ## [2.10.1](https://github.com/hypha-dao/dho-web-client/compare/v2.10.0...v2.10.1) (2022-08-30)
 
 
@@ -23,4 +51,4 @@
 
 ### Bug Fixes
 
-* **configuration page:** remove pattern slip and disable announcement edit for non admins  ([#1530](https://github.com/hypha-dao/dho-web-client/issues/1530)) ([2ec524f](https://github.com/hypha-dao/dho-web-client/commit/2ec524f53217dffa05a90c63ae293f14be643c83))
+* **configuration page:** remove pattern slip and disable announcement edit for non admins  ([#1530](https://github.com/hypha-dao/dho-web-client/issues/1530)) ([2ec524f](https://github.com/hypha-dao/dho-web-client/commit/2ec524f53217dffa05a90c63ae293f14be643c83))

cypress.config.js

@@ -0,0 +1,18 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents (on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    }
+  },
+
+  component: {
+    devServer: {
+      framework: 'vue',
+      bundler: 'webpack'
+    }
+  }
+})

cypress/support/component-index.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title>Components App</title>
+  </head>
+  <body>
+    <div data-cy-root></div>
+  </body>
+</html>

cypress/support/index.js → cypress/support/component.js

@@ -1,5 +1,5 @@
 // ***********************************************************
-// This example support/index.js is processed and
+// This example support/component.js is processed and
 // loaded automatically before your test files.
 //
 // This is a great place to put global configuration and
@@ -18,3 +18,10 @@ import './commands'
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
+
+import { mount } from 'cypress/vue2'
+
+Cypress.Commands.add('mount', mount)
+
+// Example use:
+// cy.mount(MyComponent)

cypress/support/e2e.js

@@ -0,0 +1,28 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
+
+Cypress.on('uncaught:exception', (err) => {
+  // returning false here prevents Cypress from
+  // failing the test
+//   cy.log('Cypress detected uncaught exception: ', err)
+//   console.log('Cypress detected uncaught ex/ception: ', err)
+  return false
+})

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dho-web-client",
-  "version": "2.10.1",
+  "version": "2.11.0",
   "description": "Governance, payroll and treasury tools for distributed HUMAN organizations (DHO)",
   "productName": "Hypha DHO",
   "author": "Max <[email protected]>",
@@ -60,7 +60,7 @@
     "chromatic": "^5.8.2",
     "commitizen": "^4.2.5",
     "cross-fetch": "^3.1.4",
-    "cypress": "^7.3.0",
+    "cypress": "^10.7.0",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "7.24.0",
     "eslint-loader": "4.0.2",

src/components/assignments/assignment-suspend.vue

@@ -1,9 +1,6 @@
 <script>
 export default {
   name: 'assignment-suspend',
-  components: {
-    InputField: () => import('~/components/common/input-field.vue')
-  },
   props: {
     owner: String,
     title: String,
@@ -29,7 +26,7 @@ export default {
           span.text-italic.q-pa-xs {{ title }}.
           span Please provide a reason.
       .col-12
-        input-field(v-model="reason" dense rounded outlined label="Reason" @click.stop)
+        q-input(v-model="reason" dense rounded outlined label="Reason" @click.stop)
         q-btn.full-width.q-mt-md(
           rounded
           unelevated

src/components/assignments/assignment-withdraw.vue

@@ -5,9 +5,6 @@ export default {
   props: {
     submitting: Boolean
   },
-  components: {
-    InputField: () => import('~/components/common/input-field.vue')
-  },
   data () {
     return {
       notes: ''
@@ -28,7 +25,7 @@ export default {
           | you withdraw the assignment. Please provide a note below.
         .text-bold.text-italic.q-pt-xs WARNING: This action is irreversible.
       .col-12.col-lg-6
-        input-field(v-model="notes" dense rounded outlined label="Notes" @click.stop)
+        q-input(v-model="notes" dense rounded outlined label="Notes" @click.stop)
         q-btn.full-width.q-mt-md(
           rounded
           unelevated

src/components/contributions/token-multipliers.vue

@@ -6,17 +6,14 @@ export default {
     husd: Number,
     hvoice: Number,
     hypha: Number
-  },
-  components: {
-    InputField: () => import('~/components/common/input-field.vue')
   }
 }
 </script>
 
 <template lang="pug">
 .row.q-col-gutter-xs
   .col-6
-    input-field.bg-seeds.text-black(
+    q-input.bg-seeds.text-black(
       v-model="seeds"
       type="number"
       outlined
@@ -30,7 +27,7 @@ export default {
         )
     .hint Deferred Seeds
   .col-6
-    input-field.bg-liquid.text-black(
+    q-input.bg-liquid.text-black(
       v-model="husd"
       type="number"
       outlined
@@ -39,7 +36,7 @@ export default {
     )
     .hint HUSD
   .col-6
-    input-field.bg-liquid.text-black(
+    q-input.bg-liquid.text-black(
       v-model="hvoice"
       type="number"
       outlined
@@ -48,7 +45,7 @@ export default {
     )
     .hint HVOICE
   .col-6
-    input-field.bg-liquid.text-black(
+    q-input.bg-liquid.text-black(
       v-model="hypha"
       type="number"
       readonly

src/components/dao/settings-design.vue

@@ -22,6 +22,11 @@ export default {
     isAdmin: {
       type: Boolean,
       default: false
+    },
+
+    isHypha: {
+      type: Boolean,
+      default: false
     }
   },
 
@@ -69,7 +74,20 @@ export default {
           title: 'organisationTitle',
           paragraph: 'organisationParagraph',
           state: ''
-        }
+        },
+        ...(this.isHypha
+          ? [
+              {
+                key: 'EXPLORE',
+                label: 'Explore',
+                image: 'exploreBackgroundImage',
+                title: 'exploreTitle',
+                paragraph: 'exploreParagraph',
+                state: ''
+              }
+            ]
+          : [])
+
       ],
 
       logoBase64: null,
@@ -678,7 +696,7 @@ ${backgroundImage
                                 color="accent"
                                 dense
                                 lazy-rules
-                                maxlength="140"
+                                maxlength="300"
                                 outlined
                                 placeholder="Max 140 characters"
                                 ref="nickname"

src/components/filters/filter-widget.vue

@@ -3,8 +3,7 @@ export default {
   name: 'filter-widget',
   components: {
     Chips: () => import('~/components/common/chips.vue'),
-    Widget: () => import('../common/widget.vue'),
-    InputField: () => import('~/components/common/input-field.vue')
+    Widget: () => import('../common/widget.vue')
   },
 
   watch: {
@@ -116,7 +115,7 @@ export default {
 <template lang="pug">
 widget(title="Filters")
       .row.items-center.justify-between.q-py-sm(v-if="showTextFilter")
-        input-field.text-filter.rounded-border.full-width(outlined v-model="textFilter" :placeholder="filterTitle" :debounce="debounce" dense)
+        q-input.text-filter.rounded-border.full-width(outlined v-model="textFilter" :placeholder="filterTitle" :debounce="debounce" dense)
           template(v-slot:append v-if="textFilter")
             q-icon(size="15px" name="fas fa-times" @click="clearSearchInput")
       .row.items-center.justify-between.q-py-sm(v-if="showViewSelector")

src/components/form/custom-period-input.vue

@@ -19,7 +19,7 @@ const secondsToInterval = (seconds) => {
 export default {
   name: 'custom-period-input',
   components: {
-    InputField: () => import('~/components/common/input-field.vue')
+
   },
   data: function () {
     return {
@@ -102,7 +102,7 @@ div.custom-period-input
   ) Custom period
 
   div(v-show="isActive").full-width.bg-primary.text-white.rounded-border.q-px-sm.relative-position
-      input-field(
+      q-input(
         :disable="disable"
         :value="valueFormated"
         @change='onChange'

src/components/form/period-select.vue

@@ -6,7 +6,7 @@ export default {
   name: 'period-select',
   mixins: [validation],
   components: {
-    InputField: () => import('~/components/common/input-field.vue')
+
   },
   props: {
     value: { type: Object },
@@ -91,7 +91,7 @@ export default {
 </script>
 
 <template lang="pug">
-input-field(
+q-input(
   ref="model"
   v-model="form.model"
   :readonly="readonly"

src/components/form/phone-number.vue

@@ -7,7 +7,7 @@ export default {
   name: 'form-phone-number',
   mixins: [countriesPhoneCode, validation],
   components: {
-    InputField: () => import('~/components/common/input-field.vue')
+
   },
   props: {
     value: { type: String },
@@ -88,7 +88,7 @@ export default {
     :outlined="outlined"
     :style="{width:'50%'}"
   )
-  input-field(
+  q-input(
     ref="number"
     v-model="form.number"
     :label="`Phone number${required ? '*' : ''}`"
@@ -107,7 +107,7 @@ export default {
         border-radius: 4px 0 0 4px
         &:before
           border-right: none
-  /deep/.input-field
+  /deep/.q-input
     .q-field__inner
       .q-field__control
         border-radius: 0 4px 4px 0