Skip to content

Commit 978b8ed

Browse files
MutugiiiMutugiii
committed
Merge branch 'master' into 9906-surveys-ui-improvements
2 parents cc6ea04 + b90cfb8 commit 978b8ed

45 files changed

Lines changed: 541 additions & 500 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/planet-chat.yml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ jobs:
5757
- name: Build image
5858
run: |
5959
BRANCH="${GITHUB_REF_NAME//\//-}"
60-
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
61-
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-chatapi-$PLANET_VERSION-$BRANCH"
60+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
61+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
62+
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
63+
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-chatapi-$PLANET_VERSION-$SAFE_BRANCH"
6264
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
6365
docker build \
6466
-f './docker/chatapi/Dockerfile' \
@@ -83,10 +85,12 @@ jobs:
8385
- name: Multiarch Deploy
8486
run: |
8587
BRANCH="${GITHUB_REF_NAME//\//-}"
86-
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
87-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
88-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
89-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
88+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
89+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
90+
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
91+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
92+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
93+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
9094
docker manifest create $manifesttag $amd64tag $armtag $arm64tag
9195
docker manifest annotate $manifesttag $amd64tag --os linux --arch amd64
9296
docker manifest annotate $manifesttag $armtag --os linux --arch arm
@@ -97,9 +101,11 @@ jobs:
97101
if: ${{ github.event_name == 'release' }}
98102
run: |
99103
BRANCH="${GITHUB_REF_NAME//\//-}"
100-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
101-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
102-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-chatapi-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
104+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
105+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
106+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
107+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
108+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-chatapi-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
103109
for tag in "$DOCKER_ORG/$DOCKER_REPO:chatapi-$PLANET_VERSION" "$DOCKER_ORG/$DOCKER_REPO:chatapi"; do
104110
docker manifest create $tag $amd64tag $armtag $arm64tag
105111
docker manifest annotate $tag $amd64tag --os linux --arch amd64

‎.github/workflows/planet-db.yml‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,10 @@ jobs:
5757
- name: Build image
5858
run: |
5959
BRANCH="${GITHUB_REF_NAME//\//-}"
60-
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
61-
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-db-init-$PLANET_VERSION-$BRANCH"
60+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
61+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
62+
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
63+
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-db-init-$PLANET_VERSION-$SAFE_BRANCH"
6264
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
6365
docker build \
6466
-f './docker/db-init/Dockerfile' \
@@ -83,10 +85,12 @@ jobs:
8385
- name: Multiarch Deploy
8486
run: |
8587
BRANCH="${GITHUB_REF_NAME//\//-}"
86-
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
87-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
88-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
89-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
88+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
89+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
90+
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
91+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
92+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
93+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
9094
docker manifest create $manifesttag $amd64tag $armtag $arm64tag
9195
docker manifest annotate $manifesttag $amd64tag --os linux --arch amd64
9296
docker manifest annotate $manifesttag $armtag --os linux --arch arm
@@ -97,9 +101,11 @@ jobs:
97101
if: ${{ github.event_name == 'release' }}
98102
run: |
99103
BRANCH="${GITHUB_REF_NAME//\//-}"
100-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
101-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
102-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
104+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
105+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
106+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
107+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
108+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-db-init-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
103109
for tag in "$DOCKER_ORG/$DOCKER_REPO:db-init-$PLANET_VERSION" "$DOCKER_ORG/$DOCKER_REPO:db-init"; do
104110
docker manifest create $tag $amd64tag $armtag $arm64tag
105111
docker manifest annotate $tag $amd64tag --os linux --arch amd64

‎.github/workflows/planet.yml‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ jobs:
6565
if: ${{ env.SHOULD_UPDATE_PACKAGES == 1 || github.event.inputs.buildtype == 'prebuild' }}
6666
run: |
6767
BRANCH="${GITHUB_REF_NAME//\//-}"
68-
repo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
68+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
69+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
70+
repo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
6971
mkdir -p ./ng-app/dist
7072
docker build -f './docker/planet/pre-builder-Dockerfile' -t $repo .
7173
docker images
@@ -75,7 +77,9 @@ jobs:
7577
if: ${{ (github.ref == 'refs/heads/master' || env.IS_RELEASE == 'true') && (env.SHOULD_UPDATE_PACKAGES == 1 || github.event.inputs.buildtype == 'prebuild') }}
7678
run: |
7779
BRANCH="${GITHUB_REF_NAME//\//-}"
78-
repo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
80+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
81+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
82+
repo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
7983
latestrepo="$DOCKER_ORG/$DOCKER_REPO_PRE:latest"
8084
docker tag $repo $latestrepo
8185
docker push $latestrepo
@@ -103,16 +107,20 @@ jobs:
103107
continue-on-error: true # If there are no package changes, the commit specific image will not be built so an error is expected here
104108
run: |
105109
BRANCH="${GITHUB_REF_NAME//\//-}"
106-
prerepo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
110+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
111+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
112+
prerepo="$DOCKER_ORG/$DOCKER_REPO_PRE:$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
107113
latestprerepo="$DOCKER_ORG/$DOCKER_REPO_PRE:latest"
108114
docker pull $prerepo
109115
docker tag $prerepo $latestprerepo
110116
111117
- name: Build single language build
112118
run: |
113119
BRANCH="${GITHUB_REF_NAME//\//-}"
114-
repo="$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
115-
branchrepo="$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$BRANCH"
120+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
121+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
122+
repo="$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
123+
branchrepo="$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$SAFE_BRANCH"
116124
export NODE_OPTIONS=--max_old_space_size=4096
117125
mkdir -p ./ng-app/dist
118126
docker build -f './docker/planet/builder-Dockerfile' -t $repo .
@@ -150,12 +158,14 @@ jobs:
150158
- name: Build image
151159
run: |
152160
BRANCH="${GITHUB_REF_NAME//\//-}"
153-
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
154-
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-$PLANET_VERSION-$BRANCH"
161+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
162+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
163+
repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
164+
branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-$PLANET_VERSION-$SAFE_BRANCH"
155165
LANGUAGES=( 'eng' 'ara' 'fra' 'spa' 'nep' 'som')
156166
mkdir -p ./ng-app/dist
157167
mkdir -p ./ng-app/langbuild
158-
docker create --name langbuild "$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$BRANCH"
168+
docker create --name langbuild "$DOCKER_ORG/$DOCKER_REPO_LANG:$PLANET_VERSION-$SAFE_BRANCH"
159169
docker export langbuild > langbuild.tar
160170
tar -xf langbuild.tar -C ./ng-app/langbuild
161171
for LANGUAGE in "${LANGUAGES[@]}"; do
@@ -196,10 +206,12 @@ jobs:
196206
- name: Multiarch Deploy
197207
run: |
198208
BRANCH="${GITHUB_REF_NAME//\//-}"
199-
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
200-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
201-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
202-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
209+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
210+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
211+
manifesttag="$DOCKER_ORG/$DOCKER_REPO_TAG:$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
212+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
213+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
214+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
203215
docker manifest create $manifesttag $amd64tag $armtag $arm64tag
204216
docker manifest annotate $manifesttag $amd64tag --os linux --arch amd64
205217
docker manifest annotate $manifesttag $armtag --os linux --arch arm
@@ -210,9 +222,11 @@ jobs:
210222
if: ${{ github.event_name == 'release' }}
211223
run: |
212224
BRANCH="${GITHUB_REF_NAME//\//-}"
213-
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
214-
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
215-
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
225+
BRANCH_HASH="$(printf '%s' "$BRANCH" | sha256sum | cut -c1-8)"
226+
SAFE_BRANCH="${BRANCH:0:75}-$BRANCH_HASH"
227+
amd64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:amd64-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
228+
armtag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
229+
arm64tag="$DOCKER_ORG/$DOCKER_REPO_TAG:arm64-$PLANET_VERSION-$SAFE_BRANCH-${GITHUB_SHA::8}"
216230
for tag in "$DOCKER_ORG/$DOCKER_REPO:$PLANET_VERSION" "$DOCKER_ORG/$DOCKER_REPO:latest"; do
217231
docker manifest create $tag $amd64tag $armtag $arm64tag
218232
docker manifest annotate $tag $amd64tag --os linux --arch amd64

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "planet",
33
"license": "AGPL-3.0",
4-
"version": "0.22.81",
4+
"version": "0.22.86",
55
"myplanet": {
6-
"latest": "v0.54.94",
7-
"min": "v0.52.45"
6+
"latest": "v0.55.45",
7+
"min": "v0.53.91"
88
},
99
"scripts": {
1010
"ng": "ng",

‎src/app/chat/chat-sidebar/chat-sidebar.component.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, OnInit, OnDestroy, HostListener } from '@angular/core';
1+
import { Component, OnInit, OnDestroy } from '@angular/core';
22
import { NonNullableFormBuilder, FormGroup, Validators, FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
33
import { MatDialog } from '@angular/material/dialog';
44
import { Subject } from 'rxjs';
@@ -99,7 +99,9 @@ export class ChatSidebarComponent implements OnInit, OnDestroy {
9999
private searchService: SearchService,
100100
private userService: UserService
101101
) {
102-
this.deviceType = this.deviceInfoService.getDeviceType();
102+
this.deviceInfoService.watchDeviceType().pipe(takeUntil(this.onDestroy$)).subscribe((deviceType) => {
103+
this.deviceType = deviceType;
104+
});
103105
this.lastRenderedConversation = -1;
104106
}
105107

@@ -116,10 +118,6 @@ export class ChatSidebarComponent implements OnInit, OnDestroy {
116118
this.recordSearch(true);
117119
}
118120

119-
@HostListener('window:resize') OnResize() {
120-
this.deviceType = this.deviceInfoService.getDeviceType();
121-
}
122-
123121
subscribeToNewChats() {
124122
this.chatService.newChatAdded$
125123
.pipe(takeUntil(this.onDestroy$))

‎src/app/community/community.component.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, OnInit, OnDestroy, ViewEncapsulation, HostListener } from '@angular/core';
1+
import { Component, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
22
import { ActivatedRoute, ParamMap, Router, RouterLink } from '@angular/router';
33
import { MatDialog } from '@angular/material/dialog';
44
import { NonNullableFormBuilder, FormControl, FormGroup, FormsModule } from '@angular/forms';
@@ -168,7 +168,9 @@ export class CommunityComponent implements OnInit, OnDestroy {
168168
private fb: NonNullableFormBuilder,
169169
private configurationCheckService: ConfigurationCheckService
170170
) {
171-
this.deviceType = this.deviceInfoService.getDeviceType();
171+
this.deviceInfoService.watchDeviceType().pipe(takeUntil(this.onDestroy$)).subscribe((deviceType) => {
172+
this.deviceType = deviceType;
173+
});
172174
}
173175

174176
ngOnInit() {
@@ -216,10 +218,6 @@ export class CommunityComponent implements OnInit, OnDestroy {
216218
});
217219
}
218220

219-
@HostListener('window:resize') onResize() {
220-
this.deviceType = this.deviceInfoService.getDeviceType();
221-
}
222-
223221
ngOnDestroy() {
224222
this.onDestroy$.next();
225223
this.onDestroy$.complete();

‎src/app/courses/courses.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<button class="menu" mat-icon-button [matMenuTriggerFor]="actionsMenu">
6060
<mat-icon>more_vert</mat-icon>
6161
</button>
62-
<mat-menu #actionsMenu="matMenu" class="ellipsis-menu">
62+
<mat-menu #actionsMenu="matMenu" class="actions-menu">
6363
<ng-container *ngTemplateOutlet="actionButtons"></ng-container>
6464
</mat-menu>
6565
</ng-container>
@@ -75,16 +75,16 @@
7575
<planet-tag-input [db]="dbName" [disabled]="selection?.selected?.length === 0" mode="add" labelType="change" [helperText]="false" [filteredData]="courses.data" [selectedIds]="selection.selected" (finalTags)="addTagsToSelected($event)"></planet-tag-input>
7676
</mat-form-field>
7777
</ng-container>
78-
<button mat-button [ngClass]="{'mat-menu-item': deviceType !== deviceTypes.DESKTOP }" [disabled]="selectedNotEnrolled === 0" (click)="enrollLeaveToggle(selection.selected, 'add')">
78+
<button mat-button [disabled]="selectedNotEnrolled === 0" (click)="enrollLeaveToggle(selection.selected, 'add')">
7979
<mat-icon aria-hidden="true" class="margin-lr-3">library_add</mat-icon><span i18n>Join Selected</span>
8080
<span *ngIf="selectedNotEnrolled > 0"> ({{selectedNotEnrolled}})</span>
8181
</button>
82-
<button mat-button [ngClass]="{'mat-menu-item': deviceType !== deviceTypes.DESKTOP }" [disabled]="selectedEnrolled === 0" (click)="enrollLeaveToggle(selection.selected, 'remove')">
82+
<button mat-button [disabled]="selectedEnrolled === 0" (click)="enrollLeaveToggle(selection.selected, 'remove')">
8383
<mat-icon aria-hidden="true" class="margin-lr-3">clear</mat-icon><span i18n>Leave Selected</span>
8484
<span *ngIf="selectedEnrolled > 0"> ({{selectedEnrolled}})</span>
8585
</button>
8686
<ng-container *ngIf="user.isUserAdmin">
87-
<button mat-button [ngClass]="{'mat-menu-item': deviceType !== deviceTypes.DESKTOP }" [matMenuTriggerFor]="managerMenu" *planetAuthorizedRoles="''" [disabled]="!selection.selected.length" i18n>Manager Actions</button>
87+
<button mat-button [matMenuTriggerFor]="managerMenu" *planetAuthorizedRoles="''" [disabled]="!selection.selected.length" i18n>Manager Actions</button>
8888
<mat-menu #managerMenu="matMenu">
8989
<!-- TODO: Need to figure out how to resolve conflicts when sending course back to parent -->
9090
<button *ngIf="planetType !== 'center' && planetConfiguration.registrationRequest === 'accepted'" mat-menu-item (click)="shareLocal(selection.selected)" [disabled]="selectedLocal === 0">

0 commit comments

Comments
 (0)