Option to use Azure search with the chatbot

.husky/lint-staged.config.js → .husky/lint-staged.branch-ready.config.js

@@ -1,4 +1,7 @@
-module.exports = {
+// Runs when you run bin/git-run-branch-ready-checks.
+// These checks are slower and more likely to fail than the precommit checks.
+// See lint-staged.precommit.config.js for precommit checks.
+ module.exports = {
   "*.{js,jsx,ts,tsx}": ["eslint --cache --fix", "stylelint --fix"],
   "services/example-exercise/src/**/*.{js,jsx,ts,tsx}": () =>
     "npx tsc -p services/example-exercise/ --noEmit",

.husky/lint-staged.precommit.config.js

@@ -0,0 +1,13 @@
+// Runs on precommit.
+// Focuses on tests that are fast to run don't fail often. For other checks, see bin/git-run-branch-ready-checks and lint-staged.branch-ready.config.js
+module.exports = {
+  "*.{js,jsx,ts,tsx}": ["eslint --cache --fix", "stylelint --fix"],
+  "*.{md,json,scss,css}": "prettier --write",
+  "*.rs": () => [
+    "cargo fmt --manifest-path services/headless-lms/Cargo.toml --all -- --files-with-diff",
+  ],
+  "system-tests/src/**/*.{js,jsx,ts,tsx}": () => [
+    `./bin/check-no-test-only-in-system-tests`,
+  ],
+  "shared-module/packages/common/src/locales/**/*.json": () => ["./bin/translations-sort"],
+}

.husky/post-commit

@@ -1,19 +1,9 @@
 #!/bin/sh
-LAST_TIME_PRECOMMIT_SUCCESSFUL=".husky/_/saved-hashes/last-time-precommit-succesful"
-# Read the the saved UNIX timestamp from the file and check if the timestamp is recent
-if [ -f "$LAST_TIME_PRECOMMIT_SUCCESSFUL" ] && [ $(($(date +%s) - $(cat "$LAST_TIME_PRECOMMIT_SUCCESSFUL"))) -lt 3000 ]; then
-  # The precommit checks were successful recently so no need to print the warning
-  rm "$LAST_TIME_PRECOMMIT_SUCCESSFUL" 2> /dev/null || true
-  exit 0
-fi
 
-rm "$LAST_TIME_PRECOMMIT_SUCCESSFUL" 2> /dev/null || true
-
-echo "ℹ️  Detected you used git commit with --no-verify. This may be fine if you don't want to wait for the checks to complete, but you'll need to ensure all the skipped checks pass before you create a pull request or your branch is merged."
 echo ""
 echo "👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇👇"
 echo ""
-printf "\033[1;31m⚠️  ONCE YOU'RE READY WITH THE BRANCH, RUN bin/git-run-precommit-checks AND MAKE SURE EVERYTHING PASSES ⚠️\033[0m\n"
+printf "\033[1;31m⚠️  ONCE YOU'RE READY WITH THE BRANCH, RUN bin/git-run-branch-ready-checks AND MAKE SURE EVERYTHING PASSES ⚠️\033[0m\n"
 echo ""
 echo "👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆"
 echo ""

.husky/pre-commit

@@ -4,8 +4,4 @@
 # Makes the check faster, and the database does not have to be running to commit
 export SQLX_OFFLINE=1
 
-npx lint-staged -c ./.husky/lint-staged.config.js
-
-# Save the last time this was succesfully ran so that we can detect in post-commit if this script was skipped with --no-verify
-LAST_TIME_PRECOMMIT_SUCCESSFUL=".husky/_/saved-hashes/last-time-precommit-succesful"
-date +%s > "$LAST_TIME_PRECOMMIT_SUCCESSFUL"
+npx lint-staged -c ./.husky/lint-staged.precommit.config.js

README.md

@@ -1,4 +1,5 @@
 # Secret Project 331
+
 ## Development environment setup
 
 Read [Development.md](https://github.com/rage/secret-project-331/blob/master/docs/Development.md) on how to setup using Windows or Linux.
@@ -12,7 +13,7 @@ bin/seed
 ## Code style:
 
 ```bash
-npm run eslint
+bin/git-run-branch-ready-checks
 ```
 
 ## Documentation

bin/git-run-precommit-checks → bin/git-run-branch-ready-checks

@@ -2,7 +2,7 @@
 set -euo pipefail
 source "$(dirname "$0")/.common"
 
-echo -e "${BLUE}Runs precommit checks manually by comparing what has changed in this branch. You have to use this command if you have used git commit with --no-verify at some point.${RESET_EVERYTHING}"
+echo -e "${BLUE}Checks code for common issues. This script should be used when you're done with branch, and you want to do finishing touches to it..${RESET_EVERYTHING}"
 echo -e "${BLUE}It might be a good idea to also run ${BOLD}bin/git-merge-origin-master${RESET_EVERYTHING}"
 echo ""
 
@@ -15,6 +15,6 @@ run_command cd "$RELATIVE_PATH"
 CURRENT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
 MERGE_BASE=$(git merge-base origin/master "$CURRENT_BRANCH_NAME")
 
-run_command npx lint-staged -c ./.husky/lint-staged.config.js --diff "$MERGE_BASE" "$@"
+run_command npx lint-staged -c ./.husky/lint-staged.branch-ready.config.js --diff "$MERGE_BASE" "$@"
 
 echo -e "${GREEN}✅ All precommit checks passed.${RESET_EVERYTHING}"

kubernetes/base/headless-lms/chatbot-syncer.yml

@@ -0,0 +1,54 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: chatbot-syncer
+  labels:
+    app: chatbot-syncer
+    deploymentType: with-init-container
+    needs-db: "true"
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: chatbot-syncer
+  template:
+    metadata:
+      annotations:
+        linkerd.io/inject: enabled
+      labels:
+        app: chatbot-syncer
+    spec:
+      containers:
+        - name: chatbot-syncer
+          image: headless-lms
+          command: ["bin/run", "chatbot-syncer"]
+          resources:
+            requests:
+              memory: 100Mi
+              cpu: 20m
+            limits:
+              memory: 300Mi
+              cpu: 200m
+          envFrom:
+            - secretRef:
+                name: headless-lms-secrets
+      initContainers:
+        - name: headless-lms-wait-for-db
+          image: headless-lms
+          command:
+            - bash
+            - "-c"
+            - |
+              echo Waiting for postgres to be available
+              timeout 120 ./wait-for-db.sh
+              ./wait-for-db-migrations.sh
+          resources:
+            requests:
+              memory: 100Mi
+              cpu: 20m
+            limits:
+              memory: 300Mi
+              cpu: 200m
+          envFrom:
+            - secretRef:
+                name: headless-lms-secrets

kubernetes/base/kustomization.yaml

@@ -17,3 +17,4 @@ resources:
   - headless-lms/regrader.yml
   - headless-lms/peer-review-updater.yml
   - headless-lms/sync-tmc-users.yml
+  - headless-lms/chatbot-syncer.yml

services/course-material/src/components/chatbot/ChatbotDialog.tsx

@@ -1,6 +1,6 @@
 import { css, keyframes } from "@emotion/css"
 import { useQuery } from "@tanstack/react-query"
-import { useEffect, useState } from "react"
+import React, { useEffect, useState } from "react"
 
 import ChatbotDialogBody from "./ChatbotDialogBody"
 import ChatbotDialogHeader from "./ChatbotDialogHeader"
@@ -39,6 +39,8 @@ const ChatbotDialog: React.FC<ChatbotDialogProps> = (props) => {
   const { dialogOpen, chatbotConfigurationId } = props
   const [shouldRender, setShouldRender] = useState(dialogOpen)
 
+  const [error, setError] = useState<Error | null>(null)
+
   const currentConversationInfoQuery = useQuery({
     queryKey: ["currentConversationInfo", chatbotConfigurationId],
     queryFn: () => getChatbotCurrentConversationInfo(chatbotConfigurationId),
@@ -83,7 +85,12 @@ const ChatbotDialog: React.FC<ChatbotDialogProps> = (props) => {
       onAnimationEnd={handleAnimationEnd}
     >
       <ChatbotDialogHeader {...props} currentConversationInfo={currentConversationInfoQuery} />
-      <ChatbotDialogBody {...props} currentConversationInfo={currentConversationInfoQuery} />
+      <ChatbotDialogBody
+        {...props}
+        currentConversationInfo={currentConversationInfoQuery}
+        error={error}
+        setError={setError}
+      />
     </div>
   )
 }