Merge branch '6' into 7

symbiote · Jun 20, 2024 · 0e0b893 · 0e0b893
2 parents acf1a90 + c308179
commit 0e0b893
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 33 deletions.
diff --git a/client/dist/styles/advancedworkflow.css b/client/dist/styles/advancedworkflow.css
diff --git a/client/src/styles/AdvancedWorkflowAdmin.scss b/client/src/styles/AdvancedWorkflowAdmin.scss
@@ -9,7 +9,6 @@
 }
 
 // Embargo & expiry badge styling
-//
 // 3 different statuses - embargo, expiry, embargo & expiry (both assigned)
 // Note: CSS nesting convention based on SilverStripe admin styling
 .cms-tree.jstree {

diff --git a/client/src/styles/WorkflowField.scss b/client/src/styles/WorkflowField.scss
@@ -41,21 +41,14 @@
 
  .workflow-field-action-disabled {
  opacity: 0.35;
- filter: Alpha(Opacity=35);
+ filter: alpha(Opacity=35);
  cursor: default;
 
  // These default styles are taken from .ss-ui-button (_forms.scss) so we don't end up with mousover/focus states on disabled buttons.
  // @todo These styles need to be dynamcally included from CMS, they are obviousely "hard-coded" for now.
  &.ui-state-hover,
  &.ui-state-focus {
  text-decoration: none;
- background-color: #e6e6e6;
- background: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2Q5ZDlkOSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==");
- background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, $white), color-stop(100%, $grey-lightish));
- background: -webkit-linear-gradient($white, $grey-lightish);
- background: -moz-linear-gradient($white, $grey-lightish);
- background: -o-linear-gradient($white, $grey-lightish);
- background: -ms-linear-gradient($white, $grey-lightish);
  background: linear-gradient($white, $grey-lightish);
  text-shadow: $white 0 1px 1px;
  -webkit-box-shadow: none;
@@ -89,7 +82,7 @@
  .workflow-field-action-icon {
  width: 16px;
  height: 16px;
- margin: calc($wf-height / 4) $wf-grid 0 $wf-grid;
+ margin: calc($wf-height / 4) $wf-grid 0;
  }
 
  h4 {
@@ -150,12 +143,9 @@
  .workflow-field-loading {
  background: rgba(0, 0, 0, .15) url("../images/spinner.gif") no-repeat center center;
  border-radius: 0 0 $wf-radius $wf-radius;
- bottom: 0;
+ inset: 0;
  display: none;
- left: 0;
  position: absolute;
- right: 0;
- top: 0;
  z-index: 999;
  }
 }

diff --git a/client/src/styles/WorkflowGridField.scss b/client/src/styles/WorkflowGridField.scss
@@ -3,7 +3,7 @@
  .disabled {
  a.action {
  opacity: 0.35;
- filter: Alpha(Opacity=35);
+ filter: alpha(Opacity=35);
  cursor: default;
  }
  }

diff --git a/client/src/styles/bundle.scss b/client/src/styles/bundle.scss
@@ -1,8 +1,6 @@
 // See includePaths in webpack.config.js
 @import "variables";
-
 @import "workflow-variables";
-
 @import "AdvancedWorkflowAdmin";
 @import "WorkflowField";
 @import "WorkflowGridField";
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
  "dev": "NODE_ENV=development webpack --progress",
  "watch": "yarn && NODE_ENV=development webpack --watch --progress",
  "css": "WEBPACK_CHILD=css npm run build",
- "lint": "eslint client/src; stylelint client/src/**/*.scss"
+ "lint": "eslint client/src; stylelint client/src"
  },
  "repository": {
  "type": "git",
@@ -25,7 +25,7 @@
  "homepage": "https://github.com/symbiote/silverstripe-advancedworkflow#readme",
  "dependencies": {},
  "devDependencies": {
- "@silverstripe/eslint-config": "^1.2.1",
+ "@silverstripe/eslint-config": "^1.3.0",
  "@silverstripe/webpack-config": "^2.1.0",
  "webpack": "^5.74.0",
  "webpack-cli": "^5.0.0"

diff --git a/src/DataObjects/WorkflowDefinition.php b/src/DataObjects/WorkflowDefinition.php
@@ -473,7 +473,7 @@ public function incomingTitle()
  } elseif (isset($req['Title']) && !empty($req['Title'])) {
  $incomingTitle = $req['Title'];
  } else {
- $incomingTitle = self::$default_workflow_title_base;
+ $incomingTitle = WorkflowDefinition::$default_workflow_title_base;
  }
  return $incomingTitle;
  }

diff --git a/src/DataObjects/WorkflowTransition.php b/src/DataObjects/WorkflowTransition.php
@@ -282,19 +282,19 @@ public function extendedRequiredFieldsNotSame($data = null)
  $check = array('ActionID','NextActionID');
  foreach ($check as $fieldName) {
  if (!isset($data[$fieldName])) {
- return self::$extendedMethodReturn;
+ return WorkflowTransition::$extendedMethodReturn;
  }
  }
  // Have we found some identical values?
  if ($data[$check[0]] == $data[$check[1]]) {
  // Used to display to the user, so the first of the array is fine
- self::$extendedMethodReturn['fieldName'] = $check[0];
- self::$extendedMethodReturn['fieldValid'] = false;
- self::$extendedMethodReturn['fieldMsg'] = _t(
+ WorkflowTransition::$extendedMethodReturn['fieldName'] = $check[0];
+ WorkflowTransition::$extendedMethodReturn['fieldValid'] = false;
+ WorkflowTransition::$extendedMethodReturn['fieldMsg'] = _t(
  'WorkflowTransition.TRANSITIONLOOP',
  'A transition cannot lead back to its parent action.'
  );
  }
- return self::$extendedMethodReturn;
+ return WorkflowTransition::$extendedMethodReturn;
  }
 }