Skip to content

Commit

Permalink
Merge pull request #334 from oslokommune/develop
Browse files Browse the repository at this point in the history
Release 2.7.2
  • Loading branch information
maynkj authored Jan 27, 2022
2 parents 9ed73b5 + ee7d91d commit 0476cfa
Show file tree
Hide file tree
Showing 21 changed files with 8,640 additions and 5,367 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ module.exports = {
root: true,
env: {
node: true,
jest: true,
},
extends: ['plugin:vue/recommended', 'airbnb-base', 'prettier'],
plugins: ['prettier'],
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
restore-keys: |
${{ runner.os }}-${{ hashFiles('package-lock.json') }}
# Runs a single command using the runners shell
- name: Use Node.js ${{matrix.node-version}}
uses: actions/setup-node@v2
Expand All @@ -52,5 +51,8 @@ jobs:
run: |
npm run lint
npm run lint:style
- name: npm test:unit
run: |
npm run test:unit
env:
CI: true
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format

## [UNRELEASED]

## [2.7.2] 2022-01-27

### Changes

- Minor style changes

### Fixed

- Bugs in key result progress info

## [2.7.1] 2021-12-30

### Changes
Expand Down Expand Up @@ -104,21 +114,25 @@ Last minor update before releasing our new design. New updates from now on will
We have added another slackbot integration. The new slackbot integration pushes changes to organizations/departments/products.

You can call the slack bot with the command `/okr`. The different commands to the slack bot are:

- `subscribe organization/department/product slug` - subscribe to a specific org/dep/prod
- `unsubscribe organization/department/product slug` - unsubscribe
- `subscribe/all organization/department slug` - subscribe to a specific org/dep/prod and all its children (departments/products)
- `unsubscribe/all organization/department slug` - unsubscribe to everything

What types of updates does the bot push?
Changes to the:

- name
- mission statement

Creation of:

- Objectives
- Key Results

Caveats:

- If you run subscribe/all once on an organization/department and create a new product after that
- run subscribe/all again, because we don't add new children to the parent subscription

Expand Down Expand Up @@ -180,20 +194,23 @@ Now we would get updates to our slack channel with changes to our product, datas
We have added another lever of admin, called super admin. We are sorry, but you need to update some database documents to make this work.

Super Admin can:

- do the same things as an admin and normal member
- restore backups
- promote or demote admins
- migrate data
- create/restore/change organizations

Admins can:

- do the same things as a member
- add new users to the OKR-tracker
- administrate an organization they are apart of
- administrate multiple products within the same organization
- administrate multiple departments within the same organization

Member of a product or department or organization

- has rights to administrate its own product/org/departments
- ... such as add/remove members from a product/org/department
- or update/delete/archive
Expand Down
12 changes: 12 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = {
verbose: true,
roots: ['src', 'tests'],
moduleFileExtensions: ['js', 'vue'],
transform: {
'^.+\\.(ts|tsx|js|jsx)$': 'babel-jest',
},
testRegex: '(/__tests__/.*|(\\.|/)(test))\\.(j|t)sx?$',
transformIgnorePatterns: [
'<rootDir>/node_modules/(?!(internmap|d3-array|d3-ease|d3-path|d3-time|d3-axis|d3-format|d3-scale|d3-time-format|d3-color|d3-hierarchy|d3-selection|d3-timer|d3-dispatch|d3-interpolate|d3-shape|d3-transition)/)',
],
};
Loading

0 comments on commit 0476cfa

Please sign in to comment.