Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Continuous Integration

on:
Expand All @@ -13,7 +10,7 @@ jobs:
name: "Lint"
runs-on: ubuntu-latest
timeout-minutes: 10

strategy:
matrix:
node-version: [18.x]
Expand All @@ -24,11 +21,14 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: npm
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: latest
- name: Install Dependencies
run: yarn install --frozen-lockfile
run: pnpm install --frozen-lockfile
- name: Lint
run: yarn run lint
run: pnpm run lint

build:
runs-on: ubuntu-latest
Expand All @@ -40,9 +40,16 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- run: yarn install --frozen-lockfile
- run: yarn build
- run: yarn test
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: latest
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Build
run: pnpm build
- name: Test
run: pnpm test
9 changes: 9 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
engine-strict=true
auto-install-peers=true
strict-peer-dependencies=false
shamefully-hoist=true
public-hoist-pattern[]=*ember*
public-hoist-pattern[]=*fastboot*
public-hoist-pattern[]=@glimmer/*
public-hoist-pattern[]=**/ember-cli-htmlbars
public-hoist-pattern[]=**/htmlbars-inline-precompile
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Now you should install the required packages to run this project by doing:

```

yarn or yarn install
pnpm install

```

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ You will need the following things properly installed on your computer.

- `git clone <repository-url>` this repository
- `cd website-www`
- `yarn install`
- `pnpm install`

## Running / Development

Expand All @@ -35,8 +35,8 @@ Make use of the many generators for code, try `ember help generate` for more det

### Linting

- `npm run lint`
- `npm run lint:fix`
- `pnpm run lint`
- `pnpm run lint:fix`

### Building

Expand Down
20 changes: 11 additions & 9 deletions app/controllers/live.js
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ export default class LiveController extends Controller {
this.answerValidationDetails.helperText = `Minimum character limit is ${ANSWER_MIN_LENGTH} characters`;
this.answerValidationDetails.isHelperTextVisible = true;

this.answerValidationDetails = this.answerValidationDetails;
this.answerValidationDetails = { ...this.answerValidationDetails };

this.answerSubmitButtonState.isDisabled = true;
this.answerSubmitButtonState = this.answerSubmitButtonState;
this.answerSubmitButtonState = { ...this.answerSubmitButtonState };

return;
}
Expand All @@ -210,10 +210,10 @@ export default class LiveController extends Controller {
this.answerValidationDetails.isError = true;
this.answerValidationDetails.helperText = `Maximum character limit is ${maxCharacters} characters`;
this.answerValidationDetails.isHelperTextVisible = true;
this.answerValidationDetails = this.answerValidationDetails;
this.answerValidationDetails = { ...this.answerValidationDetails };

this.answerSubmitButtonState.isDisabled = true;
this.answerSubmitButtonState = this.answerSubmitButtonState;
this.answerSubmitButtonState = { ...this.answerSubmitButtonState };
} else {
this.resetAnswerValidators();
}
Expand All @@ -223,7 +223,8 @@ export default class LiveController extends Controller {
this.answerSubmitButtonState.isLoading = true;
this.answerSubmitButtonState.isDisabled = true;

this.answerSubmitButtonState = this.answerSubmitButtonState;
this.answerValidationDetails = { ...this.answerValidationDetails };
this.answerSubmitButtonState = { ...this.answerSubmitButtonState };

const answerBody = {
answer: this.answerValue.trim(),
Expand All @@ -238,7 +239,8 @@ export default class LiveController extends Controller {
this.isAnswerReplyModalOpen = false;
this.answerSubmitButtonState.isLoading = false;
this.answerSubmitButtonState.isDisabled = false;
this.answerSubmitButtonState = this.answerSubmitButtonState;
this.answerValidationDetails = { ...this.answerValidationDetails };
this.answerSubmitButtonState = { ...this.answerSubmitButtonState };
}
}

Expand Down Expand Up @@ -291,10 +293,10 @@ export default class LiveController extends Controller {
this.answerValidationDetails.isError = false;
this.answerValidationDetails.helperText = '';
this.answerValidationDetails.isHelperTextVisible = false;
this.answerValidationDetails = this.answerValidationDetails;
this.answerValidationDetails = { ...this.answerValidationDetails };

this.answerSubmitButtonState.isDisabled = false;
this.answerSubmitButtonState = this.answerSubmitButtonState;
this.answerSubmitButtonState = { ...this.answerSubmitButtonState };
}
questionSSEListener() {
const event = new EventSource(`${APPS.API_BACKEND}/questions`);
Expand All @@ -312,7 +314,7 @@ export default class LiveController extends Controller {
this.answerValidationDetails.isError = false;
this.answerValidationDetails.helperText = `Minimum character limit is ${ANSWER_MIN_LENGTH} characters`;
this.answerValidationDetails.isHelperTextVisible = true;
this.answerValidationDetails = this.answerValidationDetails;
this.answerValidationDetails = { ...this.answerValidationDetails };

if (isQuestionChanged) {
this.answerEventSource?.close();
Expand Down
Loading