Merge branch '3.2' into 3

silverstripe · Jun 20, 2024 · 319b787 · 319b787
2 parents 32c0c3c + ac614df
commit 319b787
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 33 deletions.
diff --git a/.github/workflows/add-prs-to-project.yml b/.github/workflows/add-prs-to-project.yml
@@ -0,0 +1,22 @@
+name: Add new PRs to github project
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - ready_for_review
+
+permissions: {}
+
+jobs:
+  addprtoproject:
+    name: Add PR to GitHub Project
+    # Only run on the silverstripe account
+    if: github.repository_owner == 'silverstripe'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add PR to github project
+        uses: silverstripe/gha-add-pr-to-project@v1
+        with:
+          app_id: ${{ vars.PROJECT_PERMISSIONS_APP_ID }}
+          private_key: ${{ secrets.PROJECT_PERMISSIONS_APP_PRIVATE_KEY }}
diff --git a/.stylelintignore b/.stylelintignore
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
diff --git a/client/src/components/TagField.scss b/client/src/components/TagField.scss
@@ -1,5 +1,22 @@
 .ss-tag-field__multi-value {
   margin-top: 3px;
+  color: $body-color;
+  background-color: $white;
+  border: 1px solid $input-focus-border-color;
+  border-radius: $border-radius;
+}
+
+.ss-tag-field__multi-value__remove {
+  font-size: $font-size-lg;
+  padding: 0 5px 2px;
+  border-left: 1px solid $input-focus-border-color;
+  border-radius: 0;
+
+  &:focus,
+  &:hover {
+    background-color: rgba(0, 113, 230, .08);
+    color: #0071e6;
+  }
 }
 
 /* Styles below here are duplicates of the treedropdownfield styles in silverstripe/admin, but with the appropriate classnames for tagfield. */
@@ -22,7 +39,7 @@
   border-radius: $border-radius;
   background: $white;
   // needed to override the width rule in .fill-width
-  width: auto !important; // sass-lint:disable-line no-important
+  width: auto !important;
   max-width: 25%;
   margin: -4px -5px -4px 5px;
   padding: 4px 5px 4px 4px;
@@ -89,26 +106,6 @@
   }
 }
 
-.ss-tag-field__multi-value {
-  color: $body-color;
-  background-color: $white;
-  border: 1px solid $input-focus-border-color;
-  border-radius: $border-radius;
-}
-
-.ss-tag-field__multi-value__remove {
-  font-size: $font-size-lg;
-  padding: 0 5px 2px;
-  border-left: 1px solid $input-focus-border-color;
-  border-radius: 0;
-
-  &:focus,
-  &:hover {
-    background-color: rgba(0, 113, 230, .08);
-    color: #0071e6;
-  }
-}
-
 .ss-tag-field__menu {
   z-index: 10;
 }
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "test": "jest",
     "coverage": "jest --coverage",
     "lock": "npm-shrinkwrap --dev",
-    "lint": "eslint client/src && yarn lint-sass",
+    "lint": "yarn lint-js && yarn lint-sass",
     "lint-js": "eslint client/src",
     "lint-js-fix": "eslint client/src --fix",
     "lint-sass": "stylelint client/src"
@@ -38,7 +38,7 @@
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@silverstripe/eslint-config": "^1.2.1",
+    "@silverstripe/eslint-config": "^1.3.0",
     "@silverstripe/webpack-config": "^2.1.0",
     "@testing-library/react": "^14.0.0",
     "babel-jest": "^29.2.2",

diff --git a/src/TagField.php b/src/TagField.php
@@ -195,7 +195,7 @@ public function getSourceList()
      * Set the model class name for tags
      *
      * @param DataList $sourceList
-     * @return self
+     * @return TagField
      */
     public function setSourceList($sourceList)
     {
@@ -210,7 +210,7 @@ public function Field($properties = [])
     {
         $this->addExtraClass('entwine');
 
-        return $this->customise($properties)->renderWith(self::class);
+        return $this->customise($properties)->renderWith(TagField::class);
     }
 
     /**
@@ -618,9 +618,9 @@ public function getSchemaStateDefaults()
     public function getSchemaDataType(): string
     {
         if ($this->getIsMultiple()) {
-            return self::SCHEMA_DATA_TYPE_MULTISELECT;
+            return TagField::SCHEMA_DATA_TYPE_MULTISELECT;
         }
 
-        return self::SCHEMA_DATA_TYPE_SINGLESELECT;
+        return TagField::SCHEMA_DATA_TYPE_SINGLESELECT;
     }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1673,10 +1673,10 @@
   resolved "https://registry.yarnpkg.com/@sect/modernizr-loader/-/modernizr-loader-1.0.5.tgz#512afc60c715cd658fdffab244123661e1339083"
   integrity sha512-L8y2BTVeLtdSe1XzBcD2DOlc+7fR7Z/uNdhsKvf3d3x3gmEKz9sfl2wJ3VzFhEd+a/O6qgacuhbziphG2p4s8g==
 
-"@silverstripe/eslint-config@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.2.1.tgz#17ed5e955308a4a89e87f5090df66ca1e8ea462d"
-  integrity sha512-T4Lz1aZEDLxRpSNe4EgEmLKPfofxba0p0+YkL/AOD8VM/sng7VM9vKwMoqICbsUGvNoymHfeWtARlCa575O4PA==
+"@silverstripe/eslint-config@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@silverstripe/eslint-config/-/eslint-config-1.3.0.tgz#fa88f47cacd6103f6b759d81e1d86f9e93799413"
+  integrity sha512-Q3+sQKO1ysyMLhJ91kOl2LqJhQICfHFeqMx09EH0xx3dRHgjsQvqHIzVWEzPkM/l7D79m+Ma/WBnon30S7TVlA==
   dependencies:
     eslint "^8.26.0"
     eslint-config-airbnb "^19.0.4"