@axdspub/axiom-charts 0.0.7 → 0.0.10

package/.eslintrc.json

@@ -1,24 +1,24 @@
-{
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": [
-        "plugin:react/recommended",
-        "standard-with-typescript"
-    ],
-    "overrides": [
-    ],
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module",
-        "project": ["./tsconfig.json"]
-    },
-    "plugins": [
-        "react"
-    ],
-    "rules": {
-        "ignoreIIFE": 0
-    },
-    "ignorePatterns": ["**/build/*","**/node_modules/*", "**/library/"]
-}
+{
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "plugin:react/recommended",
+        "standard-with-typescript"
+    ],
+    "overrides": [
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module",
+        "project": ["./tsconfig.json"]
+    },
+    "plugins": [
+        "react"
+    ],
+    "rules": {
+        "ignoreIIFE": 0
+    },
+    "ignorePatterns": ["**/build/*","**/node_modules/*", "**/library/"]
+}

package/.gitlab-ci.yml

@@ -1,140 +1,140 @@
-stages:
-  - build
-  - test
-  - push
-  - clean
-  - deploy
-
-build_image:
-  stage: build
-  script:
-  - docker build -f Dockerfile -t $CI_PROJECT_NAME:$CI_PIPELINE_ID .
-  - docker build -f Dockerfile.storybook -t $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID .
-
-test:
-  stage: test
-  image: $CI_PROJECT_NAME:$CI_PIPELINE_ID
-  script:
-    - test -e /usr/share/nginx/html/index.html
-    - test -e /usr/share/nginx/html/asset-manifest.json
-
-test_storybook:
-  stage: test
-  image: $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID
-  script:
-    - test -e /usr/share/nginx/html/index.html
-    - test -e /usr/share/nginx/html/stories.json
-
-push_latest:
-  stage: push
-  only:
-    - main
-  script:
-    - docker tag $CI_PROJECT_NAME:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME:latest
-    - docker push registry.axiom/$CI_PROJECT_NAME:latest
-
-push_branch:
-  stage: push
-  only:
-    - branches
-  except:
-    - main
-  script:
-    - docker tag $CI_PROJECT_NAME:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-    - docker push registry.axiom/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-
-push_branch_storybook:
-  stage: push
-  only:
-    - branches
-  except:
-    - main
-  script:
-    - docker tag $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME-storybook:$CI_COMMIT_REF_NAME
-    - docker push registry.axiom/$CI_PROJECT_NAME-storybook:$CI_COMMIT_REF_NAME
-
-push_latest_storybook:
-  stage: push
-  only:
-    - main
-  script:
-    - docker tag $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME-storybook:latest
-    - docker push registry.axiom/$CI_PROJECT_NAME-storybook:latest
-
-push_tag:
-  stage: push
-  only:
-    - tags
-  script:
-    - docker tag $CI_PROJECT_NAME:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME:$CI_BUILD_TAG
-    - docker push registry.axiom/$CI_PROJECT_NAME:$CI_BUILD_TAG
-    - docker tag $CI_PROJECT_NAME:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME:prod
-    - docker push registry.axiom/$CI_PROJECT_NAME:prod
-
-push_tag_storybook:
-  stage: push
-  only:
-    - tags
-  script:
-    - docker tag $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME-storybook:$CI_BUILD_TAG
-    - docker push registry.axiom/$CI_PROJECT_NAME-storybook:$CI_BUILD_TAG
-    - docker tag $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME-storybook:prod
-    - docker push registry.axiom/$CI_PROJECT_NAME-storybook:prod
-
-
-clean_latest:
-  stage: clean
-  only:
-    - main
-  script:
-    - docker rmi --no-prune $CI_PROJECT_NAME:$CI_PIPELINE_ID
-    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME:latest
-
-clean_latest_storybook:
-  stage: clean
-  only:
-    - main
-  script:
-    - docker rmi --no-prune $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID
-    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME-storybook:latest
-
-clean_tag:
-  stage: clean
-  only:
-    - tags
-  script:
-    - docker rmi --no-prune $CI_PROJECT_NAME:$CI_PIPELINE_ID
-    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME:$CI_BUILD_TAG
-    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME:prod
-
-clean_tag_storybook:
-  stage: clean
-  only:
-    - tags
-  script:
-    - docker rmi --no-prune $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID
-    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME-storybook:$CI_BUILD_TAG
-    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME-storybook:prod
-
-deploy_app_and_storybook:
-  stage: deploy
-  only:
-    - main
-  script:
-    - aps apps-prod axiom-charts-and-storybook
-
-# deploy_prod:
-#   stage: deploy
-#   environment: production
-#   only:
-#     - tags
-#   script:
-#     - docker run --rm registry.axiom/ansible aps apps-prod $CI_PROJECT_NAME -e $CI_PROJECT_NAME_version=$CI_BUILD_TAG --tags deploy
-
-# deploy_prod_storybook:
-#   stage: deploy
-#   environment: production
-#   only:
-#     - tags
-#   script:
-#     - docker run --rm registry.axiom/ansible aps apps-prod $CI_PROJECT_NAME-storybook -e $CI_PROJECT_NAME-storybook_version=$CI_BUILD_TAG --tags deploy
+stages:
+  - build
+  - test
+  - push
+  - clean
+  - deploy
+
+build_image:
+  stage: build
+  script:
+  - docker build -f Dockerfile -t $CI_PROJECT_NAME:$CI_PIPELINE_ID .
+  - docker build -f Dockerfile.storybook -t $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID .
+
+test:
+  stage: test
+  image: $CI_PROJECT_NAME:$CI_PIPELINE_ID
+  script:
+    - test -e /usr/share/nginx/html/index.html
+    - test -e /usr/share/nginx/html/asset-manifest.json
+
+test_storybook:
+  stage: test
+  image: $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID
+  script:
+    - test -e /usr/share/nginx/html/index.html
+    - test -e /usr/share/nginx/html/stories.json
+
+push_latest:
+  stage: push
+  only:
+    - main
+  script:
+    - docker tag $CI_PROJECT_NAME:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME:latest
+    - docker push registry.axiom/$CI_PROJECT_NAME:latest
+
+push_branch:
+  stage: push
+  only:
+    - branches
+  except:
+    - main
+  script:
+    - docker tag $CI_PROJECT_NAME:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+    - docker push registry.axiom/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+
+push_branch_storybook:
+  stage: push
+  only:
+    - branches
+  except:
+    - main
+  script:
+    - docker tag $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME-storybook:$CI_COMMIT_REF_NAME
+    - docker push registry.axiom/$CI_PROJECT_NAME-storybook:$CI_COMMIT_REF_NAME
+
+push_latest_storybook:
+  stage: push
+  only:
+    - main
+  script:
+    - docker tag $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME-storybook:latest
+    - docker push registry.axiom/$CI_PROJECT_NAME-storybook:latest
+
+push_tag:
+  stage: push
+  only:
+    - tags
+  script:
+    - docker tag $CI_PROJECT_NAME:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME:$CI_BUILD_TAG
+    - docker push registry.axiom/$CI_PROJECT_NAME:$CI_BUILD_TAG
+    - docker tag $CI_PROJECT_NAME:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME:prod
+    - docker push registry.axiom/$CI_PROJECT_NAME:prod
+
+push_tag_storybook:
+  stage: push
+  only:
+    - tags
+  script:
+    - docker tag $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME-storybook:$CI_BUILD_TAG
+    - docker push registry.axiom/$CI_PROJECT_NAME-storybook:$CI_BUILD_TAG
+    - docker tag $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID registry.axiom/$CI_PROJECT_NAME-storybook:prod
+    - docker push registry.axiom/$CI_PROJECT_NAME-storybook:prod
+
+
+clean_latest:
+  stage: clean
+  only:
+    - main
+  script:
+    - docker rmi --no-prune $CI_PROJECT_NAME:$CI_PIPELINE_ID
+    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME:latest
+
+clean_latest_storybook:
+  stage: clean
+  only:
+    - main
+  script:
+    - docker rmi --no-prune $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID
+    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME-storybook:latest
+
+clean_tag:
+  stage: clean
+  only:
+    - tags
+  script:
+    - docker rmi --no-prune $CI_PROJECT_NAME:$CI_PIPELINE_ID
+    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME:$CI_BUILD_TAG
+    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME:prod
+
+clean_tag_storybook:
+  stage: clean
+  only:
+    - tags
+  script:
+    - docker rmi --no-prune $CI_PROJECT_NAME-storybook:$CI_PIPELINE_ID
+    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME-storybook:$CI_BUILD_TAG
+    - docker rmi --no-prune registry.axiom/$CI_PROJECT_NAME-storybook:prod
+
+deploy_app_and_storybook:
+  stage: deploy
+  only:
+    - main
+  script:
+    - aps apps-prod axiom-charts-and-storybook
+
+# deploy_prod:
+#   stage: deploy
+#   environment: production
+#   only:
+#     - tags
+#   script:
+#     - docker run --rm registry.axiom/ansible aps apps-prod $CI_PROJECT_NAME -e $CI_PROJECT_NAME_version=$CI_BUILD_TAG --tags deploy
+
+# deploy_prod_storybook:
+#   stage: deploy
+#   environment: production
+#   only:
+#     - tags
+#   script:
+#     - docker run --rm registry.axiom/ansible aps apps-prod $CI_PROJECT_NAME-storybook -e $CI_PROJECT_NAME-storybook_version=$CI_BUILD_TAG --tags deploy

package/README.md

@@ -1,49 +1,49 @@
-## Storybook
-
-`npm run storybook`
-
-## Local development
-
-Be sure yalc is installed:
-
-``
-
-Then
-
-`yalc publish`
-
-To update linked projects
-
-`yalc push`
-
-In consuming project:
-
-`yalc add @axdspub/axiom-ui-data-services`
-
-then
-
-`yalc link @axdspub/axiom-ui-data-services`
-
-
-# Publish
-
-```
-npm login --scope=@axdspub
-npm publish --dryrun
-```
-
-If all looks good
-
-```
-npm publish --access public
-```
-
-
-
-# Usage
-
-  
-# Todo
-
-Documentation
-
+## Storybook
+
+`npm run storybook`
+
+## Local development
+
+Be sure yalc is installed:
+
+``
+
+Then
+
+`yalc publish`
+
+To update linked projects
+
+`yalc push`
+
+In consuming project:
+
+`yalc add @axdspub/axiom-ui-data-services`
+
+then
+
+`yalc link @axdspub/axiom-ui-data-services`
+
+
+# Publish
+
+```
+npm login --scope=@axdspub
+npm publish --dryrun
+```
+
+If all looks good
+
+```
+npm publish --access public
+```
+
+
+
+# Usage
+
+  
+# Todo
+
+Documentation
+

package/craco.config.js

@@ -1,36 +1,36 @@
-const path = require('path')
-// someday, clean up the the FOUR! repeated declarations of aliases (others are is in tsconfig.paths.json => tsconfig.json and .storybook/main.ts)
-// https://stackoverflow.com/a/71892901
-console.log(path.resolve(__dirname, './src/'))
-
-module.exports = {
-  webpack: {
-    eslint: {
-      enable: false
-    },
-    typescript: {
-      enableTypeChecking: true
-    },
-    alias: {
-      '@': path.resolve(__dirname, './src/')
-    },
-    configure: {
-      ignoreWarnings: [/Failed to parse source map/],
-      resolve: {
-        fallback: {
-          https: false,
-          http: false,
-          path: false,
-          zlib: false
-        }
-      }
-    }
-  },
-  jest: {
-    configure: {
-      verbose: true,
-      moduleNameMapper: {}
-    }
-  },
-  plugins: []
-}
+const path = require('path')
+// someday, clean up the the FOUR! repeated declarations of aliases (others are is in tsconfig.paths.json => tsconfig.json and .storybook/main.ts)
+// https://stackoverflow.com/a/71892901
+console.log(path.resolve(__dirname, './src/'))
+
+module.exports = {
+  webpack: {
+    eslint: {
+      enable: false
+    },
+    typescript: {
+      enableTypeChecking: true
+    },
+    alias: {
+      '@': path.resolve(__dirname, './src/')
+    },
+    configure: {
+      ignoreWarnings: [/Failed to parse source map/],
+      resolve: {
+        fallback: {
+          https: false,
+          http: false,
+          path: false,
+          zlib: false
+        }
+      }
+    }
+  },
+  jest: {
+    configure: {
+      verbose: true,
+      moduleNameMapper: {}
+    }
+  },
+  plugins: []
+}

package/docker-compose.yml

@@ -1,18 +1,18 @@
-services:
-  app:
-    image: axiom-charts:latest
-    build:
-      context:      .
-      dockerfile:   Dockerfile
-    ports:
-    - "8787:80"
-    # profiles:
-    #   - app
-
-  storybook:
-    image: axiom-charts-storybook:latest
-    build:
-      context:      .
-      dockerfile:   Dockerfile.storybook
-    ports:
-    - "8888:80"
+services:
+  app:
+    image: axiom-charts:latest
+    build:
+      context:      .
+      dockerfile:   Dockerfile
+    ports:
+    - "8787:80"
+    # profiles:
+    #   - app
+
+  storybook:
+    image: axiom-charts-storybook:latest
+    build:
+      context:      .
+      dockerfile:   Dockerfile.storybook
+    ports:
+    - "8888:80"

package/library/Libraries/axiom/index.js

@@ -434,6 +434,7 @@ var ChartRoot = /** @class */ (function () {
                     case 1:
                         _a.sent();
                         this.showYAxes(yAxes);
+                        this.showYLabels(yAxes, this.plots);
                         yAxesWidth = this.getYAxesWidth();
                         chartWidth = this.getChartWidth();
                         xRange = this.getXRange(chartWidth);
@@ -491,6 +492,8 @@ var ChartRoot = /** @class */ (function () {
     };
     ChartRoot.prototype.showYAxes = function (yAxes) {
     };
+    ChartRoot.prototype.showYLabels = function (yAxes, plots) {
+    };
     ChartRoot.prototype.showXAxes = function (xAxes) {
     };
     ChartRoot.prototype.draw = function () {
@@ -859,7 +862,7 @@ function styleInject(css, ref) {
   }
 }
 
-var css_248z = ".chart .axis .tick text{\r\n    fill:#333;\r\n    font-size:12px;\r\n}\r\n\r\n.chart .y-axis .radial-axis .tick text{\r\n    stroke:#FFF;\r\n    stroke-width:5px;\r\n    paint-order: stroke;\r\n    font-size:14px;\r\n    fill:#000;\r\n\r\n}\r\n\r\n.chart .axis .tick line,\r\n.chart .axis .tick circle{\r\n    stroke:#CCC;\r\n    stroke-width:.5px;\r\n}";
+var css_248z = ".chart .axis .tick text{\n    fill:#333;\n    font-size:12px;\n}\n\n.chart .y-axis .radial-axis .tick text{\n    stroke:#FFF;\n    stroke-width:5px;\n    paint-order: stroke;\n    font-size:14px;\n    fill:#000;\n\n}\n\n.chart .axis .tick line,\n.chart .axis .tick circle{\n    stroke:#CCC;\n    stroke-width:.5px;\n}";
 styleInject(css_248z);
 
 var AxiomChart = /** @class */ (function (_super) {
@@ -945,6 +948,29 @@ var AxiomChart = /** @class */ (function (_super) {
             }
         });
     };
+    AxiomChart.prototype.showYLabels = function (axes, plots) {
+        var _a;
+        if (plots.length > 1) {
+            return;
+        }
+        if (plots[0].type !== EPlotTypes.line) {
+            return;
+        }
+        var chartElements = this.getChartElements();
+        var label = (_a = axes[0].plots[0].dimensions.y.label) !== null && _a !== void 0 ? _a : '';
+        if (chartElements === undefined) {
+            return undefined;
+        }
+        var svg = chartElements.svg;
+        var axisSelection = svg.select('.y-axis').size() > 0 ? svg.select('.y-axis') : svg.append('g').attr('class', 'y-axis axis');
+        axisSelection.append('text')
+            .attr('class', 'y-label')
+            .attr('text-anchor', 'end')
+            .attr('dy', '.75rem')
+            .attr('font-size', '.75rem')
+            .attr('transform', 'rotate(-90)')
+            .text(label);
+    };
     AxiomChart.prototype.getXAxisOffset = function (axis) {
         return __assign({ x: this.settings.margin.left, y: this.settings.height - this.settings.margin.bottom }, axis.offset);
     };