Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: support target-id and initial-id attributes in mgt-todo #2407

Merged
merged 9 commits into from
Jun 13, 2023
Merged
Show file tree
Hide file tree
Changes from 7 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
14 changes: 6 additions & 8 deletions packages/mgt-components/src/components/mgt-picker/mgt-picker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,12 @@ export class MgtPicker extends MgtTemplatedComponent {
id="combobox"
autocomplete="list"
placeholder=${this.placeholder}>
${this.response.map(
item => html`
<fluent-option
value=${item.id}
@click=${(e: MouseEvent) => this.handleClick(e, item)}>
${item[this.keyName]}
</fluent-option>`
)}
${this.response.map(
item => html`
<fluent-option value=${item.id} @click=${(e: MouseEvent) => this.handleClick(e, item)}> ${
item[this.keyName]
} </fluent-option>`
)}
</fluent-combobox>
`;
}
Expand Down
42 changes: 27 additions & 15 deletions packages/mgt-components/src/components/mgt-todo/mgt-todo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import '../sub-components/mgt-dot-options/mgt-dot-options';
import {
createTodoTask,
deleteTodoTask,
getTodoTaskList,
getTodoTasks,
TaskStatus,
TodoTask,
Expand All @@ -31,6 +32,7 @@ import { strings } from './strings';
import { registerFluentComponents } from '../../utils/FluentComponents';
import { fluentCheckbox, fluentRadioGroup, fluentButton } from '@fluentui/web-components';
import { isElementDark } from '../../utils/isDark';
import { ifDefined } from 'lit/directives/if-defined';

registerFluentComponents(fluentCheckbox, fluentRadioGroup, fluentButton);

Expand Down Expand Up @@ -178,18 +180,22 @@ export class MgtTodo extends MgtTasksBase {
}

/**
* Render the generic picker.
* Render the generic picker or the task list displayName.
*
*/
protected renderPicker() {
return mgtHtml`
<mgt-picker
resource="me/todo/lists"
scopes="tasks.read, tasks.readwrite"
key-name="displayName"
placeholder="Select a task list"
></mgt-picker>
`;
if (this.targetId) {
return html`<p>${this.currentList?.displayName}</p>`;
} else {
return mgtHtml`
<mgt-picker
resource="me/todo/lists"
scopes="tasks.read, tasks.readwrite"
key-name="displayName"
selected-value="${ifDefined(this.currentList?.displayName)}"
placeholder="Select a task list">
</mgt-picker>`;
}
}

/**
Expand Down Expand Up @@ -300,9 +306,8 @@ export class MgtTodo extends MgtTasksBase {
*/

protected handleSelectionChanged = (e: CustomEvent<TodoTaskList>) => {
const list: TodoTaskList = e.detail;
this.currentList = list;
void this.loadTasks(list);
this.currentList = e.detail as TodoTaskList;
void this.loadTasks(this.currentList);
};

/**
Expand Down Expand Up @@ -408,15 +413,22 @@ export class MgtTodo extends MgtTasksBase {
return;
}

this._isLoadingTasks = true;
if (!this._graph) {
const graph = provider.graph.forComponent(this);
this._graph = graph;
}

const currentList = this.currentList;
if (currentList) {
await this.loadTasks(currentList);
if (this.targetId) {
// Call to get the displayName of the list
this.currentList = await getTodoTaskList(this._graph, this.targetId);
this._tasks = await getTodoTasks(this._graph, this.targetId);
} else if (this.initialId) {
// Call to get the displayName of the list
this.currentList = await getTodoTaskList(this._graph, this.initialId);
this._tasks = await getTodoTasks(this._graph, this.initialId);
}
this._isLoadingTasks = false;
};

/**
Expand Down
8 changes: 8 additions & 0 deletions stories/components/todo/todo.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ export const todos = () => html`
<mgt-todo></mgt-todo>
`;

export const tasksWithTargetId = () => html`
<mgt-todo target-id="AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OAAuAAAAAAAiQ8W967B7TKBjgx9rVEURAQAiIsqMbYjsT5e-T7KzowPTAAAAAAESAAA="></mgt-todo>
`;

export const tasksWithInitialId = () => html`
<mgt-todo initial-id="AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OAAuAAAAAAAiQ8W967B7TKBjgx9rVEURAQAiIsqMbYjsT5e-T7KzowPTAAAAAAESAAA="></mgt-todo>
`;

export const ReadOnly = () => html`
<mgt-todo read-only></mgt-todo>
`;
Expand Down