Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:

- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
with:
python-version: "3.12.5"
python-version: "3.12.6"
cache: "poetry"

- name: Validate lockfile
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ repos:
- ".*/generated/"
additional_dependencies: ["gibberish-detector"]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.6.6"
rev: "v0.6.7"
hooks:
- id: ruff-format
- id: ruff
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12.5
FROM python:3.12.6
LABEL maintainer "ODL DevOps <mitx-devops@mit.edu>"

# Add package files, install updated node and pip
Expand Down
14 changes: 14 additions & 0 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
Release Notes
=============

Version 0.20.0
--------------

- updated header (#1622)
- Switch to using full name (#1621)
- Update dependency lxml to v5 (#1554)
- Remove health checks against opensearch (#1620)
- Add additional event capturing for some interactions (#1596)
- Revert "changes for formatting search subscription emails"
- changes for formatting search subscription emails
- Add custom label for percolate query subscriptions (#1610)
- Update Python to v3.12.6 (#1593)
- [pre-commit.ci] pre-commit autoupdate (#1601)

Version 0.19.6 (Released September 27, 2024)
--------------

Expand Down
6 changes: 0 additions & 6 deletions docker-compose.apps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ services:
build:
context: .
dockerfile: Dockerfile
extends:
file: docker-compose.opensearch.${OPENSEARCH_CLUSTER_TYPE:-single-node}.apps.yml
service: web
mem_limit: 1gb
cpus: 2
command: ./scripts/run-django-dev.sh
Expand Down Expand Up @@ -50,9 +47,6 @@ services:
build:
context: .
dockerfile: Dockerfile
extends:
file: docker-compose.opensearch.${OPENSEARCH_CLUSTER_TYPE:-single-node}.apps.yml
service: web
command: >
/bin/bash -c '
sleep 3;
Expand Down
17 changes: 0 additions & 17 deletions docker-compose.opensearch.cluster.apps.yml

This file was deleted.

9 changes: 0 additions & 9 deletions docker-compose.opensearch.single-node.apps.yml

This file was deleted.

2 changes: 1 addition & 1 deletion fixtures/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def warnings_as_errors(): # noqa: PT004
# Ignore deprecation warnings in third party libraries
warnings.filterwarnings(
"ignore",
module=".*(api_jwt|api_jws|rest_framework_jwt|astroid|celery|factory|botocore|posthog).*",
module=".*(api_jwt|api_jws|rest_framework_jwt|astroid|bs4|celery|factory|botocore|posthog).*",
category=DeprecationWarning,
)
yield
Expand Down
16 changes: 2 additions & 14 deletions frontends/api/src/generated/v0/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1597,12 +1597,6 @@ export interface PatchedChannelWriteRequest {
* @interface PatchedProfileRequest
*/
export interface PatchedProfileRequest {
/**
*
* @type {string}
* @memberof PatchedProfileRequest
*/
name?: string | null
/**
*
* @type {string}
Expand Down Expand Up @@ -1928,11 +1922,11 @@ export interface PreferencesSearch {
*/
export interface Profile {
/**
*
* Get the user\'s name
* @type {string}
* @memberof Profile
*/
name?: string | null
name: string
/**
*
* @type {string}
Expand Down Expand Up @@ -2054,12 +2048,6 @@ export interface Profile {
* @interface ProfileRequest
*/
export interface ProfileRequest {
/**
*
* @type {string}
* @memberof ProfileRequest
*/
name?: string | null
/**
*
* @type {string}
Expand Down
6 changes: 6 additions & 0 deletions frontends/api/src/generated/v1/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3638,6 +3638,12 @@ export interface PercolateQuery {
* @memberof PercolateQuery
*/
source_type: SourceTypeEnum
/**
* Friendly display label for the query
* @type {string}
* @memberof PercolateQuery
*/
display_label?: string
}

/**
Expand Down
11 changes: 4 additions & 7 deletions frontends/mit-learn/public/images/mit-learn-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions frontends/mit-learn/public/images/mit-logo-learn-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 0 additions & 17 deletions frontends/mit-learn/public/images/mit-logo-transparent2.svg

This file was deleted.

17 changes: 0 additions & 17 deletions frontends/mit-learn/public/images/mit-logo-transparent3.svg

This file was deleted.

35 changes: 0 additions & 35 deletions frontends/mit-learn/public/images/mit-logo-transparent4.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
17 changes: 0 additions & 17 deletions frontends/mit-learn/public/images/mit-logo-transparent5.svg

This file was deleted.

14 changes: 14 additions & 0 deletions frontends/mit-learn/public/images/mit-logo-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
} from "ol-components"

import { RiAddLine } from "@remixicon/react"
import { usePostHog } from "posthog-js/react"

import * as NiceModal from "@ebay/nice-modal-react"

Expand Down Expand Up @@ -67,6 +68,7 @@ const AddToListDialogInner: React.FC<AddToListDialogInnerProps> = ({
isLoading: isSavingLearningPathRelationships,
mutateAsync: setLearningPathRelationships,
} = useLearningResourceSetLearningPathRelationships()
const posthog = usePostHog()
const isSaving =
isSavingLearningPathRelationships || isSavingUserListRelationships
let dialogTitle = "Add to list"
Expand All @@ -93,6 +95,9 @@ const AddToListDialogInner: React.FC<AddToListDialogInnerProps> = ({
: null,
)
.filter((value) => value !== null)

const { POSTHOG } = APP_SETTINGS

const formik = useFormik({
enableReinitialize: true,
validateOnChange: false,
Expand All @@ -103,6 +108,15 @@ const AddToListDialogInner: React.FC<AddToListDialogInnerProps> = ({
},
onSubmit: async (values) => {
if (resource) {
if (!(!POSTHOG?.api_key || POSTHOG.api_key.length < 1)) {
posthog.capture("lr_add_to_list", {
listType: listType,
resourceId: resource?.id,
readableId: resource?.readable_id,
platformCode: resource?.platform?.code,
resourceType: resource?.resource_type,
})
}
if (listType === ListType.LearningPath) {
const newParents = values.learning_paths.map((id) => parseInt(id))
await setLearningPathRelationships({
Expand Down
Loading
Loading