Merge remote-tracking branch 'upstream/development' into fix-undo-sto…

…necrop
agritheory · Sep 17, 2024 · bc0f508 · bc0f508
2 parents 014ab94 + ea79f36
commit bc0f508
Show file tree

Hide file tree

Showing 71 changed files with 1,664 additions and 531 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,13 +14,15 @@ jobs:
     outputs:
       aform: ${{ steps.filter.outputs.aform }}
       atable: ${{ steps.filter.outputs.atable }}
+      beam: ${{ steps.filter.outputs.beam }}
     steps:
     - uses: dorny/paths-filter@v2
       id: filter
       with:
         filters: |
           aform: aform/**
           atable: atable/**
+          beam: beam/**
 
   aform:
     name: AForm
@@ -105,3 +107,45 @@ jobs:
         working-directory: ./atable
         file-coverage-mode: 'all'
         vite-config-path: './vite.config.ts'
+
+  beam:
+    name: Beam
+    needs: changes
+    if: ${{ needs.changes.outputs.beam == 'true' }}
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      pull-requests: write
+
+    strategy:
+      matrix:
+        node: [20.x]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Install Node ${{ matrix.node }}
+      uses: actions/setup-node@v4
+      with:
+        cache-dependency-path: '**/config/rush/pnpm-lock.yaml'
+        registry-url: https://registry.npmjs.org/
+
+    - name: Rush Install
+      run: node common/scripts/install-run-rush.js install
+
+    - name: Rush Build
+      run: node common/scripts/install-run-rush.js rebuild --verbose
+
+    - name: Run Tests
+      working-directory: ./beam
+      run: node ../common/scripts/install-run-rushx.js test:coverage
+
+    - name: Coverage Report
+      if: always() # Also generate the report if tests are failing
+      uses: davelosert/vitest-coverage-report-action@v2
+      with:
+        working-directory: ./beam
+        file-coverage-mode: 'all'
+        vite-config-path: './vite.config.ts'
diff --git a/aform/CHANGELOG.json b/aform/CHANGELOG.json
@@ -1,6 +1,66 @@
 {
   "name": "@stonecrop/aform",
   "entries": [
+    {
+      "version": "0.2.33",
+      "tag": "@stonecrop/aform_v0.2.33",
+      "date": "Mon, 16 Sep 2024 11:56:08 GMT",
+      "comments": {}
+    },
+    {
+      "version": "0.2.32",
+      "tag": "@stonecrop/aform_v0.2.32",
+      "date": "Mon, 16 Sep 2024 11:27:59 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "update vitest dependencies"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.2.31",
+      "tag": "@stonecrop/aform_v0.2.31",
+      "date": "Fri, 13 Sep 2024 12:32:59 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "added attach file component"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.2.30",
+      "tag": "@stonecrop/aform_v0.2.30",
+      "date": "Fri, 13 Sep 2024 12:28:54 GMT",
+      "comments": {}
+    },
+    {
+      "version": "0.2.29",
+      "tag": "@stonecrop/aform_v0.2.29",
+      "date": "Wed, 11 Sep 2024 18:43:29 GMT",
+      "comments": {}
+    },
+    {
+      "version": "0.2.28",
+      "tag": "@stonecrop/aform_v0.2.28",
+      "date": "Fri, 16 Aug 2024 11:08:03 GMT",
+      "comments": {}
+    },
+    {
+      "version": "0.2.27",
+      "tag": "@stonecrop/aform_v0.2.27",
+      "date": "Thu, 25 Jul 2024 12:21:08 GMT",
+      "comments": {}
+    },
+    {
+      "version": "0.2.26",
+      "tag": "@stonecrop/aform_v0.2.26",
+      "date": "Wed, 24 Jul 2024 13:12:28 GMT",
+      "comments": {}
+    },
     {
       "version": "0.2.25",
       "tag": "@stonecrop/aform_v0.2.25",

diff --git a/aform/CHANGELOG.md b/aform/CHANGELOG.md
@@ -1,6 +1,50 @@
 # Change Log - @stonecrop/aform
 
-This log was last generated on Wed, 10 Jul 2024 12:10:33 GMT and should not be manually modified.
+This log was last generated on Mon, 16 Sep 2024 11:56:08 GMT and should not be manually modified.
+
+## 0.2.33
+Mon, 16 Sep 2024 11:56:08 GMT
+
+_Version update only_
+
+## 0.2.32
+Mon, 16 Sep 2024 11:27:59 GMT
+
+### Updates
+
+- update vitest dependencies
+
+## 0.2.31
+Fri, 13 Sep 2024 12:32:59 GMT
+
+### Updates
+
+- added attach file component
+
+## 0.2.30
+Fri, 13 Sep 2024 12:28:54 GMT
+
+_Version update only_
+
+## 0.2.29
+Wed, 11 Sep 2024 18:43:29 GMT
+
+_Version update only_
+
+## 0.2.28
+Fri, 16 Aug 2024 11:08:03 GMT
+
+_Version update only_
+
+## 0.2.27
+Thu, 25 Jul 2024 12:21:08 GMT
+
+_Version update only_
+
+## 0.2.26
+Wed, 24 Jul 2024 13:12:28 GMT
+
+_Version update only_
 
 ## 0.2.25
 Wed, 10 Jul 2024 12:10:33 GMT

diff --git a/aform/package.json b/aform/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@stonecrop/aform",
-	"version": "0.2.25",
+	"version": "0.2.33",
 	"license": "MIT",
 	"type": "module",
 	"author": {
@@ -44,6 +44,7 @@
 	"dependencies": {
 		"@stonecrop/themes": "workspace:*",
 		"@stonecrop/utilities": "workspace:*",
+		"@vueuse/core": "^10.11.0",
 		"vue": "^3.4.31"
 	},
 	"devDependencies": {
@@ -53,18 +54,18 @@
 		"@typescript-eslint/eslint-plugin": "^7.14.1",
 		"@typescript-eslint/parser": "^7.14.1",
 		"@vitejs/plugin-vue": "^5.0.5",
-		"@vitest/coverage-istanbul": "^1.6.0",
-		"@vitest/ui": "^1.6.0",
+		"@vitest/coverage-istanbul": "^2.1.1",
+		"@vitest/ui": "^2.1.1",
 		"@vue/test-utils": "^2.4.6",
 		"cypress": "^13.11.0",
 		"eslint-config-prettier": "^8.8.0",
 		"eslint-plugin-vue": "^9.11.1",
 		"eslint": "^8.40.0",
-		"jsdom": "^24.0.0",
+		"jsdom": "^25.0.0",
 		"stonecrop-rig": "workspace:*",
 		"typescript": "^5.5.2",
 		"vite": "^5.3.2",
-		"vitest": "^1.6.0",
+		"vitest": "^2.1.1",
 		"vue-router": "^4.4.0"
 	},
 	"peerDependencies": {

diff --git a/aform/src/components/form/AFileAttach.vue b/aform/src/components/form/AFileAttach.vue
@@ -0,0 +1,36 @@
+<template>
+	<div class="aform__form-element aform__file-attach aform__grid--full">
+		<template v-if="files">
+			<div class="aform__file-attach-feedback">
+				<p>
+					You have selected: <b>{{ `${files.length} ${files.length === 1 ? 'file' : 'files'}` }}</b>
+				</p>
+				<li v-for="file of files" :key="file.name">
+					{{ file.name }}
+				</li>
+			</div>
+		</template>
+		<button type="button" @click="open()" class="aform__form-btn">
+			{{ props.label }}
+		</button>
+		<button type="button" :disabled="!files" @click="reset()" class="aform__form-btn">Reset</button>
+	</div>
+</template>
+
+<script setup lang="ts">
+import { useFileDialog } from '@vueuse/core'
+import { SchemaTypes } from 'types/index'
+
+const props = defineProps<{
+	schema: SchemaTypes[]
+	label: string
+	collapsible?: boolean
+	data?: any
+}>()
+
+const { files, open, reset, onChange } = useFileDialog()
+
+onChange(files => {
+	return files
+})
+</script>
diff --git a/aform/src/components/utilities/Login.vue b/aform/src/components/utilities/Login.vue
@@ -25,10 +25,10 @@
 						</div>
 
 						<div class="login-form-password login-form-element">
-							<label id="login-password" for="password" class="login-label">Password</label>
+							<label id="login-password" for="password" class="aform__field-label">Password</label>
 							<input
 								id="password"
-								class="login-field"
+								class="aform__input-field"
 								name="password"
 								type="password"
 								v-model="password"

diff --git a/aform/src/index.ts b/aform/src/index.ts
@@ -6,6 +6,7 @@ import ADate from '@/components/form/ADate.vue'
 import ADropdown from '@/components/form/ADropdown.vue'
 import ADatePicker from '@/components/form/ADatePicker.vue'
 import AFieldset from '@/components/form/AFieldset.vue'
+import AFileAttach from '@/components/form/AFileAttach.vue'
 import AForm from '@/components/AForm.vue'
 import ANumericInput from '@/components/form/ANumericInput.vue'
 import ATextInput from '@/components/form/ATextInput.vue'
@@ -26,6 +27,7 @@ function install(app: App /* options */) {
 	app.component('ADropdown', ADropdown)
 	app.component('ADatePicker', ADatePicker)
 	app.component('AFieldset', AFieldset)
+	app.component('AFileAttach', AFileAttach)
 	app.component('AForm', AForm)
 	app.component('ANumericInput', ANumericInput)
 	app.component('ATextInput', ATextInput)
@@ -40,6 +42,7 @@ export {
 	ADropdown,
 	ADatePicker,
 	AFieldset,
+	AFileAttach,
 	AForm,
 	ANumericInput,
 	ATextInput,

diff --git a/atable/CHANGELOG.json b/atable/CHANGELOG.json
@@ -1,6 +1,72 @@
 {
   "name": "@stonecrop/atable",
   "entries": [
+    {
+      "version": "0.2.33",
+      "tag": "@stonecrop/atable_v0.2.33",
+      "date": "Mon, 16 Sep 2024 11:56:08 GMT",
+      "comments": {}
+    },
+    {
+      "version": "0.2.32",
+      "tag": "@stonecrop/atable_v0.2.32",
+      "date": "Mon, 16 Sep 2024 11:27:59 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "update vitest dependencies"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.2.31",
+      "tag": "@stonecrop/atable_v0.2.31",
+      "date": "Fri, 13 Sep 2024 12:32:59 GMT",
+      "comments": {}
+    },
+    {
+      "version": "0.2.30",
+      "tag": "@stonecrop/atable_v0.2.30",
+      "date": "Fri, 13 Sep 2024 12:28:54 GMT",
+      "comments": {}
+    },
+    {
+      "version": "0.2.29",
+      "tag": "@stonecrop/atable_v0.2.29",
+      "date": "Wed, 11 Sep 2024 18:43:29 GMT",
+      "comments": {}
+    },
+    {
+      "version": "0.2.28",
+      "tag": "@stonecrop/atable_v0.2.28",
+      "date": "Fri, 16 Aug 2024 11:08:03 GMT",
+      "comments": {}
+    },
+    {
+      "version": "0.2.27",
+      "tag": "@stonecrop/atable_v0.2.27",
+      "date": "Thu, 25 Jul 2024 12:21:08 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Add context to cell format function"
+          }
+        ]
+      }
+    },
+    {
+      "version": "0.2.26",
+      "tag": "@stonecrop/atable_v0.2.26",
+      "date": "Wed, 24 Jul 2024 13:12:28 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "added ui icons to atable"
+          }
+        ]
+      }
+    },
     {
       "version": "0.2.25",
       "tag": "@stonecrop/atable_v0.2.25",